Attachment 164331 Details for Bug 205191 – patch

[patch] patch

dcc-dccd.patch (text/plain), 3.29 KB, created by Yuri Victorovich on 2015-12-17 21:54:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yuri Victorovich

Created: 2015-12-17 21:54:21 UTC

Size: 3.29 KB

patch

obsolete

>Index: mail/dcc-dccd/Makefile
>===================================================================
>--- mail/dcc-dccd/Makefile	(revision 403379)
>+++ mail/dcc-dccd/Makefile	(working copy)
>@@ -108,6 +108,9 @@
> LDFLAGS+=	-L${MILTERLIB}
> .endif
> 
>+#LDFLAGS+=	-L${LOCALBASE}/lib -ledit
>+CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
>+
> .if ${PORT_OPTIONS:MDCCIFD} || ${PORT_OPTIONS:MDCCM}
> PLIST_SUB+=	IFD_MILT=""
> .else
>@@ -114,10 +117,20 @@
> PLIST_SUB+=	IFD_MILT="@comment "
> .endif
> 
>+pre-patch:
>+	@${ECHO} "LOCALBASE=-L${LOCALBASE}" > ${WRKSRC}/Makefile.base.inc
>+
> post-stage:
> 	@${MV} ${STAGEDIR}${PREFIX}/dcc/cgi-bin/footer-dist \
> 		${STAGEDIR}${PREFIX}/dcc/cgi-bin/footer.sample
> 	@${MV} ${STAGEDIR}${PREFIX}/dcc/cgi-bin/header-dist \
> 		${STAGEDIR}${PREFIX}/dcc/cgi-bin/header.sample
>+.for f in cdcc dccif-test dccproc
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
>+.endfor
>+.for f in dns-helper ck2ip dbclean dccd dump-clients dblist dccm dccifd dccsight wlist check_ip_range 
>+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/dcc/libexec/${f}
>+.endfor
> 
>+
> .include <bsd.port.mk>
>Index: mail/dcc-dccd/files/patch-Makefile.inc.in
>===================================================================
>--- mail/dcc-dccd/files/patch-Makefile.inc.in	(revision 403379)
>+++ mail/dcc-dccd/files/patch-Makefile.inc.in	(working copy)
>@@ -1,6 +1,17 @@
> --- Makefile.inc.in.orig	2014-08-06 14:43:42 UTC
> +++ Makefile.inc.in
>-@@ -102,7 +102,6 @@ DCC_OWN	    =@DCC_OWN@
>+@@ -69,7 +69,9 @@ NOLINT	    =		# why does NetBSD care abo
>+ NO_LINT	    =		# stop FreeBSD noise about the NetBSD NOLINT
>+ STRIP	    =		# keep FreeBSD from stripping the a.outs
>+ 
>+-LDADD	    +=$(CLNTLIBS) @LIBS@
>++include $(DEPTH)/Makefile.base.inc
>++
>++LDADD	    +=$(LOCALBASE) $(CLNTLIBS) @LIBS@
>+ DPADD	    +=$(CLNTLIBS)
>+ 
>+ #DBGFLAGS   +=-g
>+@@ -102,7 +104,6 @@ DCC_OWN	    =@DCC_OWN@
>  DCC_OWN	    =@DCCSUID@
>  @MAKE_DOT@endif
>  @MAKE_DOT@endif
>@@ -8,7 +19,7 @@
>  
>  @MAKE_DOT@ifndef DCC_GRP
>  DCC_GRP	    =@DCC_GRP@
>-@@ -129,9 +128,9 @@ SET_BINOWN=
>+@@ -129,9 +130,9 @@ SET_BINOWN=
>  SET_MANOWN=
>  SET_DCCOWN=
>  @MAKE_DOT@else
>Index: mail/dcc-dccd/files/patch-configure
>===================================================================
>--- mail/dcc-dccd/files/patch-configure	(revision 403379)
>+++ mail/dcc-dccd/files/patch-configure	(working copy)
>@@ -1,5 +1,14 @@
> --- configure.orig	2014-08-06 14:43:42 UTC
> +++ configure
>+@@ -884,7 +884,7 @@ else
>+   fi
>+ fi
>+  if test "$CC#$OLD_CC" != "cc#"; then
>+-    DCC_CC="CC=$CC"
>++    DCC_CC="CC=$CC -I$LOCALBASE/include -L$LOCALBASE/lib"
>+ else
>+     DCC_CC="#CC="
>+ fi
> @@ -1961,7 +1961,7 @@ case "$TARGET_SYS" in
>  	#   compressed via /usr/share/mk
>  	mancat=man
>@@ -9,3 +18,21 @@
>  	;;
>      Darwin)
>  	# default to /usr/local/man/man8 and use nroff files
>+@@ -2864,7 +2864,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
>+   echo $ac_n "(cached) $ac_c" 1>&6
>+ else
>+   ac_save_LIBS="$LIBS"
>+-LIBS="-ledit -ltermcap $LIBS"
>++LIBS="-ledit MESS@THUS@UP@TO@DISABLE@libedit -ltermcap $LIBS"
>+ cat > conftest.$ac_ext <<EOF
>+ #include "confdefs.h"
>+ /* Override any gcc2 internal prototype to avoid an error.  */
>+@@ -2894,7 +2894,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
>+   cat >> confdefs.h <<\EOF
>+ #define HAVE_EDITLINE 1
>+ EOF
>+-LIBS="$LIBS -ledit -ltermcap"
>++LIBS="$LIBS -ledit MESS@THUS@UP@TO@DISABLE@libedit -ltermcap"
>+ else
>+   echo "$ac_t""no" 1>&6
>+ fi

Actions: View | Diff

Attachments on bug 205191: 164331 | 164332 | 164334 | 167457