1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-02 06:03:50 +00:00

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)
This commit is contained in:
John Marino 2016-08-22 14:31:40 +00:00
parent 8fcc23c359
commit 9ace672370
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=420617
4 changed files with 37 additions and 2 deletions

View File

@ -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-mirror no-pkg-mirror no-dist-sell
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

View File

@ -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

View File

@ -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\

View File

@ -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