Attachment #33682 for bug #55042

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

Lines 7-16 Link Here

(-)mod_accounting/Makefile (-2 / +8 lines)
7		7
8	PORTNAME= mod_accounting	8	PORTNAME= mod_accounting
9	PORTVERSION= 0.5	9	PORTVERSION= 0.5
		10	PORTREVISION= 1
10	CATEGORIES= www	11	CATEGORIES= www
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= mod-acct	13	MASTER_SITE_SUBDIR= mod-acct
13		14
		15	PATCH_SITES= http://www.cultdeadsheep.org/FreeBSD/ports/download/distfiles/
		16	PATCHFILES= mod_accounting-patch-0.5_to_0.6-cvs.gz
		17	PATCH_DIST_STRIP=-p1
		18
14	MAINTAINER= sheepkiller@cultdeadsheep.org	19	MAINTAINER= sheepkiller@cultdeadsheep.org
15	COMMENT= An Apache module that records traffic statistics into a database	20	COMMENT= An Apache module that records traffic statistics into a database
16		21
Lines 51-57 Link Here
51	LIB_DEPENDS+= mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client	56	LIB_DEPENDS+= mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client
52	.endif	57	.endif
53		58
54	DOCS= README FAQ.txt LICENSE	59	DOCS= README docs/FAQ.txt LICENSE
55		60
56	pre-everything::	61	pre-everything::
57	@${ECHO} ""	62	@${ECHO} ""
Lines 63-73 Link Here
63	@${ECHO} ""	68	@${ECHO} ""
64	@${ECHO} " WITHOUT_MYSQL Disable MySQL support"	69	@${ECHO} " WITHOUT_MYSQL Disable MySQL support"
65	@${ECHO} " WITHOUT_PGSQL Disable PostgreSQL support"	70	@${ECHO} " WITHOUT_PGSQL Disable PostgreSQL support"
		71	@${ECHO} " WITHOUT_PLAINTEXT Disable file (plain text) support"
66	@${ECHO} ""	72	@${ECHO} ""
67		73
68	post-install:	74	post-install:
69	@${MKDIR} ${PREFIX}/share/${PORTNAME}	75	@${MKDIR} ${PREFIX}/share/${PORTNAME}
70	${INSTALL_DATA} ${WRKSRC}/schema.sql ${PREFIX}/share/${PORTNAME}	76	${INSTALL_DATA} ${WRKSRC}/docs/schema.sql ${PREFIX}/share/${PORTNAME}
71	.if !defined(NOPORTDOCS)	77	.if !defined(NOPORTDOCS)
72	@${MKDIR} ${DOCSDIR}	78	@${MKDIR} ${DOCSDIR}
73	.for doc in ${DOCS}	79	.for doc in ${DOCS}

Line 1 Link Here

(-)mod_accounting/distinfo (+1 lines)
1	MD5 (mod_accounting-0.5.tar.gz) = fc045bbdc5ae32241765fea2967a63fb	1	MD5 (mod_accounting-0.5.tar.gz) = fc045bbdc5ae32241765fea2967a63fb
		2	MD5 (mod_accounting-patch-0.5_to_0.6-cvs.gz) = 36fd89d7d7b9d7ff6744e72f3d50e85a




--- Makefile.back	Wed Jul 30 09:41:20 2003
+++ Makefile	Wed Jul 30 09:40:23 2003
@@ -5,13 +5,27 @@
 ##
 
 #   the used tools
-APXS=apxs
-APACHECTL=apachectl
 APACHECTL=apachectl
 
 #   here's what you may need to change
-DEF=-DNEED_POSTGRES -DNEED_MYSQL -DNEED_PLAINTEXT
-INC=-I/usr/local/pgsql/include/ -I/usr/local/mysql/include/ -I/opt/postgresql/include -I/opt/mysql/include
-LIB=-L/opt/postgresql/lib -L/usr/local/pgsql/lib -lpq -L/opt/mysql/lib/mysql/ -L/usr/local/mysql/lib/mysql/ -lmysqlclient
+.if !defined(WITHOUT_PGSQL)
+DEF_PGSQL=      -DNEED_POSTGRES
+INC_PGSQL=      -I${LOCALBASE}/include

+LIB_MYSQL=      -L${LOCALBASE}/lib/mysql -lmysqlclient
+.endif
+
+.if !defined(WITHOUT_PLAINTEXT)
+DEF_PLAINTEXT=-DNEED_PLAINTEXT
+.endif
+
+DEF=${DEF_MYSQL} ${DEF_PGSQL} ${DEF_PLAINTEXT}
+INC=${INC_MYSQL} ${INC_PGSQL}
+LIB=${LIB_MYSQL} ${LIB_PGSQL}
 

Lines 1-6 Link Here

(-)mod_accounting/pkg-plist (-1 / +1 lines)
1	libexec/apache/mod_accounting.so	1	libexec/apache/mod_accounting.so
2	@exec %D/sbin/apxs -e -a -n accounting %D/%f	2	@exec %D/sbin/apxs -e -a -n accounting %D/%f
3	@unexec echo "===> If you do not plan on reinstalling mod_accounting, you must manually remove"; echo "===> references to it in httpd.conf."	3	@unexec echo "===> If you do not plan on reinstalling mod_accounting, you must manually remove"; echo "===> references to it in httpd.conf."
4	share/mod_accounting/schema.sql	4	share/mod_accounting/schema.sql
5	%%PORTDOCS%%%%DOCSDIR%%/README	5	%%PORTDOCS%%%%DOCSDIR%%/README
6	%%PORTDOCS%%%%DOCSDIR%%/FAQ.txt	6	%%PORTDOCS%%%%DOCSDIR%%/FAQ.txt

Return to bug 55042

Lines 1-17 Link Here

(-)mod_accounting/files/patch-Makefile (-10 / +13 lines)
1	--- Makefile.orig Sun Dec 30 14:11:43 2001	1	--- Makefile.back Wed Jul 30 09:41:20 2003
2	+++ Makefile Tue Nov 19 21:07:22 2002	2	+++ Makefile Wed Jul 30 09:40:23 2003
3	@@ -5,13 +5,24 @@	3	@@ -5,13 +5,27 @@
4	##	4	##
5		5
6	# the used tools	6	# the used tools
7	-APXS=apxs	7	-APXS=apxs
8	+#APXS=apxs	8	-APACHECTL=apachectl
9	APACHECTL=apachectl
10		9
11	-# here's what you may need to change	10	# here's what you may need to change
12	-DEF=-DNEED_POSTGRES -DNEED_MYSQL	11	-DEF=-DNEED_POSTGRES -DNEED_MYSQL -DNEED_PLAINTEXT
13	-INC=-I/usr/local/pgsql/include/ -I/usr/local/mysql/include/	12	-INC=-I/usr/local/pgsql/include/ -I/usr/local/mysql/include/ -I/opt/postgresql/include -I/opt/mysql/include
14	-LIB=-L/usr/local/pgsql/lib -lpq -L/usr/local/mysql/lib/mysql/ -lmysqlclient	13	-LIB=-L/opt/postgresql/lib -L/usr/local/pgsql/lib -lpq -L/opt/mysql/lib/mysql/ -L/usr/local/mysql/lib/mysql/ -lmysqlclient
15	+.if !defined(WITHOUT_PGSQL)	14	+.if !defined(WITHOUT_PGSQL)
16	+DEF_PGSQL= -DNEED_POSTGRES	15	+DEF_PGSQL= -DNEED_POSTGRES
17	+INC_PGSQL= -I${LOCALBASE}/include	16	+INC_PGSQL= -I${LOCALBASE}/include
Lines 24-30 Link Here
24	+LIB_MYSQL= -L${LOCALBASE}/lib/mysql -lmysqlclient	23	+LIB_MYSQL= -L${LOCALBASE}/lib/mysql -lmysqlclient
25	+.endif	24	+.endif
26	+	25	+
27	+DEF=${DEF_MYSQL} ${DEF_PGSQL}	26	+.if !defined(WITHOUT_PLAINTEXT)
		27	+DEF_PLAINTEXT=-DNEED_PLAINTEXT
		28	+.endif
		29	+
		30	+DEF=${DEF_MYSQL} ${DEF_PGSQL} ${DEF_PLAINTEXT}
28	+INC=${INC_MYSQL} ${INC_PGSQL}	31	+INC=${INC_MYSQL} ${INC_PGSQL}
29	+LIB=${LIB_MYSQL} ${LIB_PGSQL}	32	+LIB=${LIB_MYSQL} ${LIB_PGSQL}
30		33