From a90ccb07e23fbf7f38cd0e3231bd132d709c379c Mon Sep 17 00:00:00 2001
From: daichi <daichi@FreeBSD.org>
Date: Tue, 5 Aug 2003 05:30:15 +0000
Subject: update www/mod_accounting: CVS version, which is in port is not
 usable

PR:		55211
Submitted by:	Clement Laforet <sheepkiller@cultdeadsheep.org> (maintainer)
Pointed out by:	Alexandr Kovalenko <never@nevermind.kiev.ua>
---
 www/mod_accounting/Makefile             | 11 +++--------
 www/mod_accounting/distinfo             |  1 -
 www/mod_accounting/files/patch-Makefile | 24 +++++++++++-------------
 3 files changed, 14 insertions(+), 22 deletions(-)

(limited to 'www/mod_accounting')

diff --git a/www/mod_accounting/Makefile b/www/mod_accounting/Makefile
index 7a90284ce4c8..785dd695524b 100644
--- a/www/mod_accounting/Makefile
+++ b/www/mod_accounting/Makefile
@@ -7,15 +7,11 @@
 
 PORTNAME=	mod_accounting
 PORTVERSION=	0.5
-PORTREVISION=	1
+PORTREVISION=	2
 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
 
@@ -55,7 +51,7 @@ MAKE_ARGS+=	WITHOUT_MYSQL=YES
 LIB_DEPENDS+=	mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client
 .endif
 
-DOCS=		README docs/FAQ.txt LICENSE
+DOCS=		README FAQ.txt LICENSE
 
 pre-everything::
 	@${ECHO} ""
@@ -67,12 +63,11 @@ 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}/docs/schema.sql ${PREFIX}/share/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/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 9f8dd1c5a719..34b0432586fb 100644
--- a/www/mod_accounting/distinfo
+++ b/www/mod_accounting/distinfo
@@ -1,2 +1 @@
 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 2485eb44a13e..a1f40454626f 100644
--- a/www/mod_accounting/files/patch-Makefile
+++ b/www/mod_accounting/files/patch-Makefile
@@ -1,16 +1,17 @@
---- Makefile.back	Wed Jul 30 09:41:20 2003
-+++ Makefile	Wed Jul 30 09:40:23 2003
-@@ -5,13 +5,27 @@
+--- Makefile.orig	Sun Dec 30 14:11:43 2001
++++ Makefile	Tue Nov 19 21:07:22 2002
+@@ -5,13 +5,24 @@
  ##
  
  #   the used tools
 -APXS=apxs
--APACHECTL=apachectl
++#APXS=apxs
+ 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
+-#   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
 +.if !defined(WITHOUT_PGSQL)
 +DEF_PGSQL=      -DNEED_POSTGRES
 +INC_PGSQL=      -I${LOCALBASE}/include
@@ -23,13 +24,10 @@
 +LIB_MYSQL=      -L${LOCALBASE}/lib/mysql -lmysqlclient
 +.endif
 +
-+.if !defined(WITHOUT_PLAINTEXT)
-+DEF_PLAINTEXT=-DNEED_PLAINTEXT
-+.endif
-+
-+DEF=${DEF_MYSQL} ${DEF_PGSQL} ${DEF_PLAINTEXT}
++DEF=${DEF_MYSQL} ${DEF_PGSQL}
 +INC=${INC_MYSQL} ${INC_PGSQL}
 +LIB=${LIB_MYSQL} ${LIB_PGSQL}
  
  #   the default target
  all: mod_accounting.so
+
-- 
cgit