View | Details | Raw Unified | Return to bug 216799 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-5 / +8 lines)
Lines 2-9 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	dcc-dccd
4
PORTNAME=	dcc-dccd
5
PORTVERSION=	1.3.158
5
PORTVERSION=	1.3.159
6
PORTREVISION=	2
6
PORTREVISION=	0
7
CATEGORIES=	mail
7
CATEGORIES=	mail
8
MASTER_SITES=	http://www.dcc-servers.net/dcc/source/old/ \
8
MASTER_SITES=	http://www.dcc-servers.net/dcc/source/old/ \
9
		ftp://ftp.dcc-servers.net/src/dcc/old/ \
9
		ftp://ftp.dcc-servers.net/src/dcc/old/ \
Lines 22-28 Link Here
22
22
23
HAS_CONFIGURE=	yes
23
HAS_CONFIGURE=	yes
24
24
25
USES=		gmake tar:Z
25
USES=		tar:Z
26
26
27
OPTIONS_DEFINE=	DCCIFD DCCD DCCGREY IPV6 ALT_HOME
27
OPTIONS_DEFINE=	DCCIFD DCCD DCCGREY IPV6 ALT_HOME
28
OPTIONS_DEFAULT=	DCCIFD DCCM DCCD DCCGREY
28
OPTIONS_DEFAULT=	DCCIFD DCCM DCCD DCCGREY
Lines 52-63 Link Here
52
## Use the configure script to explicitly set the locations of all files,
52
## Use the configure script to explicitly set the locations of all files,
53
## in case the standard locations have been locally overridden
53
## in case the standard locations have been locally overridden
54
## Also, use a similar hack to USES=desthack.
54
## Also, use a similar hack to USES=desthack.
55
CONFIGURE_ARGS=	--with-uid=${DCCUSER} \
55
CONFIGURE_ARGS= -q \
56
		--with-uid=${DCCUSER} \
56
		--bindir=${PREFIX}/bin \
57
		--bindir=${PREFIX}/bin \
57
		--mandir=${MANPREFIX}/man \
58
		--mandir=${MANPREFIX}/man \
58
		--with-installroot=\$${${DESTDIRNAME}} \
59
		--with-installroot=\$${${DESTDIRNAME}} \
59
		--with-configsuffix=.sample \
60
		--with-configsuffix=.sample \
60
		--with-make-cmd=${MAKE_CMD}
61
		--with-make-cmd=${MAKE_CMD} \
62
		--with-install-cmd=$(BSD_INSTALL_PROGRAM) \
63
		--enable-pkg-make
61
64
62
CONFIGURE_ENV=	ac_cv_header_histedit_h=no	# disable libedit detection
65
CONFIGURE_ENV=	ac_cv_header_histedit_h=no	# disable libedit detection
63
66
(-)distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (dcc-1.3.158.tar.Z) = 596bb4a02800a87501818215e61ac877e4d5a31ec0c8c227f23438f6b6b831c6
1
TIMESTAMP = 1486370588
2
SIZE (dcc-1.3.158.tar.Z) = 1714175
2
SHA256 (dcc-1.3.159.tar.Z) = 064144a1f01bda7cdc3e8b8f721b2b73df53bf7b293c1c672244eada9776ac89
3
SIZE (dcc-1.3.159.tar.Z) = 1606625
(-)files/patch-Makefile.inc.in (-23 lines)
Lines 1-23 Link Here
1
--- Makefile.inc.in.orig	2014-08-06 14:43:42 UTC
2
+++ Makefile.inc.in
3
@@ -102,7 +102,6 @@ DCC_OWN	    =@DCC_OWN@
4
 DCC_OWN	    =@DCCSUID@
5
 @MAKE_DOT@endif
6
 @MAKE_DOT@endif
7
-BINOWN	    =$(DCC_OWN)
8
 
9
 @MAKE_DOT@ifndef DCC_GRP
10
 DCC_GRP	    =@DCC_GRP@
11
@@ -129,9 +128,9 @@ SET_BINOWN=
12
 SET_MANOWN=
13
 SET_DCCOWN=
14
 @MAKE_DOT@else
15
-SET_BINOWN=-o $(BINOWN) -g $(BINGRP)
16
-SET_MANOWN=-o $(MANOWN) -g $(MANGRP)
17
-SET_DCCOWN=-o @DCCSUID@ -g $(BINGRP)
18
+SET_BINOWN=
19
+SET_MANOWN=
20
+SET_DCCOWN=
21
 @MAKE_DOT@endif
22
 
23
 @MAKE_DOT@ifdef PROG
(-)files/patch-Makefile.inc2.in (-11 lines)
Lines 1-11 Link Here
1
--- Makefile.inc2.in.orig	2015-04-03 01:32:45 UTC
2
+++ Makefile.inc2.in
3
@@ -44,7 +44,7 @@
4
 INSTALL	=@DCCINSTALL@
5
 @MAKE_DOT@endif
6
 
7
-BININSTALL=$(INSTALL) -c $(SET_BINOWN) -m $(BINMODE)
8
+BININSTALL=$(BSD_INSTALL_PROGRAM)
9
 
10
 # create the DCC home directory before trying to install files
11
 beforeinstall:$(BINDIR) $(MANDIR)8 depend all
(-)files/patch-cdcc__Makefile.in (-10 lines)
Lines 1-10 Link Here
1
--- cdcc/Makefile.in.orig	2014-08-06 14:43:42 UTC
2
+++ cdcc/Makefile.in
3
@@ -45,7 +45,5 @@ SRCS	=$(PROG).c
4
 
5
 @MAKE_DOT@ifndef NO_SUID
6
 # cdcc needs to be SUID to read the server passwords
7
-BINMODE	=4$(DCC_MODE)
8
-BINOWN	=@DCCSUID@
9
 @MAKE_DOT@endif
10
 @MAKE_INC2@
(-)files/patch-configure (-11 lines)
Lines 1-11 Link Here
1
--- configure.orig	2014-08-06 14:43:42 UTC
2
+++ configure
3
@@ -1961,7 +1961,7 @@ case "$TARGET_SYS" in
4
 	#   compressed via /usr/share/mk
5
 	mancat=man
6
 	MANX='$(MAN8)'
7
-	USE_DCCMANINSTALL='# USE_DCCMANINSTALL=no'
8
+	USE_DCCMANINSTALL='USE_DCCMANINSTALL=yes'
9
 	;;
10
     Darwin)
11
 	# default to /usr/local/man/man8 and use nroff files
(-)files/patch-dccproc__Makefile.in (-10 lines)
Lines 1-10 Link Here
1
--- dccproc/Makefile.in.orig	2014-08-06 14:43:42 UTC
2
+++ dccproc/Makefile.in
3
@@ -45,7 +45,5 @@ SRCS	=$(PROG).c
4
 
5
 @MAKE_DOT@ifndef NO_SUID
6
 # dccproc needs to be SUID to read the server passwords
7
-BINMODE	=4$(DCC_MODE)
8
-BINOWN	=@DCCSUID@
9
 @MAKE_DOT@endif
10
 @MAKE_INC2@
(-)files/patch-dccsight__Makefile.in (-10 lines)
Lines 1-10 Link Here
1
--- dccsight/Makefile.in.orig	2014-08-06 14:43:42 UTC
2
+++ dccsight/Makefile.in
3
@@ -46,7 +46,5 @@ DCC_BINDIR=@installroot@@libexecdir@
4
 
5
 @MAKE_DOT@ifndef NO_SUID
6
 # dccsight needs to be SUID to read the server passwords
7
-BINMODE	=4$(DCC_MODE)
8
-BINOWN	=@DCCSUID@
9
 @MAKE_DOT@endif
10
 @MAKE_INC2@
(-)files/patch-homedir_Makefile.in (-11 lines)
Lines 1-11 Link Here
1
--- homedir/Makefile.in.orig	2014-08-06 14:43:42 UTC
2
+++ homedir/Makefile.in
3
@@ -61,7 +61,7 @@ all:
4
 	@:
5
 
6
 install:$(HD) $(HD)/log
7
-	for NM in $(SSCRIPTS); do $(BININSTALL) $$NM $(DCC_BINDIR)/$$NM;done
8
+	for NM in $(SSCRIPTS); do $(BSD_INSTALL_SCRIPT) $$NM $(DCC_BINDIR)/$$NM;done
9
 	sh make-dcc_conf -F '@configsuffix@' -h $(HD)
10
 	for NM in $(SIMPLE); do\
11
 	    if test -n '@configsuffix@' -o ! -f $(HD)/$$NM; then\
(-)files/patch-homedir__make-dcc_conf.in (-13 lines)
Lines 1-13 Link Here
1
--- homedir/make-dcc_conf.in.orig	2014-08-06 14:43:42 UTC
2
+++ homedir/make-dcc_conf.in
3
@@ -83,10 +83,6 @@ fi
4
 if test -n "$FORCE" -o ! -f "$CUR"; then
5
     cp $PROTOTYPE $CUR$FORCE
6
     chmod 0644 $CUR$FORCE
7
-    if test -n "@DCCSUID@" -a -z "$NO_SUID"; then
8
-	set +e		# do not die if the user name is not in the passwd file
9
-	chown @DCCSUID@ $CUR$FORCE
10
-    fi
11
     exit
12
 fi
13
 
(-)files/patch-misc_Makefile.in (-11 lines)
Lines 1-11 Link Here
1
--- misc/Makefile.in.orig	2014-08-06 14:43:42 UTC
2
+++ misc/Makefile.in
3
@@ -51,7 +51,7 @@ DCC_BINDIR=@installroot@@libexecdir@
4
 @MAKE_INC2@
5
 
6
 install:
7
-	for NM in $(SSCRIPTS); do $(BININSTALL) $$NM $(DCC_BINDIR)/$$NM;done
8
+	for NM in $(SSCRIPTS); do $(BSD_INSTALL_SCRIPT) $$NM $(DCC_BINDIR)/$$NM;done
9
 
10
 deinstall:
11
 	-if test -d $(DCC_BINDIR); then cd $(DCC_BINDIR); rm -f $(SSCRIPTS); fi
(-)pkg-plist (-1 lines)
Lines 29-35 Link Here
29
@(%%DCCUSER%%,%%DCCGROUP%%,4555) dcc/libexec/dccsight
29
@(%%DCCUSER%%,%%DCCGROUP%%,4555) dcc/libexec/dccsight
30
%%IFD_MILT%%dcc/libexec/dns-helper
30
%%IFD_MILT%%dcc/libexec/dns-helper
31
dcc/libexec/fetchblack
31
dcc/libexec/fetchblack
32
dcc/libexec/fetchids
33
dcc/libexec/fetch-testmsg-whitelist
32
dcc/libexec/fetch-testmsg-whitelist
34
dcc/libexec/fix-map
33
dcc/libexec/fix-map
35
dcc/libexec/hackmc
34
dcc/libexec/hackmc

Return to bug 216799