Attachment 33682 Details for Bug 55042 – mod_accounting.diff

[patch] mod_accounting.diff

mod_accounting.diff (text/plain), 3.77 KB, created by Clement Laforet on 2003-07-30 11:20:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Clement Laforet

Created: 2003-07-30 11:20:09 UTC

Size: 3.77 KB

patch

obsolete

>diff -Nru mod_accounting.old/Makefile mod_accounting/Makefile
>--- mod_accounting.old/Makefile	Wed Jul 30 09:55:53 2003
>+++ mod_accounting/Makefile	Wed Jul 30 09:56:45 2003
>@@ -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
> 
>@@ -51,7 +56,7 @@
> 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 +68,12 @@
> 	@${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 -Nru mod_accounting.old/distinfo mod_accounting/distinfo
>--- mod_accounting.old/distinfo	Wed Jul 30 09:55:53 2003
>+++ mod_accounting/distinfo	Wed Jul 30 09:32:37 2003
>@@ -1 +1,2 @@
> MD5 (mod_accounting-0.5.tar.gz) = fc045bbdc5ae32241765fea2967a63fb
>+MD5 (mod_accounting-patch-0.5_to_0.6-cvs.gz) = 36fd89d7d7b9d7ff6744e72f3d50e85a
>diff -Nru mod_accounting.old/files/patch-Makefile mod_accounting/files/patch-Makefile
>--- mod_accounting.old/files/patch-Makefile	Wed Jul 30 09:55:53 2003
>+++ mod_accounting/files/patch-Makefile	Wed Jul 30 09:41:51 2003
>@@ -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 -Nru mod_accounting.old/pkg-plist mod_accounting/pkg-plist
>--- mod_accounting.old/pkg-plist	Wed Jul 30 09:55:53 2003
>+++ mod_accounting/pkg-plist	Wed Jul 30 09:44:42 2003
>@@ -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

Actions: View | Diff

Attachments on bug 55042: 33682