Date: Wed, 30 Jun 2004 08:20:28 -0700 (PDT) From: Freddie Cash <fcash-ml@sd73.bc.ca> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/68517: port update: www/dansguardian-devel to version 2.7.7-9 Message-ID: <20040630152028.B657BB800E@spark.sd73.bc.ca> Resent-Message-ID: <200406301530.i5UFUI5K049872@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 68517
>Category: ports
>Synopsis: port update: www/dansguardian-devel to version 2.7.7-9
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed Jun 30 15:30:18 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Freddie Cash
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
School District 73
>Environment:
System: FreeBSD spark.sd73.bc.ca 5.2-CURRENT FreeBSD 5.2-CURRENT #1: Mon May 31 17:01:41 PDT 2004 root@spark.sd73.bc.ca:/usr/obj/usr/src/sys/SPARK i386
System: FreeBSD phoenix.sd73.bc.ca 4.10-RELEASE FreeBSD 4.10-RELEASE #10: Tue Jun 8 15:01:38 PDT 2004 root@phoenix.sd73.bc.ca:/usr/obj/usr/src/sys/PHOENIX i386
>Description:
Update port to use the latest development version of DansGuardian (2.7.7-9).
Also added USE_GCC to properly check for and install GCC 3.3 if user selects that from the options menu.
Re-worded the options menu items to be a little more clear about what they do.
>How-To-Repeat:
>Fix:
Tested the patch below on the two systems listed above (4.10 and 5-CURRENT).
Compiles correctly using system GCC and GCC 3.3 from ports on FreeBSD 4.10.
Compiles correctly using system GCC on FreeBSD 5-CURRENT.
Launches and runs under both test systems above. Haven't done any stress testing, though.
--- dansguardian-devel-2.7.7-9.diff begins here ---
diff -ruN dansguardian-devel.orig/Makefile dansguardian-devel/Makefile
--- dansguardian-devel.orig/Makefile Tue Jun 29 10:11:37 2004
+++ dansguardian-devel/Makefile Tue Jun 29 10:51:16 2004
@@ -6,7 +6,7 @@
#
PORTNAME= dansguardian
-PORTVERSION= 2.7.7.8
+PORTVERSION= 2.7.7.9
CATEGORIES= www
MASTER_SITES= # empty, see below
DISTNAME= DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}.source
@@ -34,8 +34,8 @@
--piddir=/var/run/
MAN8= dansguardian.8
-OPTIONS= DG_GCC3 "Compile using GCC 3.x on FreeBSD 4.x." off \
- DG_PHRASELISTS "Install new phraselists." off
+OPTIONS= DG_GCC3 "Compile using GCC 3.3 on FreeBSD 4.x." off \
+ DG_PHRASELISTS "Install new phraselists. (Overwrites existing.)" off
DG_URL= http://dansguardian.org/index.php?page=copyright2
CONFDIR= ${PREFIX}/etc/dansguardian
@@ -49,6 +49,7 @@
# On FreeBSD 4.x, user can choose which GCC version to use
.if ${OSVERSION} > 500000 || defined(WITH_DG_GCC3)
CONFIGURE_ARGS+= --gccver=3
+USE_GCC= 3.3
.else
CONFIGURE_ARGS+= --gccver=2
.endif
diff -ruN dansguardian-devel.orig/distinfo dansguardian-devel/distinfo
--- dansguardian-devel.orig/distinfo Tue Jun 29 10:11:37 2004
+++ dansguardian-devel/distinfo Tue Jun 29 10:13:01 2004
@@ -1,2 +1,2 @@
-MD5 (DansGuardian-2.7.7-8.source.tar.gz) = b7528fee2409a0d1b5789f5650c0b23c
-SIZE (DansGuardian-2.7.7-8.source.tar.gz) = 187086
+MD5 (DansGuardian-2.7.7-9.source.tar.gz) = d7837b07adf1d04848db752f3fdd7b44
+SIZE (DansGuardian-2.7.7-9.source.tar.gz) = 187652
diff -ruN dansguardian-devel.orig/files/patch-autoconf::fbsd.in dansguardian-devel/files/patch-autoconf::fbsd.in
--- dansguardian-devel.orig/files/patch-autoconf::fbsd.in Tue Jun 29 10:11:37 2004
+++ dansguardian-devel/files/patch-autoconf::fbsd.in Tue Jun 29 10:24:21 2004
@@ -1,23 +1,15 @@
---- autoconf/fbsd.in.orig Thu May 6 09:20:45 2004
-+++ autoconf/fbsd.in Thu May 6 09:31:36 2004
-@@ -21,13 +21,13 @@
- logrotate.dansguardian dansguardianf1.conf
-
- PASSVARS = -DPROXYUSER=\"${PROXYUSER}\"
--#PASSVARS += -DLOGLOCATION=\"${LOGLOCATION}access.log\"
-+PASSVARS += -DLOGLOCATION=\"${LOGLOCATION}dansguardian.log\"
- PASSVARS += -DCONFFILELOCATION=\"${CONFFILELOCATION}dansguardian.conf\"
- #PASSVARS += -DPIDDIR=\"${PIDDIR}\"
-
+--- autoconf/fbsd.in.orig Tue Jun 29 10:21:27 2004
++++ autoconf/fbsd.in Tue Jun 29 10:23:52 2004
+@@ -28,7 +28,7 @@
#Some advanced options:
--WARNING = -Wall
--OPTIMISE = -O2
-+#WARNING = -Wall
+ #WARNING = -Wall
+ #OPTIMISE = -O2
+-+OPTIMISE = ${CXXFLAGS}
+OPTIMISE = ${CXXFLAGS}
#DEBUG += -DDGDEBUG
#STATIC = -static
-@@ -42,48 +42,37 @@
+@@ -43,48 +43,37 @@
$(CPP) -o dansguardian $(DGCFLAGS) $(DEBUG) $(OBJ) $(LIBS) dansguardian.cpp
install:
--- dansguardian-devel-2.7.7-9.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?20040630152028.B657BB800E>