Page MenuHomeFreeBSD
Files F152550564

D11248.diff
No OneTemporary
Actions

D11248.diff
View Options

Index: head/UPDATING
===================================================================
--- head/UPDATING
+++ head/UPDATING
@@ -6,6 +6,14 @@
you update your ports collection, before attempting any port upgrades.
20170624:
+ AFFECTS: users of mail/dcc-dccd
+ AUTHOR: ultima@FreeBSD.org
+
+ The ALT_HOME option was removed in 1.3.159_1. If this option is being
+ used, please be sure to move the old home directory, /var/dcc to
+ ${PREFIX}/dcc.
+
+20170624:
AFFECTS: users of net/rabbitmq
AUTHOR: olgeni@FreeBSD.org
Index: head/mail/dcc-dccd/Makefile
===================================================================
--- head/mail/dcc-dccd/Makefile
+++ head/mail/dcc-dccd/Makefile
@@ -3,6 +3,7 @@
PORTNAME= dcc-dccd
PORTVERSION= 1.3.159
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.dcc-servers.net/dcc/source/old/ \
ftp://ftp.dcc-servers.net/src/dcc/old/ \
@@ -23,16 +24,15 @@
USES= tar:Z
-OPTIONS_DEFINE= DCCIFD DCCD DCCGREY IPV6 ALT_HOME
+OPTIONS_DEFINE= DCCIFD DCCD DCCGREY IPV6
OPTIONS_DEFAULT= DCCIFD DCCM DCCD DCCGREY
OPTIONS_GROUP= MILTER
-OPTIONS_GROUP_MILTER= DCCM PORTS_SENDMAIL
+OPTIONS_GROUP_MILTER= DCCM PORTS_MILTER
DCCIFD_DESC= DCC interface daemon (for SpamAssassin etc)
-DCCM_DESC= DCC milter (for Sendmail only)
+DCCM_DESC= DCC milter
DCCD_DESC= DCC server
DCCGREY_DESC= DCC greylisting server
-ALT_HOME_DESC= DCC home in /var/dcc (see help)
-PORTS_SENDMAIL_DESC= Use ports Sendmail instead of base
+PORTS_MILTER_DESC= Use ports milter instead of base
OPTIONS_SUB= yes
@@ -44,6 +44,8 @@
USERS= ${DCCUSER}
GROUPS= ${DCCGROUP}
+DCCHOME= ${PREFIX}/dcc
+
PLIST_SUB+= DCCUSER="${DCCUSER}" DCCGROUP="${DCCGROUP}"
SUB_FILES= pkg-install pkg-message
SUB_LIST+= WRKSRC=${WRKSRC} DCCHOME=${DCCHOME}
@@ -59,15 +61,17 @@
--with-configsuffix=.sample \
--with-make-cmd=${MAKE_CMD} \
--with-install-cmd=${BSD_INSTALL_PROGRAM} \
- --enable-pkg-make
+ --enable-pkg-make \
+ --homedir=${DCCHOME} \
+ --libexecdir=${DCCHOME}/libexec \
+ --with-cgibin=${DCCHOME}/cgi-bin
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
-PORTS_SENDMAIL_BUILD_DEPENDS= ${LOCALBASE}/lib/libmilter.a:mail/libmilter
-PORTS_SENDMAIL_CONFIGURE_ON= --with-sendmail=yes
+PORTS_MILTER_BUILD_DEPENDS= ${LOCALBASE}/lib/libmilter.a:mail/libmilter
+PORTS_MILTER_CONFIGURE_ON= --with-sendmail=yes
DCCIFD_CONFIGURE_ENABLE= dccifd
DCCIFD_USE= rc_subr=dccifd
DCCD_CONFIGURE_ENABLE= server
@@ -77,33 +81,10 @@
.include <bsd.port.options.mk>
-.if ${PORT_OPTIONS:MALT_HOME}
-DCCHOME= /var/dcc
-.else
-DCCHOME= ${PREFIX}/dcc
-.endif
-
-CONFIGURE_ARGS+= --homedir=${DCCHOME}
-
## dccm milter support
#
-.if ${PORT_OPTIONS:MDCCM}
-
-.if !exists(/usr/lib/libmilter.a) && !exists(${LOCALBASE}/lib/libmilter.a)
-IGNORE= neither base system nor Ports version of Sendmail installed, cannot build milter
-.endif
-.if ! ${PORT_OPTIONS:MPORTS_SENDMAIL} && !exists(/usr/lib/libmilter.a)
-IGNORE= base system Sendmail not found or too old, rebuild with WITH_PORTS_SENDMAIL=yes or WITHOUT_DCCM=yes
-.endif
-.if ${PORT_OPTIONS:MPORTS_SENDMAIL} && !exists(${LOCALBASE}/lib/libmilter.a)
-IGNORE= ports Sendmail not found, rebuild with WITHOUT_PORTS_SENDMAIL=yes or WITHOUT_DCCM=yes
-.endif
-
-.if ! ${PORT_OPTIONS:MPORTS_SENDMAIL}
-MILTERBASE= /usr
-.else
+.if ${PORT_OPTIONS:MPORTS_MILTER}
MILTERBASE?= ${LOCALBASE}
-.endif
MILTERINC= ${MILTERBASE}/include
MILTERLIB= ${MILTERBASE}/lib
Index: head/mail/dcc-dccd/pkg-plist
===================================================================
--- head/mail/dcc-dccd/pkg-plist
+++ head/mail/dcc-dccd/pkg-plist
@@ -54,8 +54,6 @@
man/man8/dccm.8.gz
man/man8/dccproc.8.gz
man/man8/dccsight.8.gz
-%%ALT_HOME%%@dir dcc
-%%ALT_HOME%%@cwd /var
@owner %%DCCUSER%%
@group %%DCCGROUP%%
@sample dcc/dcc_conf.sample
@@ -78,8 +76,6 @@
%%DCCGREY%%@unexec [ -e %D/dcc/grey_flod.map ] && rm -f %D/dcc/grey_flod.map || true
%%DCCGREY%%@unexec [ -e %D/dcc/grey_clients ] && rm -f %D/dcc/grey_clients || true
@dir dcc/log
-%%NO_ALT_HOME%%@group wheel
-%%NO_ALT_HOME%%@owner root
+@group wheel
+@owner root
@dir dcc
-%%ALT_HOME%%@group wheel
-%%ALT_HOME%%@owner root

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 16, 3:21 PM (8 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31582512
Default Alt Text
D11248.diff (4 KB)

Event Timeline