Date: Mon, 22 Aug 2016 14:31:40 +0000 (UTC) From: John Marino <marino@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r420617 - in head/mail/dcc-dccd: . files Message-ID: <201608221431.u7MEVeiF067888@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marino Date: Mon Aug 22 14:31:40 2016 New Revision: 420617 URL: https://svnweb.freebsd.org/changeset/ports/420617 Log: mail/dcc-dccd: fix stage-qa issues 1) implements stripping of executable binaries 2) disables libedit detection and linking dcc-dccd keeps trying to link to the base libedit instead of the required ports version (when USES+=libedit is added). For now, just build without until somebody finds a way get libedit linkage correct. This solves both issues seen with stage-qa PR: 205191 Reported by: Yuri (rawbw.com) Utimate fix: marino@ Approved by: maintainer (conceptually) Added: head/mail/dcc-dccd/files/patch-Makefile.inc2.in (contents, props changed) head/mail/dcc-dccd/files/patch-homedir_Makefile.in (contents, props changed) head/mail/dcc-dccd/files/patch-misc_Makefile.in (contents, props changed) Modified: head/mail/dcc-dccd/Makefile Modified: head/mail/dcc-dccd/Makefile ============================================================================== --- head/mail/dcc-dccd/Makefile Mon Aug 22 13:40:50 2016 (r420616) +++ head/mail/dcc-dccd/Makefile Mon Aug 22 14:31:40 2016 (r420617) @@ -3,7 +3,7 @@ PORTNAME= dcc-dccd PORTVERSION= 1.3.158 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://www.dcc-servers.net/dcc/source/old/ \ ftp://ftp.dcc-servers.net/src/dcc/old/ \ @@ -22,7 +22,7 @@ LICENSE_PERMS= no-pkg-sell no-dist-mirro HAS_CONFIGURE= yes -USES= gmake tar:Z +USES= gmake tar:Z OPTIONS_DEFINE= DCCIFD DCCD DCCGREY IPV6 ALT_HOME OPTIONS_DEFAULT= DCCIFD DCCM DCCD DCCGREY @@ -59,6 +59,8 @@ CONFIGURE_ARGS= --with-uid=${DCCUSER} \ --with-configsuffix=.sample \ --with-make-cmd=${MAKE_CMD} +CONFIGURE_ENV= ac_cv_header_histedit_h=no # disable libedit detection + ALT_HOME_CONFIGURE_ON= --libexecdir=${PREFIX}/dcc/libexec --with-cgibin=${PREFIX}/dcc/cgi-bin DCCM_CONFIGURE_ENABLE= dccm DCCM_USE= rc_subr=dccm Added: head/mail/dcc-dccd/files/patch-Makefile.inc2.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/dcc-dccd/files/patch-Makefile.inc2.in Mon Aug 22 14:31:40 2016 (r420617) @@ -0,0 +1,11 @@ +--- Makefile.inc2.in.orig 2015-04-03 01:32:45 UTC ++++ Makefile.inc2.in +@@ -44,7 +44,7 @@ + INSTALL =@DCCINSTALL@ + @MAKE_DOT@endif + +-BININSTALL=$(INSTALL) -c $(SET_BINOWN) -m $(BINMODE) ++BININSTALL=$(BSD_INSTALL_PROGRAM) + + # create the DCC home directory before trying to install files + beforeinstall:$(BINDIR) $(MANDIR)8 depend all Added: head/mail/dcc-dccd/files/patch-homedir_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/dcc-dccd/files/patch-homedir_Makefile.in Mon Aug 22 14:31:40 2016 (r420617) @@ -0,0 +1,11 @@ +--- homedir/Makefile.in.orig 2014-08-06 14:43:42 UTC ++++ homedir/Makefile.in +@@ -61,7 +61,7 @@ all: + @: + + install:$(HD) $(HD)/log +- for NM in $(SSCRIPTS); do $(BININSTALL) $$NM $(DCC_BINDIR)/$$NM;done ++ for NM in $(SSCRIPTS); do $(BSD_INSTALL_SCRIPT) $$NM $(DCC_BINDIR)/$$NM;done + sh make-dcc_conf -F '@configsuffix@' -h $(HD) + for NM in $(SIMPLE); do\ + if test -n '@configsuffix@' -o ! -f $(HD)/$$NM; then\ Added: head/mail/dcc-dccd/files/patch-misc_Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/dcc-dccd/files/patch-misc_Makefile.in Mon Aug 22 14:31:40 2016 (r420617) @@ -0,0 +1,11 @@ +--- misc/Makefile.in.orig 2014-08-06 14:43:42 UTC ++++ misc/Makefile.in +@@ -51,7 +51,7 @@ DCC_BINDIR=@installroot@@libexecdir@ + @MAKE_INC2@ + + install: +- for NM in $(SSCRIPTS); do $(BININSTALL) $$NM $(DCC_BINDIR)/$$NM;done ++ for NM in $(SSCRIPTS); do $(BSD_INSTALL_SCRIPT) $$NM $(DCC_BINDIR)/$$NM;done + + deinstall: + -if test -d $(DCC_BINDIR); then cd $(DCC_BINDIR); rm -f $(SSCRIPTS); fi
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201608221431.u7MEVeiF067888>