Attachment #164332 for bug #205191

Lines 108-113 Link Here

(-)mail/dcc-dccd/Makefile (+13 lines)
108	LDFLAGS+= -L${MILTERLIB}	108	LDFLAGS+= -L${MILTERLIB}
109	.endif	109	.endif
110		110
		111	#LDFLAGS+= -L${LOCALBASE}/lib -ledit
		112	CONFIGURE_ENV+= LOCALBASE=${LOCALBASE}
		113
111	.if ${PORT_OPTIONS:MDCCIFD} \|\| ${PORT_OPTIONS:MDCCM}	114	.if ${PORT_OPTIONS:MDCCIFD} \|\| ${PORT_OPTIONS:MDCCM}
112	PLIST_SUB+= IFD_MILT=""	115	PLIST_SUB+= IFD_MILT=""
113	.else	116	.else
Lines 114-123 Link Here
114	PLIST_SUB+= IFD_MILT="@comment "	117	PLIST_SUB+= IFD_MILT="@comment "
115	.endif	118	.endif
116		119
		120	pre-patch:
		121	@${ECHO} "LOCALBASE=-L${LOCALBASE}" > ${WRKSRC}/Makefile.base.inc
		122
117	post-stage:	123	post-stage:
118	@${MV} ${STAGEDIR}${PREFIX}/dcc/cgi-bin/footer-dist \	124	@${MV} ${STAGEDIR}${PREFIX}/dcc/cgi-bin/footer-dist \
119	${STAGEDIR}${PREFIX}/dcc/cgi-bin/footer.sample	125	${STAGEDIR}${PREFIX}/dcc/cgi-bin/footer.sample
120	@${MV} ${STAGEDIR}${PREFIX}/dcc/cgi-bin/header-dist \	126	@${MV} ${STAGEDIR}${PREFIX}/dcc/cgi-bin/header-dist \
121	${STAGEDIR}${PREFIX}/dcc/cgi-bin/header.sample	127	${STAGEDIR}${PREFIX}/dcc/cgi-bin/header.sample
		128	.for f in cdcc dccif-test dccproc
		129	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${f}
		130	.endfor
		131	.for f in dns-helper ck2ip dbclean dccd dump-clients dblist dccm dccifd dccsight wlist check_ip_range
		132	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/dcc/libexec/${f}
		133	.endfor
122		134
		135
123	.include <bsd.port.mk>	136	.include <bsd.port.mk>




--- Makefile.inc.in.orig	2014-08-06 14:43:42 UTC
+++ Makefile.inc.in
@@ -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

 
 @MAKE_DOT@ifndef DCC_GRP
 DCC_GRP	    =@DCC_GRP@
@@ -129,9 +130,9 @@ SET_BINOWN=
 SET_MANOWN=
 SET_DCCOWN=
 @MAKE_DOT@else

Lines 1-5 Link Here

(-)mail/dcc-dccd/files/patch-configure (+27 lines)
1	--- configure.orig 2014-08-06 14:43:42 UTC	1	--- configure.orig 2014-08-06 14:43:42 UTC
2	+++ configure	2	+++ configure
		3	@@ -884,7 +884,7 @@ else
		4	fi
		5	fi
		6	if test "$CC#$OLD_CC" != "cc#"; then
		7	- DCC_CC="CC=$CC"
		8	+ DCC_CC="CC=$CC -I$LOCALBASE/include -L$LOCALBASE/lib"
		9	else
		10	DCC_CC="#CC="
		11	fi
3	@@ -1961,7 +1961,7 @@ case "$TARGET_SYS" in	12	@@ -1961,7 +1961,7 @@ case "$TARGET_SYS" in
4	# compressed via /usr/share/mk	13	# compressed via /usr/share/mk
5	mancat=man	14	mancat=man
Lines 9-11 Link Here
9	;;	18	;;
10	Darwin)	19	Darwin)
11	# default to /usr/local/man/man8 and use nroff files	20	# default to /usr/local/man/man8 and use nroff files
		21	@@ -2864,7 +2864,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$a
		22	echo $ac_n "(cached) $ac_c" 1>&6
		23	else
		24	ac_save_LIBS="$LIBS"
		25	-LIBS="-ledit -ltermcap $LIBS"
		26	+LIBS="-ledit MESS@THIS@UP@TO@DISABLE@libedit -ltermcap $LIBS"
		27	cat > conftest.$ac_ext <<EOF
		28	#include "confdefs.h"
		29	/* Override any gcc2 internal prototype to avoid an error. */
		30	@@ -2894,7 +2894,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l
		31	cat >> confdefs.h <<\EOF
		32	#define HAVE_EDITLINE 1
		33	EOF
		34	-LIBS="$LIBS -ledit -ltermcap"
		35	+LIBS="$LIBS -ledit MESS@THIS@UP@TO@DISABLE@libedit -ltermcap"
		36	else
		37	echo "$ac_t""no" 1>&6
		38	fi

Return to bug 205191

Lines 1-6 Link Here

(-)mail/dcc-dccd/files/patch-Makefile.inc.in (-2 / +13 lines)
1	--- Makefile.inc.in.orig 2014-08-06 14:43:42 UTC	1	--- Makefile.inc.in.orig 2014-08-06 14:43:42 UTC
2	+++ Makefile.inc.in	2	+++ Makefile.inc.in
3	@@ -102,7 +102,6 @@ DCC_OWN =@DCC_OWN@	3	@@ -69,7 +69,9 @@ NOLINT = # why does NetBSD care abo
		4	NO_LINT = # stop FreeBSD noise about the NetBSD NOLINT
		5	STRIP = # keep FreeBSD from stripping the a.outs
		6
		7	-LDADD +=$(CLNTLIBS) @LIBS@
		8	+include $(DEPTH)/Makefile.base.inc
		9	+
		10	+LDADD +=$(LOCALBASE) $(CLNTLIBS) @LIBS@
		11	DPADD +=$(CLNTLIBS)
		12
		13	#DBGFLAGS +=-g
		14	@@ -102,7 +104,6 @@ DCC_OWN =@DCC_OWN@
4	DCC_OWN =@DCCSUID@	15	DCC_OWN =@DCCSUID@
5	@MAKE_DOT@endif	16	@MAKE_DOT@endif
6	@MAKE_DOT@endif	17	@MAKE_DOT@endif
Lines 8-14 Link Here
8		19
9	@MAKE_DOT@ifndef DCC_GRP	20	@MAKE_DOT@ifndef DCC_GRP
10	DCC_GRP =@DCC_GRP@	21	DCC_GRP =@DCC_GRP@
11	@@ -129,9 +128,9 @@ SET_BINOWN=	22	@@ -129,9 +130,9 @@ SET_BINOWN=
12	SET_MANOWN=	23	SET_MANOWN=
13	SET_DCCOWN=	24	SET_DCCOWN=
14	@MAKE_DOT@else	25	@MAKE_DOT@else