- update to cvs version

- fix typo

PR:		55042
Submitted by:	maintainer
Approved by:	fjoe (mentor) (implicit)

4 files changed, 23 insertions, 14 deletions

diff --git a/www/mod_accounting/Makefile b/www/mod_accounting/Makefile
index d3d4a4a87c2..7a90284ce4c 100644
--- a/www/mod_accounting/Makefile
+++ b/www/mod_accounting/Makefile
@@ -7,10 +7,15 @@
 
 PORTNAME=	mod_accounting
 PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	mod-acct
 
+PATCH_SITES=	http://www.cultdeadsheep.org/FreeBSD/ports/download/distfiles/
+PATCHFILES=	mod_accounting-patch-0.5_to_0.6-cvs.gz
+PATCH_DIST_STRIP=-p1
+
 MAINTAINER=	sheepkiller@cultdeadsheep.org
 COMMENT=	An Apache module that records traffic statistics into a database
 
@@ -38,7 +43,6 @@ MYSQL_VER=	41
 MYSQL_VER=	323
 .endif
 
-
 .if defined(WITHOUT_PGSQL)
 MAKE_ARGS+=	WITHOUT_PGSQL=YES
 .else
@@ -51,7 +55,7 @@ MAKE_ARGS+=	WITHOUT_MYSQL=YES
 LIB_DEPENDS+=	mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client
 .endif
 
-DOCS=		README FAQ.txt LICENSE
+DOCS=		README docs/FAQ.txt LICENSE
 
 pre-everything::
 	@${ECHO} ""
@@ -63,11 +67,12 @@ pre-everything::
 	@${ECHO} ""
 	@${ECHO} "      WITHOUT_MYSQL        Disable MySQL support"
 	@${ECHO} "      WITHOUT_PGSQL        Disable PostgreSQL support"
+	@${ECHO} "      WITHOUT_PLAINTEXT    Disable file (plain text) support"
 	@${ECHO} ""
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/schema.sql ${PREFIX}/share/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/docs/schema.sql ${PREFIX}/share/${PORTNAME}
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for doc in ${DOCS}
diff --git a/www/mod_accounting/distinfo b/www/mod_accounting/distinfo
index 34b0432586f..9f8dd1c5a71 100644
--- a/www/mod_accounting/distinfo
+++ b/www/mod_accounting/distinfo
@@ -1 +1,2 @@
 MD5 (mod_accounting-0.5.tar.gz) = fc045bbdc5ae32241765fea2967a63fb
+MD5 (mod_accounting-patch-0.5_to_0.6-cvs.gz) = 36fd89d7d7b9d7ff6744e72f3d50e85a
diff --git a/www/mod_accounting/files/patch-Makefile b/www/mod_accounting/files/patch-Makefile
index 7a341994cd5..2485eb44a13 100644
--- a/www/mod_accounting/files/patch-Makefile
+++ b/www/mod_accounting/files/patch-Makefile
@@ -1,17 +1,16 @@
---- Makefile.orig	Sun Dec 30 14:11:43 2001
-+++ Makefile	Tue Nov 19 21:07:22 2002
-@@ -5,13 +5,24 @@
+--- 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
-+#APXS=apxs
- APACHECTL=apachectl
+-APACHECTL=apachectl
  
--#   here's what you may need to change
--DEF=-DNEED_POSTGRES -DNEED_MYSQL
--INC=-I/usr/local/pgsql/include/ -I/usr/local/mysql/include/
--LIB=-L/usr/local/pgsql/lib -lpq -L/usr/local/mysql/lib/mysql/ -lmysqlclient
+ #   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
@@ -24,7 +23,11 @@
 +LIB_MYSQL=      -L${LOCALBASE}/lib/mysql -lmysqlclient
 +.endif
 +
-+DEF=${DEF_MYSQL} ${DEF_PGSQL}
++.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}
  
diff --git a/www/mod_accounting/pkg-plist b/www/mod_accounting/pkg-plist
index 7483bdbd923..281cc503fbb 100644
--- a/www/mod_accounting/pkg-plist
+++ b/www/mod_accounting/pkg-plist
@@ -1,6 +1,6 @@
 libexec/apache/mod_accounting.so
 @exec %D/sbin/apxs -e -a -n accounting %D/%f
-@unexec echo "===>  If you do not plan on reinstalling mod_accounting, you must manually remove"; echo "===> references to it in httpd.conf."
+@unexec echo "===>  If you do not plan on reinstalling mod_accounting, you must manually remove"; echo "===>  references to it in httpd.conf."
 share/mod_accounting/schema.sql
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/FAQ.txt