Return to patch-Makefile CVS log

Up to [local] / ports / net / imspector / patches

Annotation of ports/net/imspector/patches/patch-Makefile, Revision 1.1.1.1

1.1       yason       1: $OpenBSD$
                      2: --- Makefile.orig      Mon Dec 22 15:03:15 2008
                      3: +++ Makefile   Fri May  8 08:02:50 2009
                      4: @@ -1,9 +1,6 @@
                      5: -DESTDIR = /
                      6: -PREFIX = /usr
                      7: -
                      8:  ##########
                      9:  # Comment this out if you dont want SSL
                     10: -SSL = yes
                     11: +#SSL = yes
                     12:
                     13:  ##########
                     14:  # Location of openssl installation
                     15: @@ -11,21 +8,21 @@ SSL_DIR = /usr
                     16:
                     17:  ##########
                     18:  # If using FreeBSD or OpenBSD COMMENT the below lines
                     19: -LIBS = -ldl
                     20: +LIBS = -L$(PREFIX)/lib -liconv
                     21:
                     22:  # For any distro
                     23:  #ADD_PLUGINS = mysqlloggingplugin.so sqliteloggingplugin.so postgresqlloggingplugin.so dbfilterplugin.so dbresponderplugin.so
                     24:  ##########
                     25:
                     26: -ifdef SSL
                     27: +.ifdef SSL
                     28:  SSL_LIBS = -L$(SSL_DIR)/lib -lssl
                     29:  SSL_FLAGS = -I$(SSL_DIR)/include -DHAVE_SSL
                     30:  SSL_OBJS = sslstate.o
                     31: -endif
                     32: +.endif
                     33:
                     34:  CXX = g++
                     35:
                     36: -CXXFLAGS = -Wall -O2 -fPIC $(SSL_FLAGS)
                     37: +CXXFLAGS = -Wall -O2 -fPIC $(SSL_FLAGS) -I$(PREFIX)/include
                     38:
                     39:  PLUGIN_FLAGS = $(LIBS) -fPIC -shared -Wl,-soname,$@ -o $@
                     40:
                     41: @@ -160,33 +157,33 @@ dbresponderplugin.o: dbresponderplugin.cpp
                     42:        $(CXX) $(CXXFLAGS) dbresponderplugin.cpp -c -I$(PREFIX)/include
                     43:
                     44:  install: imspector libimspector.so $(PLUGINS)
                     45: -      -mkdir -p $(DESTDIR)/$(PREFIX)/sbin
                     46: -      -mkdir -p $(DESTDIR)/$(PREFIX)/lib/imspector
                     47: -      -install imspector $(DESTDIR)/$(PREFIX)/sbin/imspector
                     48: -      -install libimspector.so $(DESTDIR)/$(PREFIX)/lib/libimspector.so
                     49: +      -mkdir -p $(PREFIX)/sbin
                     50: +      -mkdir -p $(PREFIX)/lib/imspector
                     51: +      -install imspector $(PREFIX)/sbin/imspector
                     52: +      -install libimspector.so $(PREFIX)/lib/libimspector.so
                     53:        -(for PLUGIN in $(PLUGINS) $(ADD_PLUGINS); do \
                     54: -              install $$PLUGIN $(DESTDIR)/$(PREFIX)/lib/imspector/$$PLUGIN; \
                     55: +              install $$PLUGIN $(PREFIX)/lib/imspector/$$PLUGIN; \
                     56:        done);
                     57: -      -mkdir -p $(DESTDIR)/$(PREFIX)/etc/imspector
                     58: -      -install imspector.conf $(DESTDIR)/$(PREFIX)/etc/imspector/imspector.conf
                     59: -      -install badwords.txt $(DESTDIR)/$(PREFIX)/etc/imspector/badwords.txt
                     60: -      -install acl.txt $(DESTDIR)/$(PREFIX)/etc/imspector/acl.txt
                     61: -      -mkdir -p /var/log/imspector
                     62: -      -mkdir -p /var/lib/imspector
                     63: +      -mkdir -p $(PREFIX)/share/imspector
                     64: +      -install imspector.conf $(PREFIX)/share/imspector/imspector.conf
                     65: +      -install badwords.txt $(PREFIX)/share/imspector/badwords.txt
                     66: +      -install acl.txt $(PREFIX)/share/imspector/acl.txt
                     67: +#     -mkdir -p /var/log/imspector
                     68: +#     -mkdir -p /var/lib/imspector
                     69:
                     70:  install-cert:
                     71: -      -mkdir -p $(DESTDIR)/$(PREFIX)/etc/imspector
                     72: +      -mkdir -p $(PREFIX)/share/imspector
                     73:        -openssl req -new -newkey rsa:1024 -days 365 -nodes -x509 \
                     74: -              -keyout $(DESTDIR)/$(PREFIX)/etc/imspector/serverkey.pem \
                     75: -              -out $(DESTDIR)/$(PREFIX)/etc/imspector/servercert.pem
                     76: +              -keyout $(PREFIX)/share/imspector/serverkey.pem \
                     77: +              -out $(PREFIX)/share/imspector/servercert.pem
                     78:
                     79:  install-ca-cert: install-cert
                     80:        -openssl req -new -newkey rsa:1024 -days 365 -nodes -x509 \
                     81: -              -keyout $(DESTDIR)/$(PREFIX)/etc/imspector/cakey.pem \
                     82: -              -out $(DESTDIR)/$(PREFIX)/etc/imspector/cacert.pem
                     83: +              -keyout $(PREFIX)/share/imspector/cakey.pem \
                     84: +              -out $(PREFIX)/share/imspector/cacert.pem
                     85:
                     86:  uninstall:
                     87: -      -rm -f $(DESTDIR)/$(PREFIX)/sbin/imspector
                     88: -      -rm -f $(DESTDIR)/$(PREFIX)/lib/libimspector.so
                     89: -      -rm -rf $(DESTDIR)/$(PREFIX)/usr/lib/imspector
                     90: -      -rm -rf $(DESTDIR)/$(PREFIX)/etc/imspector
                     91: +      -rm -f $(PREFIX)/sbin/imspector
                     92: +      -rm -f $(PREFIX)/lib/libimspector.so
                     93: +      -rm -rf $(PREFIX)/usr/lib/imspector
                     94: +      -rm -rf /etc/imspector