Attachment #44217 for bug #68517

View | Details | Raw Unified | Return to bug 68517
Collapse All | Expand All




#

PORTNAME=	dansguardian
PORTVERSION=	2.7.7.9
CATEGORIES=	www
MASTER_SITES=	# empty, see below
DISTNAME=	DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}.source

		--piddir=/var/run/
MAN8=		dansguardian.8

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

# 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

Lines 1-2 Link Here

(-)dansguardian-devel/distinfo (-2 / +2 lines)
1	MD5 (DansGuardian-2.7.7-8.source.tar.gz) = b7528fee2409a0d1b5789f5650c0b23c	1	MD5 (DansGuardian-2.7.7-9.source.tar.gz) = d7837b07adf1d04848db752f3fdd7b44
2	SIZE (DansGuardian-2.7.7-8.source.tar.gz) = 187086	2	SIZE (DansGuardian-2.7.7-9.source.tar.gz) = 187652




--- 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 @@
 		 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}\"
 
 #Some advanced options:
 #WARNING = -Wall
 #OPTIMISE = -O2
-+OPTIMISE = ${CXXFLAGS}
+OPTIMISE = ${CXXFLAGS}
 #DEBUG += -DDGDEBUG
 #STATIC = -static
 
@@ -43,48 +43,37 @@
 	$(CPP) -o dansguardian $(DGCFLAGS) $(DEBUG) $(OBJ) $(LIBS) dansguardian.cpp
 
 install:

Return to bug 68517

Lines 6-12 Link Here

(-)dansguardian-devel/Makefile (-3 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= dansguardian	8	PORTNAME= dansguardian
9	PORTVERSION= 2.7.7.8	9	PORTVERSION= 2.7.7.9
10	CATEGORIES= www	10	CATEGORIES= www
11	MASTER_SITES= # empty, see below	11	MASTER_SITES= # empty, see below
12	DISTNAME= DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}.source	12	DISTNAME= DansGuardian-${PORTVERSION:R}-${PORTVERSION:E}.source
Lines 34-41 Link Here
34	--piddir=/var/run/	34	--piddir=/var/run/
35	MAN8= dansguardian.8	35	MAN8= dansguardian.8
36		36
37	OPTIONS= DG_GCC3 "Compile using GCC 3.x on FreeBSD 4.x." off \	37	OPTIONS= DG_GCC3 "Compile using GCC 3.3 on FreeBSD 4.x." off \
38	DG_PHRASELISTS "Install new phraselists." off	38	DG_PHRASELISTS "Install new phraselists. (Overwrites existing.)" off
39		39
40	DG_URL= http://dansguardian.org/index.php?page=copyright2	40	DG_URL= http://dansguardian.org/index.php?page=copyright2
41	CONFDIR= ${PREFIX}/etc/dansguardian	41	CONFDIR= ${PREFIX}/etc/dansguardian
Lines 49-54 Link Here
49	# On FreeBSD 4.x, user can choose which GCC version to use	49	# On FreeBSD 4.x, user can choose which GCC version to use
50	.if ${OSVERSION} > 500000 \|\| defined(WITH_DG_GCC3)	50	.if ${OSVERSION} > 500000 \|\| defined(WITH_DG_GCC3)
51	CONFIGURE_ARGS+= --gccver=3	51	CONFIGURE_ARGS+= --gccver=3
		52	USE_GCC= 3.3
52	.else	53	.else
53	CONFIGURE_ARGS+= --gccver=2	54	CONFIGURE_ARGS+= --gccver=2
54	.endif	55	.endif

Lines 1-23 Link Here

(-)dansguardian-devel/files/patch-autoconf::fbsd.in (-15 / +7 lines)
1	--- autoconf/fbsd.in.orig Thu May 6 09:20:45 2004	1	--- autoconf/fbsd.in.orig Tue Jun 29 10:21:27 2004
2	+++ autoconf/fbsd.in Thu May 6 09:31:36 2004	2	+++ autoconf/fbsd.in Tue Jun 29 10:23:52 2004
3	@@ -21,13 +21,13 @@	3	@@ -28,7 +28,7 @@
4	logrotate.dansguardian dansguardianf1.conf
5
6	PASSVARS = -DPROXYUSER=\"${PROXYUSER}\"
7	-#PASSVARS += -DLOGLOCATION=\"${LOGLOCATION}access.log\"
8	+PASSVARS += -DLOGLOCATION=\"${LOGLOCATION}dansguardian.log\"
9	PASSVARS += -DCONFFILELOCATION=\"${CONFFILELOCATION}dansguardian.conf\"
10	#PASSVARS += -DPIDDIR=\"${PIDDIR}\"
11
12	#Some advanced options:	4	#Some advanced options:
13	-WARNING = -Wall	5	#WARNING = -Wall
14	-OPTIMISE = -O2	6	#OPTIMISE = -O2
15	+#WARNING = -Wall	7	-+OPTIMISE = ${CXXFLAGS}
16	+OPTIMISE = ${CXXFLAGS}	8	+OPTIMISE = ${CXXFLAGS}
17	#DEBUG += -DDGDEBUG	9	#DEBUG += -DDGDEBUG
18	#STATIC = -static	10	#STATIC = -static
19		11
20	@@ -42,48 +42,37 @@	12	@@ -43,48 +43,37 @@
21	$(CPP) -o dansguardian $(DGCFLAGS) $(DEBUG) $(OBJ) $(LIBS) dansguardian.cpp	13	$(CPP) -o dansguardian $(DGCFLAGS) $(DEBUG) $(OBJ) $(LIBS) dansguardian.cpp
22		14
23	install:	15	install: