Attachment #140177 for bug #186687

View | Details | Raw Unified | Return to bug 186687
Collapse All | Expand All

Lines 13-20 Link Here

(-)Makefile (-17 / +14 lines)
13	LICENSE= GPLv2	13	LICENSE= GPLv2
14		14
15	CFLAGS+= -fPIC -I ${LOCALBASE}/include -DHAVE_SSL	15	CFLAGS+= -fPIC -I ${LOCALBASE}/include -DHAVE_SSL
16	USE_GMAKE= YES	16	USES= iconv gmake
17	USES= iconv
18	USE_OPENSSL= YES	17	USE_OPENSSL= YES
19	USE_LDCONFIG= ${LOCALBASE}/lib/imspector	18	USE_LDCONFIG= ${LOCALBASE}/lib/imspector
20		19
Lines 24-42 Link Here
24		23
25	MAKE_ENV+= ETCDIR=${ETCDIR}	24	MAKE_ENV+= ETCDIR=${ETCDIR}
26		25
27	OPTIONS_DEFINE= IPFW	26	OPTIONS_DEFINE= IPFW PLUGINS
28	OPTIONS_DEFAULT= IPFW	27	OPTIONS_DEFAULT=IPFW
		28	OPTIONS_SUB= yes
		29
29	IPFW_DESC= Add IPFW support	30	IPFW_DESC= Add IPFW support
		31	PLUGINS_DESC= Build plugins
30		32
31	NO_STAGE= yes	33	IPFW_CFLAGS= -DIPFW_TRANSPARENT=1
		34	PLUGINS_USE= MYSQL=yes SQLITE=yes PGSQL=yes
		35
32	.include <bsd.port.options.mk>	36	.include <bsd.port.options.mk>
33		37
34	.if ${PORT_OPTIONS:MIPFW}
35	CFLAGS+= -DIPFW_TRANSPARENT=1
36	.endif
37
38	post-extract:	38	post-extract:
39	${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}	39	@${MV} ${WRKDIR}/${PORTNAME} ${WRKSRC}
40		40
41	post-patch:	41	post-patch:
42	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \	42	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
Lines 46-57 Link Here
46	${WRKSRC}/sslstate.cpp	46	${WRKSRC}/sslstate.cpp
47	@${REINPLACE_CMD} -e 's,%%ICONV_LIB%%,${ICONV_LIB},' \	47	@${REINPLACE_CMD} -e 's,%%ICONV_LIB%%,${ICONV_LIB},' \
48	${WRKSRC}/Makefile	48	${WRKSRC}/Makefile
		49	.if ${PORT_OPTIONS:MPLUGINS}
		50	@${REINPLACE_CMD} -e 's,#ADD_PLUGINS,ADD_PLUGINS,' \
		51	${WRKSRC}/Makefile
		52	.endif
49		53
50	post-install:
51	.for f in ${CONFIG_FILES}
52	@if [ ! -f ${ETCDIR}/${f} ]; then \
53	${CP} -p ${ETCDIR}/${f}.sample ${ETCDIR}/${f} ; \
54	fi
55	.endfor
56
57	.include <bsd.port.mk>	54	.include <bsd.port.mk>

Lines 1-5 Link Here

(-)files/patch-Makefile (-5 / +9 lines)
1	--- Makefile.orig 2008-12-22 15:03:15.000000000 +0300	1	--- Makefile.orig 2010-02-23 14:20:33.000000000 -0300
2	+++ Makefile 2011-06-14 14:26:22.072210675 +0400	2	+++ Makefile 2014-02-11 21:23:19.000000000 -0200
3	@@ -1,5 +1,5 @@	3	@@ -1,5 +1,5 @@
4	-DESTDIR = /	4	-DESTDIR = /
5	-PREFIX = /usr	5	-PREFIX = /usr
Lines 46-52 Link Here
46	yahooprotocolplugin.so: yahooprotocolplugin.o libimspector.so	46	yahooprotocolplugin.so: yahooprotocolplugin.o libimspector.so
47	$(CXX) yahooprotocolplugin.o libimspector.so $(PLUGIN_FLAGS)	47	$(CXX) yahooprotocolplugin.o libimspector.so $(PLUGIN_FLAGS)
48	ircprotocolplugin.so: ircprotocolplugin.o libimspector.so	48	ircprotocolplugin.so: ircprotocolplugin.o libimspector.so
49	@@ -162,15 +162,15 @@	49	@@ -162,17 +162,17 @@
50	install: imspector libimspector.so $(PLUGINS)	50	install: imspector libimspector.so $(PLUGINS)
51	-mkdir -p $(DESTDIR)/$(PREFIX)/sbin	51	-mkdir -p $(DESTDIR)/$(PREFIX)/sbin
52	-mkdir -p $(DESTDIR)/$(PREFIX)/lib/imspector	52	-mkdir -p $(DESTDIR)/$(PREFIX)/lib/imspector
Lines 62-71 Link Here
62	- -install imspector.conf $(DESTDIR)/$(PREFIX)/etc/imspector/imspector.conf	62	- -install imspector.conf $(DESTDIR)/$(PREFIX)/etc/imspector/imspector.conf
63	- -install badwords.txt $(DESTDIR)/$(PREFIX)/etc/imspector/badwords.txt	63	- -install badwords.txt $(DESTDIR)/$(PREFIX)/etc/imspector/badwords.txt
64	- -install acl.txt $(DESTDIR)/$(PREFIX)/etc/imspector/acl.txt	64	- -install acl.txt $(DESTDIR)/$(PREFIX)/etc/imspector/acl.txt
		65	- -mkdir -p /var/log/imspector
		66	- -mkdir -p /var/lib/imspector
65	+ -mkdir -p $(DESTDIR)/$(ETCDIR)	67	+ -mkdir -p $(DESTDIR)/$(ETCDIR)
66	+ -${BSD_INSTALL_DATA} imspector.conf $(DESTDIR)/$(ETCDIR)/imspector.conf.sample	68	+ -${BSD_INSTALL_DATA} imspector.conf $(DESTDIR)/$(ETCDIR)/imspector.conf.sample
67	+ -${BSD_INSTALL_DATA} badwords.txt $(DESTDIR)/$(ETCDIR)/badwords.txt.sample	69	+ -${BSD_INSTALL_DATA} badwords.txt $(DESTDIR)/$(ETCDIR)/badwords.txt.sample
68	+ -${BSD_INSTALL_DATA} acl.txt $(DESTDIR)/$(ETCDIR)/acl.txt.sample	70	+ -${BSD_INSTALL_DATA} acl.txt $(DESTDIR)/$(ETCDIR)/acl.txt.sample
69	-mkdir -p /var/log/imspector	71	+ -mkdir -p $(DESTDIR)/var/log/imspector
70	-mkdir -p /var/lib/imspector	72	+ -mkdir -p $(DESTDIR)/var/lib/imspector
71		73
		74	install-cert:
		75	-mkdir -p $(DESTDIR)/$(PREFIX)/etc/imspector

Lines 23-28 Link Here

(-)pkg-plist (-1 / +6 lines)
23	lib/imspector/miscfilterplugin.so	23	lib/imspector/miscfilterplugin.so
24	lib/imspector/msnprotocolplugin.so	24	lib/imspector/msnprotocolplugin.so
25	lib/imspector/yahooprotocolplugin.so	25	lib/imspector/yahooprotocolplugin.so
		26	%%PLUGINS%%lib/imspector/dbfilterplugin.so
		27	%%PLUGINS%%lib/imspector/dbresponderplugin.so
		28	%%PLUGINS%%lib/imspector/mysqlloggingplugin.so
		29	%%PLUGINS%%lib/imspector/postgresqlloggingplugin.so
		30	%%PLUGINS%%lib/imspector/sqliteloggingplugin.so
26	lib/libimspector.so	31	lib/libimspector.so
27	sbin/imspector	32	sbin/imspector
28	@dirrmtry %%ETCDIR%%	33	@dirrmtry %%ETCDIR%%
Lines 31-34 Link Here
31	@dirrmtry lib/imspector	36	@dirrmtry lib/imspector
32	@dirrmtry lib	37	@dirrmtry lib
33	@dirrmtry log/imspector	38	@dirrmtry log/imspector
34	@cwd	39	@cwd

Return to bug 186687