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

(-)dcc-dccd/Makefile (-18 / +9 lines)
Lines 6-12 Link Here
6
#
6
#
7
7
8
PORTNAME=	dcc-dccd
8
PORTNAME=	dcc-dccd
9
PORTVERSION=	1.3.5
9
PORTVERSION=	1.3.9
10
CATEGORIES=	mail
10
CATEGORIES=	mail
11
MASTER_SITES=	http://www.rhyolite.com/anti-spam/dcc/source/ \
11
MASTER_SITES=	http://www.rhyolite.com/anti-spam/dcc/source/ \
12
		http://www.wa.apana.org.au/~dean/sources/ \
12
		http://www.wa.apana.org.au/~dean/sources/ \
Lines 33-43 Link Here
33
DCCGROUP?=	dcc
33
DCCGROUP?=	dcc
34
DCCGID?=	112
34
DCCGID?=	112
35
35
36
# if no preference was set, check for an up to date base version
36
#
37
# but give an installed port preference over it.
37
# Use configure script to set locations of all files. Use of
38
# sed scripting breaks things.
39
#
38
40
39
HOMEDIR=	${PREFIX}/dcc
41
CONFIGURE_ARGS=	--homedir=${PREFIX}/dcc --bindir=${PREFIX}/bin --mandir=${PREFIX}/man --with-rundir=/var/run
40
CONFIGURE_ARGS=	--homedir=${HOMEDIR}
41
42
42
.include <bsd.port.pre.mk>
43
.include <bsd.port.pre.mk>
43
44
Lines 82-88 Link Here
82
PLIST_SUB+=	WITH_DCCIFD=""
83
PLIST_SUB+=	WITH_DCCIFD=""
83
.endif
84
.endif
84
85
85
CONFIGURE_ARGS+=	--with-uid=${DCCUSER}
86
CONFIGURE_ARGS+=	--with-uid=${DCCUSER} 
87
86
SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g' \
88
SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g' \
87
		-e 's|%%DCCUSER%%|${DCCUSER}|g' -e 's|%%DCCUID%%|${DCCUID}|g' \
89
		-e 's|%%DCCUSER%%|${DCCUSER}|g' -e 's|%%DCCUID%%|${DCCUID}|g' \
88
		-e 's|%%DCCGROUP%%|${DCCGROUP}|g' -e 's|%%DCCGID%%|${DCCGID}|g'
90
		-e 's|%%DCCGROUP%%|${DCCGROUP}|g' -e 's|%%DCCGID%%|${DCCGID}|g'
Lines 98-120 Link Here
98
	@${ECHO_MSG} 'WITHOUT_SENDMAIL=yes'
100
	@${ECHO_MSG} 'WITHOUT_SENDMAIL=yes'
99
	@${ECHO_MSG} ''
101
	@${ECHO_MSG} ''
100
102
101
post-patch:
102
	${FIND} ${WRKSRC} -type f -exec \
103
		${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},g' {} \;
104
	${REINPLACE_CMD} -e 's,PTHREAD_LDFLAGS="$$PTHREAD_LDFLAGS -pthread,PTHREAD_LDFLAGS="$$PTHREAD_LDFLAGS,g' ${WRKSRC}/configure
105
	${REINPLACE_CMD} -e 's,FreeBSD)\n\tPTHREAD_LDFLAGS,FreeBSD)\n\tDCC_CFLAGS="${PTHREAD_CFLAGS} $$DCC_CFLAGS"\n\tPTHREAD_LDFLAGS,g' ${WRKSRC}/configure
106
	${REINPLACE_CMD} -e 's,PTHREAD_LIBS="$$PTHREAD_LIBS -lc_r,PTHREAD_LIBS=" ${PTHREAD_LIBS},g' ${WRKSRC}/configure
107
108
post-build:
103
post-build:
109
	@${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-install >${PKGINSTALL}
104
	@${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-install >${PKGINSTALL}
110
	@${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-deinstall >${PKGDEINSTALL}
105
	@${SED} ${SED_SCRIPT} ${PKGDIR}/pkg-deinstall >${PKGDEINSTALL}
111
106
112
pre-install:
107
pre-install:
113
	@${SETENV} PKG_PREFIX=${PREFIX} \
108
	@${SETENV} PKG_PREFIX=${PREFIX} \
114
		${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL
109
	${SH} ${PKGINSTALL} ${PREFIX} PRE-INSTALL
115
116
post-install:
117
	@[ -s ${HOMEDIR}/dcc_conf ] || \
118
		${CP} ${HOMEDIR}/dcc_conf.dist ${HOMEDIR}/dcc_conf
119
110
120
.include <bsd.port.post.mk>
111
.include <bsd.port.post.mk>
(-)dcc-dccd/distinfo (-2 / +2 lines)
Lines 1-2 Link Here
1
MD5 (dcc-dccd-1.3.5.tar.Z) = f51fe9106e79fe0dd00192f7c7998447
1
MD5 (dcc-dccd-1.3.9.tar.Z) = 89d6336ec9d365db13f0c9a22d64172a
2
SIZE (dcc-dccd-1.3.5.tar.Z) = 1307125
2
SIZE (dcc-dccd-1.3.9.tar.Z) = 1346997
(-)dcc-dccd/files/patch-configure (-6 / +17 lines)
Lines 1-16 Link Here
1
--- configure.orig	Thu May 26 21:52:13 2005
1
--- configure.orig	Fri Jul 22 11:36:56 2005
2
+++ configure	Sun Jun 12 11:17:03 2005
2
+++ configure	Sat Jul 23 11:27:41 2005
3
@@ -2491,6 +2491,13 @@
3
@@ -2371,8 +2371,8 @@
4
 	;;
5
     *)
6
 	DCCUID=root
7
-	BINUID=bin
8
-	BIN_GRP=bin
9
+	BINUID=root
10
+	BIN_GRP=dcc
11
 	;;
12
 esac
13
 
14
@@ -2445,6 +2445,13 @@
15
     SENDMAIL="$with_sendmail"
4
     SENDMAIL_EVAL="$SENDMAIL"
16
     SENDMAIL_EVAL="$SENDMAIL"
5
     with_sendmail=yes
17
     with_sendmail=yes
6
 fi
18
+fi
7
+if test -n "$SENDMAIL" -a "$SENDMAIL" != "no"; then
19
+if test -n "$SENDMAIL" -a "$SENDMAIL" != "no"; then
8
+    if test -f $SENDMAIL/include/libmilter/mfapi.h -a -f $SENDMAIL/lib/libmilter.a; then
20
+    if test -f $SENDMAIL/include/libmilter/mfapi.h -a -f $SENDMAIL/lib/libmilter.a; then
9
+    SENDMAIL_OBJ=$SENDMAIL/lib
21
+    SENDMAIL_OBJ=$SENDMAIL/lib
10
+    SENDMAIL_OBJ_EVAL=$SENDMAIL_OBJ
22
+    SENDMAIL_OBJ_EVAL=$SENDMAIL_OBJ
11
+    SENDMAIL_LIB=$SENDMAIL_OBJ/libmilter.a
23
+    SENDMAIL_LIB=$SENDMAIL_OBJ/libmilter.a
12
+    fi
24
+    fi
13
+fi
25
 fi
14
 if test -z "$SENDMAIL"; then
26
 if test -z "$SENDMAIL"; then
15
     # prefer a parallel ../sendmail directory
27
     # prefer a parallel ../sendmail directory
16
     DEPTH=.
(-)dcc-dccd/pkg-plist (+4 lines)
Lines 24-31 Link Here
24
dcc/libexec/dcc-stats-init
24
dcc/libexec/dcc-stats-init
25
dcc/libexec/dccd
25
dcc/libexec/dccd
26
dcc/libexec/dccsight
26
dcc/libexec/dccsight
27
dcc/libexec/fetchblack
27
dcc/libexec/fetch-testmsg-whitelist
28
dcc/libexec/fetch-testmsg-whitelist
28
dcc/libexec/hackmc
29
dcc/libexec/hackmc
30
dcc/libexec/list-clients
29
dcc/libexec/logger
31
dcc/libexec/logger
30
dcc/libexec/newwebuser
32
dcc/libexec/newwebuser
31
dcc/libexec/rcDCC
33
dcc/libexec/rcDCC
Lines 42-47 Link Here
42
dcc/whiteclnt
44
dcc/whiteclnt
43
dcc/whitecommon
45
dcc/whitecommon
44
dcc/whitelist
46
dcc/whitelist
47
share/nls/POSIX
48
share/nls/en_US.US-ASCII
45
@dirrm dcc/log
49
@dirrm dcc/log
46
@dirrm dcc/libexec
50
@dirrm dcc/libexec
47
@dirrm dcc/cgi-bin
51
@dirrm dcc/cgi-bin

Return to bug 83936