Attachment 54294 Details for Bug 82156 – file.diff

[patch] file.diff

file.diff (text/plain), 3.75 KB, created by Dean Hollister on 2005-06-12 04:50:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dean Hollister

Created: 2005-06-12 04:50:10 UTC

Size: 3.75 KB

patch

obsolete

>diff -ruN dcc-dccd.orig/Makefile dcc-dccd/Makefile
>--- dcc-dccd.orig/Makefile	Wed Dec 29 01:10:01 2004
>+++ dcc-dccd/Makefile	Sun Jun 12 11:31:36 2005
>@@ -6,9 +6,9 @@
> #
> 
> PORTNAME=	dcc-dccd
>-PORTVERSION=	1.2.66
>+PORTVERSION=	1.3.5
> CATEGORIES=	mail
>-MASTER_SITES=	http://www.rhyolite.com/anti-spam/dcc/source/old/ \
>+MASTER_SITES=	http://www.rhyolite.com/anti-spam/dcc/source/ \
> 		http://www.wa.apana.org.au/~dean/sources/ \
> 		ftp://ftp.wa.apana.org.au/pub/unix/packages/
> EXTRACT_SUFX=	.tar.Z
>@@ -33,16 +33,6 @@
> DCCGROUP?=	dcc
> DCCGID?=	112
> 
>-#
>-# You can choose the sendmail to be used by specifying
>-#
>-# WITH_SENDMAIL_BASE=yes
>-#  or
>-# WITH_SENDMAIL_PORT=yes
>-#  or
>-# WITHOUT_SENDMAIL=yes
>-#
>-
> # if no preference was set, check for an up to date base version
> # but give an installed port preference over it.
> 
>@@ -61,7 +51,7 @@
> WITH_SENDMAIL=	yes
> .else
> .if !defined(WITHOUT_SENDMAIL)
>-BROKEN=		"Base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes"
>+BROKEN=		"Base system sendmail not found or too old, rebuild with WITH_SENDMAIL_PORT=yes or WITHOUT_SENDMAIL=yes"
> .endif
> .endif
> .else
>@@ -96,6 +86,17 @@
> SED_SCRIPT=	-e 's|%%PREFIX%%|${PREFIX}|g' \
> 		-e 's|%%DCCUSER%%|${DCCUSER}|g' -e 's|%%DCCUID%%|${DCCUID}|g' \
> 		-e 's|%%DCCGROUP%%|${DCCGROUP}|g' -e 's|%%DCCGID%%|${DCCGID}|g'
>+
>+pre-everything::
>+	@${ECHO_MSG} ' '
>+	@${ECHO_MSG} 'You can choose the sendmail to be used by specifying:'
>+	@${ECHO_MSG} ' '
>+	@${ECHO_MSG} 'WITH_SENDMAIL_BASE=yes'
>+	@${ECHO_MSG} 'or'
>+	@${ECHO_MSG} 'WITH_SENDMAIL_PORT=yes'
>+	@${ECHO_MSG} 'or'
>+	@${ECHO_MSG} 'WITHOUT_SENDMAIL=yes'
>+	@${ECHO_MSG} ''
> 
> post-patch:
> 	${FIND} ${WRKSRC} -type f -exec \
>diff -ruN dcc-dccd.orig/distinfo dcc-dccd/distinfo
>--- dcc-dccd.orig/distinfo	Wed Dec 29 01:10:01 2004
>+++ dcc-dccd/distinfo	Sun Jun 12 11:04:15 2005
>@@ -1,2 +1,2 @@
>-MD5 (dcc-dccd-1.2.66.tar.Z) = fa59dd012edab462462e552482bd9872
>-SIZE (dcc-dccd-1.2.66.tar.Z) = 1181351
>+MD5 (dcc-dccd-1.3.5.tar.Z) = f51fe9106e79fe0dd00192f7c7998447
>+SIZE (dcc-dccd-1.3.5.tar.Z) = 1307125
>diff -ruN dcc-dccd.orig/files/patch-configure dcc-dccd/files/patch-configure
>--- dcc-dccd.orig/files/patch-configure	Sun Nov 21 10:35:46 2004
>+++ dcc-dccd/files/patch-configure	Sun Jun 12 11:17:52 2005
>@@ -1,18 +1,16 @@
>---- configure.orig	Mon May 17 21:32:49 2004
>-+++ configure	Tue May 25 18:19:48 2004
>-@@ -2244,6 +2244,15 @@
>+--- configure.orig	Thu May 26 21:52:13 2005
>++++ configure	Sun Jun 12 11:17:03 2005
>+@@ -2491,6 +2491,13 @@
>      SENDMAIL_EVAL="$SENDMAIL"
>      with_sendmail=yes
>  fi
>-+#
> +if test -n "$SENDMAIL" -a "$SENDMAIL" != "no"; then
> +    if test -f $SENDMAIL/include/libmilter/mfapi.h -a -f $SENDMAIL/lib/libmilter.a; then
>-+        SENDMAIL_OBJ=$SENDMAIL/lib
>-+        SENDMAIL_OBJ_EVAL=$SENDMAIL_OBJ
>-+        SENDMAIL_LIB=$SENDMAIL_OBJ/libmilter.a
>++    SENDMAIL_OBJ=$SENDMAIL/lib
>++    SENDMAIL_OBJ_EVAL=$SENDMAIL_OBJ
>++    SENDMAIL_LIB=$SENDMAIL_OBJ/libmilter.a
> +    fi
> +fi
>-+#
>  if test -z "$SENDMAIL"; then
>      # prefer a parallel ../sendmail directory
>      DEPTH=.
>diff -ruN dcc-dccd.orig/files/patch-homedir::Makefile.in dcc-dccd/files/patch-homedir::Makefile.in
>--- dcc-dccd.orig/files/patch-homedir::Makefile.in	Sun Nov 21 10:35:46 2004
>+++ dcc-dccd/files/patch-homedir::Makefile.in	Sun Jun 12 11:13:05 2005
>@@ -1,9 +1,9 @@
>---- homedir/Makefile.in	Tue May 25 20:37:04 2004
>-+++ homedir/Makefile.in	Tue May 25 20:38:04 2004
>-@@ -28,11 +28,7 @@
>- install:
>+--- homedir/Makefile.in.orig	Sun Jun 12 11:09:03 2005
>++++ homedir/Makefile.in	Sun Jun 12 11:10:04 2005
>+@@ -44,11 +44,7 @@
>  	for nm in $(INST_HOMEDIR) $(INST_HOMEDIR)/log; do \
>- 	  $(HINSTALL) -m 755 -d $$nm; done
>+ 	  if test ! -d $$nm; then \
>+ 	    $(HINSTALL) -m 755 -d $$nm; fi; done
> -	if test -s $(INST_HOMEDIR)/dcc_conf; then \
> -	  sh make-dcc_conf -h $(INST_HOMEDIR); \
> -	else \

Actions: View | Diff

Attachments on bug 82156: 54294