Skip site navigation (1)Skip section navigation (2)
Date:      Sun,  7 Sep 2003 19:12:33 +0200
From:      Clement Laforet <sheepkiller@cultdeadsheep.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        Clement Laforet <sheepkiller@cultdeadsheep.org>
Subject:   ports/56562: [update] www/mod_sqlinclude: update to 1.4
Message-ID:  <20030907171237.CA88B43F93@mx1.FreeBSD.org>
Resent-Message-ID: <200309071720.h87HKBDm037086@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         56562
>Category:       ports
>Synopsis:       [update] www/mod_sqlinclude: update to 1.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 07 10:20:10 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Clement Laforet
>Release:        FreeBSD 5.1-CURRENT i386
>Organization:
cotds.org
>Environment:
System: FreeBSD lucifer.cultdeadsheep.org 5.1-CURRENT FreeBSD 5.1-CURRENT #2: Mon Sep 1 10:07:15 CEST 2003 root@lucifer.cultdeadsheep.org:/usr/obj/usr/src/sys/LUCIFER i386


	
>Description:
	- Update mod_sqlinclude to 1.4.
	- Use USE_MYSQL
	- Force the use of MySQL 3.23 since it doesn't support 4.x
	- Use %%DOCSDIR%% in pkg_plist
	Removed file : files/patch-mod_sqlinclude.c

>How-To-Repeat:
	N/A.
>Fix:

	

--- mod_sqlinclude.diff begins here ---
diff -Nru mod_sqlinclude.old/Makefile mod_sqlinclude/Makefile
--- mod_sqlinclude.old/Makefile	Sat Sep  6 11:51:24 2003
+++ mod_sqlinclude/Makefile	Sat Sep  6 10:26:18 2003
@@ -5,22 +5,23 @@
 # $FreeBSD: ports/www/mod_sqlinclude/Makefile,v 1.4 2003/03/07 06:12:45 ade Exp $
 
 PORTNAME=	mod_sqlinclude
-PORTVERSION=	1.2
+PORTVERSION=	1.4
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME:S/_/-/}
-DISTNAME=	${PORTNAME}_${PORTVERSION}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	anders@FreeBSD.org
 COMMENT=	An Apache module implementing config inclusion from MySQL databases
 
 BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
-LIB_DEPENDS=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
 
+USE_MYSQL=	YES
+WANT_MYSQL_VER=	323
+
 APXS?=		${LOCALBASE}/sbin/apxs
-DOCS=	CHANGES.txt README.txt TODO.txt
+DOCS=		CHANGES.txt README.txt TODO.txt test.sql
 
 do-build:
 	(cd ${WRKSRC} && ${APXS} -c -I${LOCALBASE}/include \
diff -Nru mod_sqlinclude.old/distinfo mod_sqlinclude/distinfo
--- mod_sqlinclude.old/distinfo	Sat Sep  6 11:51:24 2003
+++ mod_sqlinclude/distinfo	Sat Sep  6 10:15:22 2003
@@ -1 +1 @@
-MD5 (mod_sqlinclude_1.2.tgz) = 4db84fa282416ca098d937d18cd262d6
+MD5 (mod_sqlinclude-1.4.tgz) = ecb1fd5d5a89c55e7dda4a9a456b0c13
diff -Nru mod_sqlinclude.old/files/patch-mod_sqlinclude.c mod_sqlinclude/files/patch-mod_sqlinclude.c
--- mod_sqlinclude.old/files/patch-mod_sqlinclude.c	Sat Sep  6 11:51:24 2003
+++ mod_sqlinclude/files/patch-mod_sqlinclude.c	Thu Jan  1 01:00:00 1970
@@ -1,11 +0,0 @@
---- mod_sqlinclude.c.orig	Thu Oct 25 17:09:46 2001
-+++ mod_sqlinclude.c	Thu Oct 25 17:10:00 2001
-@@ -376,7 +376,7 @@
- 	{ "SQL_SQLPassword", cmd_sqli_sqlpassword, NULL, RSRC_CONF, TAKE1,
- 	 		"the MySQL password for SQLI_User. No default" },
- 	{ "SQL_SQLDB", cmd_sqli_sqldb, NULL, RSRC_CONF, TAKE1,
--			"the MySQL database the module shall use. Default 'sqlinclude' },
-+			"the MySQL database the module shall use. Default 'sqlinclude'" },
- 				  
-    { "SQL_Include", cmd_sqli_include, NULL, RSRC_CONF, TAKE1,
- 			"valid SQL query. Data returned in 1st column will be passed to Apache" },
diff -Nru mod_sqlinclude.old/pkg-plist mod_sqlinclude/pkg-plist
--- mod_sqlinclude.old/pkg-plist	Sat Sep  6 11:51:24 2003
+++ mod_sqlinclude/pkg-plist	Sat Sep  6 10:27:11 2003
@@ -1,7 +1,8 @@
 libexec/apache/mod_sqlinclude.so
 @exec %D/sbin/apxs -e -A -n sqlinclude %f
 @unexec %D/sbin/apxs -e -A -n sqlinclude %f
-%%PORTDOCS%%share/doc/mod_sqlinclude/CHANGES.txt
-%%PORTDOCS%%share/doc/mod_sqlinclude/README.txt
-%%PORTDOCS%%share/doc/mod_sqlinclude/TODO.txt
-%%PORTDOCS%%@dirrm share/doc/mod_sqlinclude
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/TODO.txt
+%%PORTDOCS%%%%DOCSDIR%%/test.sql
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- mod_sqlinclude.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030907171237.CA88B43F93>