diff options
86 files changed, 852 insertions, 510 deletions
@@ -134,11 +134,18 @@ print-index: ${.CURDIR}/${INDEXFILE} CVS?= cvs SUP?= cvsup +PORTSNAP?= portsnap +PORTSNAP_FLAGS?= -p ${.CURDIR} .if defined(SUPHOST) SUPFLAGS+= -h ${SUPHOST} .endif update: -.if defined(SUP_UPDATE) && defined(PORTSSUPFILE) +.if defined(PORTSNAP_UPDATE) + @echo "--------------------------------------------------------------" + @echo ">>> Running ${PORTSNAP}" + @echo "--------------------------------------------------------------" + @${PORTSNAP} ${PORTSNAP_FLAGS} fetch update +.elif defined(SUP_UPDATE) && defined(PORTSSUPFILE) @echo "--------------------------------------------------------------" @echo ">>> Running ${SUP}" @echo "--------------------------------------------------------------" @@ -152,5 +159,5 @@ update: @${ECHO_MSG} "Error: Please define PORTSSUPFILE before doing make update." @exit 1 .else - @${ECHO_MSG} "Error: Please define either SUP_UPDATE or CVS_UPDATE first." + @${ECHO_MSG} "Error: Please define either PORTSNAP_UPDATE, SUP_UPDATE, or CVS_UPDATE first." .endif diff --git a/Mk/bsd.autotools.mk b/Mk/bsd.autotools.mk index 9589471ad7b7..8dbe0c9475c8 100644 --- a/Mk/bsd.autotools.mk +++ b/Mk/bsd.autotools.mk @@ -99,7 +99,7 @@ AUTOMAKE_VERSION= ${AUTOTOOL_automake_env} # Make sure we specified a legal version of automake # . if !exists(${PORTSDIR}/devel/automake${AUTOMAKE_VERSION}/Makefile) -BROKEN+= "Unknown AUTOMAKE version: ${AUTOMAKE_VERSION}" +BROKEN+= Unknown AUTOMAKE version: ${AUTOMAKE_VERSION} . endif # Set up the automake environment @@ -145,7 +145,7 @@ AUTOCONF_VERSION= ${AUTOTOOL_autoconf_env} # Make sure we specified a legal version of autoconf # . if !exists(${PORTSDIR}/devel/autoconf${AUTOCONF_VERSION}/Makefile) -BROKEN+= "Unknown AUTOCONF version: ${AUTOCONF_VERSION}" +BROKEN+= Unknown AUTOCONF version: ${AUTOCONF_VERSION} . endif # Set up the autoconf/autoheader environment @@ -193,7 +193,7 @@ LIBTOOL_VERSION= ${AUTOTOOL_libtool_env} # Make sure we specified a legal version of libtool # . if !exists(${PORTSDIR}/devel/libtool${LIBTOOL_VERSION}/Makefile) -BROKEN+= "Unknown LIBTOOL version: ${LIBTOOL_VERSION}" +BROKEN+= Unknown LIBTOOL version: ${LIBTOOL_VERSION} . endif # Set up the libtool environment @@ -271,7 +271,7 @@ ${item:U}_ENV+= ${AUTOTOOLS_VARS} # the order of autotools running. .if !target(run-autotools) -run-autotools:: run-autotools-aclocal run-autotools-autoheader \ +run-autotools:: run-autotools-aclocal patch-autotools run-autotools-autoheader \ run-autotools-autoconf run-autotools-automake .endif diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk index f210ada9f5bb..ca31dc5ecd40 100644 --- a/Mk/bsd.database.mk +++ b/Mk/bsd.database.mk @@ -102,7 +102,7 @@ IGNORE= Doesn't work with MySQL version : ${MYSQL_VER} (Doesn't support MySQL $ .endif # BROKEN_WITH_MYSQL LIB_DEPENDS+= mysqlclient.${MYSQL${MYSQL_VER}_LIBVER}:${PORTSDIR}/databases/mysql${MYSQL_VER}-client .else -IGNORE= "Unknown MySQL version: ${MYSQL_VER}" +IGNORE= Unknown MySQL version: ${MYSQL_VER} .endif # Check for correct libs .endif # USE_MYSQL @@ -135,13 +135,13 @@ PGSQL_VER= ${DEFAULT_PGSQL_VER} .if defined(BROKEN_WITH_PGSQL) . for VER in ${BROKEN_WITH_PGSQL} . if (${PGSQL_VER} == "${VER}") -IGNORE= "Does not work with postgresql${PGSQL_VER}-client PostgresSQL \(${BROKEN_WITH_PGSQL} not supported\)" +IGNORE= Does not work with postgresql${PGSQL_VER}-client PostgresSQL (${BROKEN_WITH_PGSQL} not supported) . endif . endfor .endif # BROKEN_WITH_PGSQL LIB_DEPENDS+= pq.${PGSQL${PGSQL_VER}_LIBVER}:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client .else -IGNORE= "Unknown PostgreSQL version: ${PGSQL_VER}" +IGNORE= Unknown PostgreSQL version: ${PGSQL_VER} .endif # Check for correct version CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib @@ -206,7 +206,7 @@ _FOUND= yes # USE_BDB is specified incorrectly, so mark this as IGNORE .if ${_FOUND} == "no" -IGNORE= "Unknown bdb version: ${USE_BDB}" +IGNORE= Unknown bdb version: ${USE_BDB} .endif .endif # USE_BDB @@ -226,7 +226,7 @@ LIB_DEPENDS+= sqlite${_SQLITE_VER}:${PORTSDIR}/databases/sqlite${_SQLITE_VER} .elif ${_SQLITE_VER} == "2" LIB_DEPENDS+= sqlite.${_SQLITE_VER}:${PORTSDIR}/databases/sqlite${_SQLITE_VER} .else -IGNORE= "Unknown sqlite version: ${_SQLITE_VER}" +IGNORE= Unknown sqlite version: ${_SQLITE_VER} .endif .endif # defined(USE_SQLITE) diff --git a/Mk/bsd.gcc.mk b/Mk/bsd.gcc.mk index f902cc549d59..585a6e2799bc 100644 --- a/Mk/bsd.gcc.mk +++ b/Mk/bsd.gcc.mk @@ -78,7 +78,7 @@ _GCCVERSION_OKAY= true; .endfor .if !defined(_GCCVERSION_OKAY) -BROKEN= "Unknown version of GCC specified (USE_GCC=${USE_GCC})" +BROKEN= Unknown version of GCC specified (USE_GCC=${USE_GCC}) .endif # @@ -94,7 +94,7 @@ _GCC_FOUND${v}:= base . endif .endfor .if !defined(_GCCVERSION) -BROKEN= "Couldn't find your current GCCVERSION (OSVERSION=${OSVERSION})" +BROKEN= Couldn't find your current GCCVERSION (OSVERSION=${OSVERSION}) .endif # diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 7ebdb35904d3..b02cac67de3d 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -602,7 +602,7 @@ BROKEN+=the GNOME ${GNOME_DESKTOP_VERSION} desktop . endif . endif . if ${_USE_GNOME_ALL:M${component}}=="" -BROKEN= "Unknown component ${component}" +BROKEN= Unknown component ${component} . endif _USE_GNOME+= ${${component}_USE_GNOME_IMPL} ${component} . endfor @@ -628,7 +628,7 @@ ltverhack_PRE_PATCH= ${CP} -pf ${LTMAIN} ${WRKDIR}/gnome-ltmain.sh && \ done; .else .if ${USE_GNOME:Mltverhack}!="" -BROKEN= "${PORTNAME} uses the ltverhack GNOME component but does not use libtool" +BROKEN= ${PORTNAME} uses the ltverhack GNOME component but does not use libtool .endif .endif diff --git a/Mk/bsd.gstreamer.mk b/Mk/bsd.gstreamer.mk index be84788869f1..60cee0e67c9d 100644 --- a/Mk/bsd.gstreamer.mk +++ b/Mk/bsd.gstreamer.mk @@ -237,7 +237,7 @@ BUILD_DEPENDS+= ${_GST_LIB_BASE}/libgst${ext}.so:${PORTSDIR}/${${ext}_DEPENDS} RUN_DEPENDS+= ${_GST_LIB_BASE}/libgst${ext}.so:${PORTSDIR}/${${ext}_DEPENDS} . endif . else -BROKEN= "Unknown gstreamer-plugin -- ${ext}" +BROKEN= Unknown gstreamer-plugin -- ${ext} . endif .endfor diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk index 9f832f213550..3e71f3fd8fad 100644 --- a/Mk/bsd.kde.mk +++ b/Mk/bsd.kde.mk @@ -68,7 +68,7 @@ LIB_DEPENDS+= kimproxy:${PORTSDIR}/x11/kdelibs3 USE_QT_VER= 3 PREFIX= ${KDE_PREFIX} .else -BROKEN= "Unknown value in USE_KDELIBS_VER" +BROKEN= Unknown value in USE_KDELIBS_VER .endif # ${USE_KDELIBS_VER} == 3 .endif # defined(USE_KDELIBS_VER) @@ -122,7 +122,7 @@ CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \ CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" .endif # !defined(QT_NONSTANDARD) .else -BROKEN="Unsupported value of USE_QT_VER" +BROKEN=Unsupported value of USE_QT_VER .endif # defined(USE_QT_VER) # End of USE_QT_VER section diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk index 9f832f213550..3e71f3fd8fad 100644 --- a/Mk/bsd.kde4.mk +++ b/Mk/bsd.kde4.mk @@ -68,7 +68,7 @@ LIB_DEPENDS+= kimproxy:${PORTSDIR}/x11/kdelibs3 USE_QT_VER= 3 PREFIX= ${KDE_PREFIX} .else -BROKEN= "Unknown value in USE_KDELIBS_VER" +BROKEN= Unknown value in USE_KDELIBS_VER .endif # ${USE_KDELIBS_VER} == 3 .endif # defined(USE_KDELIBS_VER) @@ -122,7 +122,7 @@ CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \ CONFIGURE_ENV+= MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" .endif # !defined(QT_NONSTANDARD) .else -BROKEN="Unsupported value of USE_QT_VER" +BROKEN=Unsupported value of USE_QT_VER .endif # defined(USE_QT_VER) # End of USE_QT_VER section diff --git a/Mk/bsd.linux-rpm.mk b/Mk/bsd.linux-rpm.mk new file mode 100644 index 000000000000..7989922b3f1e --- /dev/null +++ b/Mk/bsd.linux-rpm.mk @@ -0,0 +1,90 @@ +#-*- mode: Makefile; tab-width: 4; -*- +# ex:ts=4 +# +# $FreeBSD: /tmp/pcvs/ports/Mk/bsd.linux-rpm.mk,v 1.1 2006-01-21 17:37:01 krion Exp $ +# + +.if !defined(_POSTMKINCLUDED) && !defined(Linux_RPM_Pre_Include) + +Linux_RPM_Include_MAINTAINER= jylefort@FreeBSD.org +Linux_RPM_Pre_Include= bsd.linux-rpm.mk + +RPM2CPIO?= ${LOCALBASE}/bin/rpm2cpio + +EXTRACT_SUFX?= .${LINUX_RPM_ARCH}.rpm + +USE_LINUX?= yes +USE_LINUX_PREFIX= yes + +NO_WRKSUBDIR= yes +NO_BUILD= yes + +. if ${ARCH} == "amd64" +LINUX_RPM_ARCH?= i386 # the linuxulator does not yet support amd64 code +. elif ${ARCH} == "powerpc" +LINUX_RPM_ARCH?= ppc +. else +LINUX_RPM_ARCH?= ${ARCH} +. endif + +.endif + +.if defined(_POSTMKINCLUDED) && !defined(Linux_RPM_Post_Include) + +Linux_RPM_Post_Include= bsd.linux-rpm.mk + +MASTER_SITES?= ${MASTER_SITE_FEDORA_LINUX} +MASTER_SITE_SUBDIR?= 3/${LINUX_RPM_ARCH}/os/Fedora/RPMS/ +PKGNAMEPREFIX?= linux- + +EXTRACT_DEPENDS+= ${RPM2CPIO}:${PORTSDIR}/archivers/rpm + +EXTRACT_CMD?= ${RPM2CPIO} +EXTRACT_BEFORE_ARGS?= +EXTRACT_AFTER_ARGS?= | ${CPIO} -id --quiet + +MD5_FILE?= ${MASTERDIR}/distinfo.${LINUX_RPM_ARCH} + +. if defined(AUTOMATIC_PLIST) + +. if ${USE_LINUX} == "8" || ${USE_LINUX:L} == "yes" +_LINUX_BASE_SUFFIX= 8 +. elif ${USE_LINUX} == "debian" +_LINUX_BASE_SUFFIX= debian +. else +# other linux_base ports do not provide a pkg-plist file +IGNORE= uses AUTOMATIC_PLIST with an unsupported USE_LINUX, \"${USE_LINUX}\". Supported values are \"yes\", \"8\" and \"debian\" +. endif + +PLIST?= ${WRKDIR}/.PLIST.linux-rpm + +pre-install: linux-rpm-generate-plist + +linux-rpm-generate-plist: + @cd ${WRKSRC} && \ + ${FIND} * ! -type d | ${SORT} > ${PLIST} && \ + ${FIND} * -type d | ${SORT} | ${SED} -e 's|^|@dirrm |' > ${PLIST}.dirs + @${GREP} '^@dirrm ' ${PORTSDIR}/emulators/linux_base-${_LINUX_BASE_SUFFIX}/pkg-plist | ${SORT} > ${PLIST}.shared-dirs + @${COMM} -1 -3 ${PLIST}.shared-dirs ${PLIST}.dirs | ${SORT} -r >> ${PLIST} + +. endif + +. if !target(do-install) +do-install: + cd ${WRKSRC} && ${FIND} * -type d -exec ${MKDIR} "${PREFIX}/{}" \; + cd ${WRKSRC} && ${FIND} * ! -type d | ${CPIO} -pm -R root:wheel ${PREFIX} +. endif + +. if !target(new-plist) +new-plist: + @${RM} -rf ${WRKDIR}/.new-plist + @${MKDIR} ${WRKDIR}/.new-plist + @cd ${WRKDIR}/.new-plist && \ + for f in ${DISTFILES}; do \ + ${RPM2CPIO} ${_DISTDIR}/$$f | ${CPIO} -id --quiet; \ + ${FIND} * ! type d | ${SORT} > ${PLIST}.new; \ + ${FIND} -d * -type d | ${SED} -e 's|^|@dirrm |' >> ${PLIST}.new; \ + done +. endif + +.endif diff --git a/Mk/bsd.local.mk b/Mk/bsd.local.mk new file mode 100644 index 000000000000..ae6a231a39d2 --- /dev/null +++ b/Mk/bsd.local.mk @@ -0,0 +1,31 @@ +# -*- mode: Makefile; tab-width: 4; -*- +# ex: ts=4 +# +# bsd.local.mk - Sandbox for local modification to ports framework. +# +# Created by: Mark Linimon <linimon@FreeBSD.org> +# +# $FreeBSD$ +# + +.if !defined(_POSTMKINCLUDED) && !defined(Local_Pre_Include) + +Local_Pre_Include= bsd.local.mk + +# +# here is where any code that needs to run at bsd.port.pre.mk inclusion +# time should live. +# + +.endif # !defined(_POSTMKINCLUDED) && !defined(Local_Pre_Include) + +.if defined(_POSTMKINCLUDED) && !defined(Local_Post_Include) + +Local_Post_Include= bsd.local.mk + +# +# here is where any code that needs to run at bsd.port.post.mk inclusion +# time should live. +# + +.endif # defined(_POSTMKINCLUDED) && !defined(Local_Post_Include) diff --git a/Mk/bsd.mail.mk b/Mk/bsd.mail.mk new file mode 100644 index 000000000000..052fb071b204 --- /dev/null +++ b/Mk/bsd.mail.mk @@ -0,0 +1,71 @@ +#-*- mode: Fundamental; tab-width: 4; -*- +# ex:ts=4 +# +# $FreeBSD$ +# +# Please view me with 4 column tabs! + +.if !defined(_POSTMKINCLUDED) && !defined(Mail_Pre_Include) + +# Please make sure all changes to this file are passed through the maintainer. +# Do not commit them yourself (unless of course you're the Port's Wraith ;). +Mail_Include_MAINTAINER= garga@FreeBSD.org +Mail_Pre_Include= bsd.mail.mk + + +## Begin QMAIL Stuff + +# Ports can use the following vars: +# +# QMAIL_PREFIX - Define it if qmail is installed in a different PREFIX. +# Default: /var/qmail +# +# QMAIL_SLAVEPORT - Define it if you install a slaveport of qmail, to +# prevent stale dependencies. Valid slaveports are: +# ldap, mysql, spamcontrol and tls. +# +# USE_QMAIL_BUILD - Add qmail or qmail slaveport to BUILD_DEPENDS. +# +# USE_QMAIL_RUN - Add qmail or qmail slaveport to RUN_DEPENDS. +# +# USE_QMAIL - Add qmail or qmail slaveport to RUN and BUILD_DEPENDS. +# +# WANT_QMAIL - Set vars related to qmail, like QMAIL_PREFIX. + +QMAIL_PREFIX?= /var/qmail + +_QMAIL_VALID_SLAVEPORTS= ldap mysql spamcontrol tls + +.if defined(USE_QMAIL) || defined(USE_QMAIL_RUN) || defined (USE_QMAIL_BUILD) + +.if defined(QMAIL_SLAVEPORT) +. for slave in ${_QMAIL_VALID_SLAVEPORTS} +. if ${QMAIL_SLAVEPORT:L} == ${slave} +_QMAIL_SLAVEPORT_OKAY= true +. endif +. endfor + +. if !defined(_QMAIL_SLAVEPORT_OKAY) +IGNORE= Invalid QMAIL_SLAVEPORT value. Only one can be set, valid values are: ${_QMAIL_VALID_SLAVEPORTS} +. endif +.endif + +.if defined(QMAIL_SLAVEPORT) +QMAIL_DEPENDS= ${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail-${QMAIL_SLAVEPORT:L} +.else +QMAIL_DEPENDS= ${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail +.endif + +.if defined(USE_QMAIL) || defined(USE_QMAIL_RUN) +RUN_DEPENDS+= ${QMAIL_DEPENDS} +.endif + +.if defined(USE_QMAIL) || defined(USE_QMAIL_BUILD) +BUILD_DEPENDS+= ${QMAIL_DEPENDS} +.endif + +.endif + +## End QMAIL Stuff + +.endif diff --git a/Mk/bsd.php.mk b/Mk/bsd.php.mk index 877ababe1d01..2c2f19b53967 100644 --- a/Mk/bsd.php.mk +++ b/Mk/bsd.php.mk @@ -74,7 +74,7 @@ PHP_EXT_INC?= "" .if defined(BROKEN_WITH_PHP) . for VER in ${BROKEN_WITH_PHP} . if ${PHP_VER} == "${VER}" -BROKEN= "Doesn't work with PHP version : ${PHP_VER} (Doesn't support PHP ${BROKEN_WITH_PHP})" +BROKEN= Doesn't work with PHP version : ${PHP_VER} (Doesn't support PHP ${BROKEN_WITH_PHP}) . endif . endfor .endif diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 57f0175caf5c..cd837ce55c15 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -115,6 +115,9 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # subdirectory from FreeBSD mirror sites. # ALLFILES - All of ${DISTFILES} and ${PATCHFILES}. # IGNOREFILES - If set, don't perform checksum checks on these files. +# NOFETCHFILES - If set, don't download these files from the ${MASTER_SITES} +# or ${MASTER_SITE_BACKUP} (but do from +# ${MASTER_SITE_OVERRIDE}) # EXTRACT_ONLY - If set, a subset of ${DISTFILES} you want to # actually extract. # @@ -250,6 +253,18 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # package depends on. "lib" is the name of a shared library. # make will use "ldconfig -r" to search for the library. # lib can contain extended regular expressions. +# PERL_BUILD_DEPENDS +# - A list of "module:dir" tuples of Perl modules this +# package depends to build. "module" is the name of the Perl +# module which should be "use"d. make will use +# "perl -e 'use module'" to check if the module is +# available. +# PERL_RUN_DEPENDS +# - A list of "module:dir" tuples of Perl modules this +# package depends to run. "module" is the name of the Perl +# module which should be "use"d. make will use +# "perl -e 'use module'" to check if the module is +# available. # DEPENDS - A list of "dir[:target]" tuples of other ports this # package depends on being made first. Use this only for # things that don't fall into the above four categories. @@ -276,6 +291,9 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # compression. # USE_ZIP - If set, this port distfile uses zip, not tar w/[bg]zip # for compression. +# USE_DOS2UNIX - If set to "YES", remove the ^M from all files +# under ${WRKSRC}. If set to a string, remove in all +# files under ${WRKSRC} with one of these names the ^Ms. # USE_GCC - If set, this port requires this version of gcc, either in # the system or installed from a port. # USE_GMAKE - If set, this port uses gmake. @@ -373,13 +391,12 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # USE_FAM - If set, this port uses the File Alteration Monitor. # # WANT_FAM_SYSTEM -# - Legal values are: fam (default), gamin +# - Legal values are: gamin (default),fam # If set to an unknown value, the port is marked BROKEN. ## # USE_AUTOTOOLS - If set, this port uses various GNU autotools # (libtool, autoconf, autoheader, automake et al.) # See bsd.autotools.mk for more details. -# XXX: not currently in active use - this is a placeholder. ## # USE_JAVA - If set, this port relies on the Java language. # Implies inclusion of bsd.java.mk. (Also see @@ -422,7 +439,16 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # or a sound server which supports the FreeBSD native one), # use the default or the X11 prefix if it's a leaf port # (e.g. a game or program). -# Implies NO_MTREE=yes. +# Implies NO_MTREE=yes, and, if INSTALLS_SHLIB is defined: +# - USE_LINUX=yes +# - appropriate invocation of the Linux ldconfig +# USE_LINUX_RPM - Set to yes to pull in variables and targets useful to Linux +# RPM ports. +# Implies inclusion of bsd.linux-rpm.mk. +# AUTOMATIC_PLIST +# - Set to yes to enable automatic packing list generation. +# Currently has no effect unless USE_LINUX_RPM is set. +# # OVERRIDE_LINUX_BASE_PORT - This specifies the default linux base to use, for valid values # have a look at the description of USE_LINUX. This is an user-only # variable. Don't use it in any port, it's meant to be used in @@ -440,7 +466,7 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # ${PREFIX}/etc/rc.d and added to the packing list. # pairs will be added to ${SUB_LIST}. These files will be # installed in ${PREFIX}/etc/rc.d and added to the packing list. -# USE_RCORDER - List of rcNG startup scripts to be called early in the boot +# USE_RCORDER - List of rc.d startup scripts to be called early in the boot # process. This acts exactly like USE_RC_SUBR except that # scripts are installed in /etc/rc.d. # RC_SUBR - Set to path of rc.subr. @@ -813,6 +839,9 @@ FreeBSD_MAINTAINER= portmgr@FreeBSD.org # - If set, bsd.port.mk will automatically run ldconfig commands # from post-install and also add appropriate @exec/@unexec # directives to directories listed in LDCONFIG_DIRS. +# If USE_LINUX_PREFIX is defined, the Linux version of ldconfig +# will be used instead of the native FreeBSD version (in such +# case, LDCONFIG_DIRS is ignored). # LDCONFIG_DIRS - List of directories to run ldconfig if INSTALLS_SHLIB is set. # Note that this is passed through sed just like the # rest of PLIST, so ${PLIST_SUB} substitutions also @@ -1022,12 +1051,7 @@ TEST?= test # Shell builtin TR?= /usr/bin/tr TRUE?= true # Shell builtin UNAME?= /usr/bin/uname -.if exists(/usr/bin/unzip) -UNZIP_CMD?= /usr/bin/unzip -.else UNZIP_CMD?= ${LOCALBASE}/bin/unzip -ZIPDEPENDS= yes -.endif WHICH?= /usr/bin/which XARGS?= /usr/bin/xargs YACC?= /usr/bin/yacc @@ -1063,11 +1087,7 @@ OSREL!= ${UNAME} -r | ${SED} -e 's/[-(].*//' # Get __FreeBSD_version .if !defined(OSVERSION) -.if exists(/sbin/sysctl) OSVERSION!= /sbin/sysctl -n kern.osreldate -.else -OSVERSION!= /usr/sbin/sysctl -n kern.osreldate -.endif .endif # Get the object format. @@ -1171,7 +1191,7 @@ check-makefile:: .if defined(PORTVERSION) .if ${PORTVERSION:M*[-_,]*}x != x -BROKEN= "PORTVERSION ${PORTVERSION} may not contain '-' '_' or ','" +BROKEN= PORTVERSION ${PORTVERSION} may not contain '-' '_' or ',' .endif DISTVERSION?= ${PORTVERSION:S/:/::/g} .elif defined(DISTVERSION) @@ -1209,6 +1229,11 @@ INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/} .else INDEXFILE?= INDEX .endif + +.if defined(USE_LINUX_RPM) +.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk" +.endif + .if defined(USE_BZIP2) EXTRACT_SUFX?= .tar.bz2 .elif defined(USE_ZIP) @@ -1248,6 +1273,16 @@ NO_MTREE= yes PREFIX?= ${LOCALBASE} .endif +.if defined(USE_LINUX_PREFIX) +LDCONFIG_CMD?= ${LINUXBASE}/sbin/ldconfig +LDCONFIG_PLIST_EXEC_CMD?= ${LDCONFIG_CMD} +LDCONFIG_PLIST_UNEXEC_CMD?= ${LDCONFIG_CMD} +.else +LDCONFIG_CMD?= ${LDCONFIG} -m ${LDCONFIG_RUNLIST} +LDCONFIG_PLIST_EXEC_CMD?= ${LDCONFIG} -m ${LDCONFIG_PLIST} +LDCONFIG_PLIST_UNEXEC_CMD?= ${LDCONFIG} -R +.endif + PKGCOMPATDIR?= ${LOCALBASE}/lib/compat/pkg .if ${OSVERSION} >= 500036 @@ -1307,9 +1342,9 @@ PERL5= ${LOCALBASE}/bin/perl${PERL_VERSION} PERL= ${LOCALBASE}/bin/perl .endif -# XXX: (not yet): .if defined(USE_AUTOTOOLS) -# .include "${PORTSDIR}/Mk/bsd.autotools.mk" -# XXX: (not yet): .endif +.if defined(USE_LOCAL_MK) +.include "${PORTSDIR}/Mk/bsd.local.mk" +.endif .if defined(USE_OPENSSL) .include "${PORTSDIR}/Mk/bsd.openssl.mk" @@ -1363,6 +1398,10 @@ PERL= ${LOCALBASE}/bin/perl .include "${PORTSDIR}/Mk/bsd.sdl.mk" .endif +.if defined(USE_QMAIL) || defined(USE_QMAIL_RUN) || defined(USE_QMAIL_BUILD) || defined(WANT_QMAIL) +.include "${PORTSDIR}/Mk/bsd.mail.mk" +.endif + .if ${OSVERSION} >= 502123 X_WINDOW_SYSTEM ?= xorg .elif (${OSVERSION} >= 450005 && !defined(XFREE86_VERSION)) || \ @@ -1377,8 +1416,6 @@ CD_MOUNTPTS?= /cdrom ${CD_MOUNTPT} WANT_OPENLDAP_VER?= 22 -WANT_FAM_SYSTEM?= fam - # Owner and group of the WWW user WWWOWN?= www WWWGRP?= www @@ -1413,6 +1450,9 @@ PLIST_SUB+= OSREL=${OSREL} PREFIX=%D LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} SUB_LIST+= PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} \ DATADIR=${DATADIR} DOCSDIR=${DOCSDIR} EXAMPLESDIR=${EXAMPLESDIR} +PLIST_REINPLACE+= dirrmtry +PLIST_REINPLACE_DIRRMTRY=s!^@dirrmtry \(.*\)!@unexec rmdir %D/\1 2>/dev/null || true! + .if defined(WITHOUT_CPU_CFLAGS) .if defined(_CPUCFLAGS) .if !empty(_CPUCFLAGS) @@ -1454,7 +1494,7 @@ MANCOMPRESSED?= no .if ${PATCHFILES:M*.bz2}x != x && defined(BZIP2DEPENDS) PATCH_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2 .endif -.if ${PATCHFILES:M*.zip}x != x && defined(ZIPDEPENDS) +.if ${PATCHFILES:M*.zip}x != x PATCH_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip .endif .endif @@ -1462,7 +1502,7 @@ PATCH_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip .if defined(USE_BZIP2) && defined(BZIP2DEPENDS) EXTRACT_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2 .endif -.if defined(USE_ZIP) && defined(ZIPDEPENDS) +.if defined(USE_ZIP) EXTRACT_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip .endif .if defined(USE_GMAKE) @@ -1470,6 +1510,10 @@ BUILD_DEPENDS+= gmake:${PORTSDIR}/devel/gmake CONFIGURE_ENV+= MAKE=${GMAKE} .endif +.if defined(USE_DOS2UNIX) +USE_REINPLACE= yes +.endif + .if defined(USE_GCC) .include "${PORTSDIR}/Mk/bsd.gcc.mk" .endif @@ -1490,19 +1534,33 @@ LIB_DEPENDS+= ldap-2.2.7:${PORTSDIR}/net/openldap22${_OPENLDAP_FLAVOUR}-client .elif ${WANT_OPENLDAP_VER} == 23 LIB_DEPENDS+= ldap-2.3.1:${PORTSDIR}/net/openldap23${_OPENLDAP_FLAVOUR}-client .else -BROKEN= "unknown OpenLDAP version: ${WANT_OPENLDAP_VER}" +BROKEN= unknown OpenLDAP version: ${WANT_OPENLDAP_VER} .endif .endif .if defined(USE_FAM) -.if ${WANT_FAM_SYSTEM} == fam -LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/fam -.elif ${WANT_FAM_SYSTEM} == gamin -LIB_DEPENDS+= fam.0:${PORTSDIR}/devel/gamin +DEFAULT_FAM_SYSTEM= gamin +# Currently supported FAM systems +FAM_SYSTEM_FAM= fam.0:${PORTSDIR}/devel/fam +FAM_SYSTEM_GAMIN= fam.0:${PORTSDIR}/devel/gamin + +.if defined(WANT_FAM_SYSTEM) +.if defined(WITH_FAM_SYSTEM) && ${WITH_FAM_SYSTEM}!=${WANT_FAM_SYSTEM} +BROKEN= The port wants to use ${WANT_FAM_SYSTEM} as its FAM system and you wish to use ${WITH_FAM_SYSTEM} +.endif +FAM_SYSTEM= ${WANT_FAM_SYSTEM} +.elif defined(WITH_FAM_SYSTEM) +FAM_SYSTEM= ${WITH_FAM_SYSTEM} .else -BROKEN= "unknown FAM system: ${WANT_FAM_SYSTEM}" -.endif +FAM_SYSTEM= ${DEFAULT_FAM_SYSTEM} +.endif # WANT_FAM_SYSTEM + +.if defined(FAM_SYSTEM_${FAM_SYSTEM:U}) +LIB_DEPENDS+= ${FAM_SYSTEM_${FAM_SYSTEM:U}} +.else +BROKEN= unknown FAM system: ${FAM_SYSTEM} .endif +.endif # USE_FAM .if defined(USE_GETOPT_LONG) .if ${OSVERSION} < 500041 @@ -1541,6 +1599,11 @@ LIB_DEPENDS+= intl.${USE_GETTEXT}:${PORTSDIR}/devel/gettext . endif .endif +.if defined(USE_LINUX_PREFIX) && defined(INSTALLS_SHLIB) +# we need ${LINUXBASE}/sbin/ldconfig +USE_LINUX?= yes +.endif + .if defined(USE_LINUX) # install(1) also does a brandelf on strip, so don't strip with FreeBSD tools. @@ -1715,7 +1778,10 @@ CONFIGURE_ARGS+= INSTALLDIRS="site" .if defined(PERL_CONFIGURE) USE_PERL5= yes -USE_REINPLACE=yes +.endif + +.if defined(PERL_RUN_DEPENDS) || defined(PERL_BUILD_DEPENDS) +USE_PERL5_BUILD= yes .endif .if ${PERL_LEVEL} >= 500600 @@ -1729,24 +1795,24 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} .endif .endif -# XXX: (not yet): .if defined(USE_AUTOTOOLS) -.include "${PORTSDIR}/Mk/bsd.autotools.mk" -# XXX: (not yet): .endif +.if defined(USE_LOCAL_MK) +.include "${PORTSDIR}/Mk/bsd.local.mk" +.endif .if defined(USE_MYSQL) || defined(WANT_MYSQL_VER) || \ defined(USE_PGSQL) || defined(WANT_PGSQL_VER) || \ - defined(USE_BDB) || defined(USE_SQLITE) + defined(USE_BDB) || defined(USE_SQLITE) .include "${PORTSDIR}/Mk/bsd.database.mk" .endif -.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK) -.include "${PORTSDIR}/Mk/bsd.gnome.mk" -.endif - .if defined(WANT_GSTREAMER) || defined(USE_GSTREAMER) .include "${PORTSDIR}/Mk/bsd.gstreamer.mk" .endif +.if defined(USE_LINUX_RPM) +.include "${PORTSDIR}/Mk/bsd.linux-rpm.mk" +.endif + .if defined(USE_SDL) || defined(WANT_SDL) .include "${PORTSDIR}/Mk/bsd.sdl.mk" .endif @@ -1763,6 +1829,15 @@ RUN_DEPENDS+= ${PERL5}:${PORTSDIR}/lang/${PERL_PORT} .include "${PORTSDIR}/Mk/bsd.apache.mk" .endif +# XXX +#.if defined(USE_AUTOTOOLS) +.include "${PORTSDIR}/Mk/bsd.autotools.mk" +#.endif + +.if defined(WANT_GNOME) || defined(USE_GNOME) || defined(USE_GTK) +.include "${PORTSDIR}/Mk/bsd.gnome.mk" +.endif + .if exists(${PORTSDIR}/../Makefile.inc) .include "${PORTSDIR}/../Makefile.inc" USE_SUBMAKE= yes @@ -1812,11 +1887,9 @@ BUILD_DEPENDS+= gs:${PORTSDIR}/${GHOSTSCRIPT_PORT} RUN_DEPENDS+= gs:${PORTSDIR}/${GHOSTSCRIPT_PORT} .endif -# Special macro for doing in-place file editing using regexps -.if defined(USE_REINPLACE) +# Macro for doing in-place file editing using regexps REINPLACE_ARGS?= -i.bak REINPLACE_CMD?= ${SED} ${REINPLACE_ARGS} -.endif # Names of cookies used to skip already completed stages EXTRACT_COOKIE?= ${WRKDIR}/.extract_done.${PKGNAME}.${PREFIX:S/\//_/g} @@ -1838,10 +1911,6 @@ GMAKE?= gmake XMKMF?= xmkmf -a .if exists(/sbin/md5) MD5?= /sbin/md5 -.elif exists(/bin/md5) -MD5?= /bin/md5 -.elif exists(/usr/bin/md5) -MD5?= /usr/bin/md5 .else MD5?= md5 .endif @@ -1930,11 +1999,7 @@ PATCH_ARGS+= --suffix .orig PATCH_DIST_ARGS+= --suffix .orig .endif -.if exists(/bin/tar) -TAR?= /bin/tar -.else TAR?= /usr/bin/tar -.endif # EXTRACT_SUFX is defined in .pre.mk section .if defined(USE_ZIP) @@ -2320,6 +2385,8 @@ FETCH_BEFORE_ARGS+= -l .endif .endfor +NOFETCHFILES?= + # Organize DISTFILES, PATCHFILES, _MASTER_SITES_ALL, _PATCH_SITES_ALL # according to grouping rules (:something) DISTFILES?= ${DISTNAME}${EXTRACT_SUFX} @@ -2514,12 +2581,12 @@ check-categories: VALID_CATEGORIES+= accessibility afterstep arabic archivers astro audio \ benchmarks biology cad chinese comms converters databases \ deskutils devel dns editors elisp emulators finance french ftp \ - games german gnome graphics haskell hebrew hungarian \ + games geography german gnome graphics hamradio haskell hebrew hungarian \ ipv6 irc japanese java kde korean lang linux lisp \ mail math mbone misc multimedia net net-im net-mgmt news \ - offix palm parallel pear perl5 picobsd plan9 polish portuguese print \ - python ruby russian \ - scheme science security shells sysutils \ + palm parallel pear perl5 picobsd plan9 polish portuguese print \ + python ruby rubygems russian \ + scheme science security shells spanish sysutils \ tcl80 tcl81 tcl82 tcl83 tcl84 textproc \ tk80 tk82 tk83 tk84 tkstep80 \ ukrainian vietnamese windowmaker www \ @@ -2579,11 +2646,7 @@ CONFIGURE_FAIL_MESSAGE?= "Please report the problem to ${MAINTAINER} [maintainer .if defined(GNU_CONFIGURE) # Maximum command line length .if !defined(CONFIGURE_MAX_CMD_LEN) -.if exists(/sbin/sysctl) CONFIGURE_MAX_CMD_LEN!= /sbin/sysctl -n kern.argmax -.else -CONFIGURE_MAX_CMD_LEN!= /usr/sbin/sysctl -n kern.argmax -.endif .endif CONFIGURE_ARGS+= --prefix=${PREFIX} ${CONFIGURE_TARGET} CONFIGURE_ENV+= lt_cv_sys_max_cmd_len=${CONFIGURE_MAX_CMD_LEN} @@ -2740,8 +2803,6 @@ LDCONFIG_RUNLIST!= ${ECHO_CMD} ${LDCONFIG_PLIST} | ${SED} -e "s!%D!${PREFIX}!g" # Don't build a port if it's restricted and we don't want to get # into that. # -# Don't build a port on an ELF machine if it's broken for ELF. -# # Don't build a port if it's broken, unless we're running a parallel # build (in case it's fixed). # @@ -2770,32 +2831,32 @@ __ARCH_OK?= 1 .if !defined(__ARCH_OK) .if defined(ONLY_FOR_ARCHS) -IGNORE= "is only for ${ONLY_FOR_ARCHS}," +IGNORE= is only for ${ONLY_FOR_ARCHS}, .else # defined(NOT_FOR_ARCHS) -IGNORE= "does not run on ${NOT_FOR_ARCHS}," +IGNORE= does not run on ${NOT_FOR_ARCHS}, .endif -IGNORE+= "and you are running ${ARCH}" +IGNORE+= and you are running ${ARCH} .endif .if !defined(NO_IGNORE) .if (defined(IS_INTERACTIVE) && defined(BATCH)) -IGNORE= "is an interactive port" +IGNORE= is an interactive port .elif (!defined(IS_INTERACTIVE) && defined(INTERACTIVE)) -IGNORE= "is not an interactive port" +IGNORE= is not an interactive port .elif (defined(NO_CDROM) && defined(FOR_CDROM)) -IGNORE= "may not be placed on a CDROM: ${NO_CDROM}" +IGNORE= may not be placed on a CDROM: ${NO_CDROM} .elif (defined(RESTRICTED) && defined(NO_RESTRICTED)) -IGNORE= "is restricted: ${RESTRICTED}" +IGNORE= is restricted: ${RESTRICTED} .elif defined(BROKEN) .if !defined(TRYBROKEN) -IGNORE= "is marked as broken: ${BROKEN}" +IGNORE= is marked as broken: ${BROKEN} .endif .elif defined(FORBIDDEN) -IGNORE= "is forbidden: ${FORBIDDEN}" +IGNORE= is forbidden: ${FORBIDDEN} .endif .if (defined(MANUAL_PACKAGE_BUILD) && defined(PACKAGE_BUILDING) && !defined(PARALLEL_PACKAGE_BUILD)) -IGNORE= "has to be built manually: ${MANUAL_PACKAGE_BUILD}" +IGNORE= has to be built manually: ${MANUAL_PACKAGE_BUILD} clean: @${IGNORECMD} .endif @@ -2804,15 +2865,17 @@ clean: .if defined(IGNORE_SILENT) IGNORECMD= ${DO_NADA} .else -IGNORECMD= ${ECHO_MSG} "===> ${PKGNAME} ${IGNORE}." +IGNORECMD= ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE:Q}. .endif .for target in check-sanity fetch checksum extract patch configure all build install reinstall package +.if !target(${target}) ${target}: @${IGNORECMD} .if defined(INSTALLS_DEPENDS) @${FALSE} .endif +.endif .endfor .endif @@ -2927,7 +2990,7 @@ package: .if defined(IGNORE_SILENT) @${DO_NADA} .else - @${ECHO_MSG} "===> ${PKGNAME} may not be packaged: ${NO_PACKAGE}." + @${ECHO_MSG} "===> ${PKGNAME} may not be packaged: "${NO_PACKAGE:Q}. .endif .endif @@ -2984,7 +3047,7 @@ check-deprecated: @${ECHO_MSG} @${ECHO_MSG} "This port is deprecated; you may wish to reconsider installing it:" @${ECHO_MSG} - @${ECHO_MSG} "${DEPRECATED}." + @${ECHO_MSG} ${DEPRECATED:Q}. @${ECHO_MSG} .if defined(EXPIRATION_DATE) @${ECHO_MSG} "It is scheduled to be removed on or after ${EXPIRATION_DATE}." @@ -3174,6 +3237,24 @@ do-extract: # Patch +.if !target(patch-dos2unix) +patch-dos2unix: +.if defined(USE_DOS2UNIX) +.if ${USE_DOS2UNIX:U}=="YES" + @${ECHO_MSG} "===> Converting DOS text files to UNIX text files" + @${FIND} -E ${WRKSRC} -type f -print0 | \ + ${XARGS} -0 ${REINPLACE_CMD} -i"" -e 's/[[:cntrl:]]*$$//' +.else +.for f in ${USE_DOS2UNIX} + @${ECHO_MSG} "===> Converting DOS text file to UNIX text file: ${f}" + @${REINPLACE_CMD} -i"" -e 's/[[:cntrl:]]*$$//' ${WRKSRC}/${f} +.endfor +.endif +.else + ${DO_NADA} +.endif +.endif + .if !target(do-patch) do-patch: .if defined(PATCHFILES) @@ -3231,6 +3312,12 @@ do-patch: fi .endif +# XXX - To be tested later +#.if !target(run-autotools) && !defined(USE_AUTOTOOLS) +#run-autotools: +# ${DO_NADA} +#.endif + # Configure .if !target(do-configure) @@ -3519,10 +3606,10 @@ run-ldconfig: .if defined(INSTALLS_SHLIB) .if !defined(INSTALL_AS_USER) @${ECHO_MSG} "===> Running ldconfig" - ${LDCONFIG} -m ${LDCONFIG_RUNLIST} + ${LDCONFIG_CMD} .else @${ECHO_MSG} "===> Running ldconfig (errors are ignored)" - -${LDCONFIG} -m ${LDCONFIG_RUNLIST} + -${LDCONFIG_CMD} .endif .else @${DO_NADA} @@ -3650,9 +3737,9 @@ security-check: ${ECHO_MSG}; \ fi; \ ${ECHO_MSG} " If there are vulnerabilities in these programs there may be a security"; \ - ${ECHO_MSG} " risk to the system. FreeBSD makes no guarantee about the security of"; \ - ${ECHO_MSG} " ports included in the Ports Collection. Please type 'make deinstall'"; \ - ${ECHO_MSG} " to deinstall the port if this is a concern."; \ + ${ECHO_MSG} " risk to the system. The FreeBSD Project makes no guarantee about the"; \ + ${ECHO_MSG} " security of ports included in the Ports Collection."; \ + ${ECHO_MSG} " Please type 'make deinstall' to deinstall the port if this is a concern."; \ www_site=$$(cd ${.CURDIR} && ${MAKE} ${__softMAKEFLAGS} www-site); \ if [ ! -z "$${www_site}" ]; then \ ${ECHO_MSG}; \ @@ -3676,9 +3763,9 @@ security-check: # Please note that the order of the following targets is important, and # should not be modified. -_SANITY_SEQ= pre-everything check-makefile check-categories \ - check-makevars check-depends check-deprecated \ - check-vulnerable buildanyway-message options-message +_SANITY_SEQ= pre-everything check-makefile check-categories \ + check-makevars check-depends check-deprecated \ + check-vulnerable buildanyway-message options-message _FETCH_DEP= check-sanity _FETCH_SEQ= fetch-depends pre-fetch pre-fetch-script \ do-fetch post-fetch post-fetch-script @@ -3687,19 +3774,20 @@ _EXTRACT_SEQ= extract-message checksum extract-depends pre-extract \ pre-extract-script do-extract \ post-extract post-extract-script _PATCH_DEP= extract -_PATCH_SEQ= patch-message patch-depends pre-patch pre-patch-script \ - do-patch post-patch post-patch-script +_PATCH_SEQ= patch-message patch-depends patch-dos2unix pre-patch \ + pre-patch-script do-patch post-patch post-patch-script _CONFIGURE_DEP= patch -_CONFIGURE_SEQ= build-depends lib-depends misc-depends configure-message \ - pre-configure pre-configure-script patch-autotools \ - run-autotools do-configure post-configure post-configure-script +_CONFIGURE_SEQ= build-depends lib-depends perl-build-depends misc-depends \ + configure-message pre-configure pre-configure-script \ + run-autotools do-configure post-configure post-configure-script _BUILD_DEP= configure _BUILD_SEQ= build-message pre-build pre-build-script do-build \ post-build post-build-script _INSTALL_DEP= build _INSTALL_SEQ= install-message check-conflicts \ - run-depends lib-depends apply-slist pre-install \ - pre-install-script generate-plist check-already-installed + run-depends lib-depends perl-run-depends apply-slist \ + pre-install pre-install-script generate-plist \ + check-already-installed _INSTALL_SUSEQ= check-umask install-mtree pre-su-install \ pre-su-install-script do-install install-desktop-entries \ post-install post-install-script add-plist-info \ @@ -4013,6 +4101,11 @@ fetch-list: SORTED_MASTER_SITES_CMD_TMP="${SORTED_MASTER_SITES_DEFAULT_CMD}" ; \ fi ; \ for site in `eval $$SORTED_MASTER_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \ + if [ ! -z "`${ECHO_CMD} ${NOFETCHFILES} | ${GREP} -w $${file}`" ]; then \ + if [ -z "`${ECHO_CMD} ${MASTER_SITE_OVERRIDE} | ${GREP} -w $${site}`" ]; then \ + continue; \ + fi; \ + fi; \ DIR=${DIST_SUBDIR}; \ CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ case $${file} in \ @@ -4285,7 +4378,7 @@ package-noinstall: ################################################################ .if !target(depends) -depends: extract-depends patch-depends lib-depends misc-depends fetch-depends build-depends run-depends +depends: extract-depends patch-depends lib-depends perl-build-depends perl-run-depends misc-depends fetch-depends build-depends run-depends .if defined(ALWAYS_BUILD_DEPENDS) _DEPEND_ALWAYS= 1 @@ -4293,6 +4386,21 @@ _DEPEND_ALWAYS= 1 _DEPEND_ALWAYS= 0 .endif +_INSTALL_DEPENDS= \ + if [ X${USE_PACKAGE_DEPENDS} != "X" ]; then \ + subpkgfile=`(cd $$dir; ${MAKE} $$depends_args -V PKGFILE)`; \ + if [ -r "$${subpkgfile}" -a "$$target" = "${DEPENDS_TARGET}" ]; then \ + ${ECHO_MSG} "===> Installing existing package $${subpkgfile}"; \ + ${PKG_ADD} $${subpkgfile}; \ + else \ + (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \ + fi; \ + else \ + (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \ + fi ; \ + ${ECHO_MSG} "===> Returning to build of ${PKGNAME}"; \ + + .for deptype in EXTRACT PATCH FETCH BUILD RUN ${deptype:L}-depends: .if defined(${deptype}_DEPENDS) @@ -4361,18 +4469,7 @@ ${deptype:L}-depends: if [ ! -d "$$dir" ]; then \ ${ECHO_MSG} " => No directory for $$prog. Skipping.."; \ else \ - if [ X${USE_PACKAGE_DEPENDS} != "X" ]; then \ - subpkgfile=`(cd $$dir; ${MAKE} $$depends_args -V PKGFILE)`; \ - if [ -r "$${subpkgfile}" -a "$$target" = "${DEPENDS_TARGET}" ]; then \ - ${ECHO_MSG} "===> Installing existing package $${subpkgfile}"; \ - ${PKG_ADD} $${subpkgfile}; \ - else \ - (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \ - fi; \ - else \ - (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \ - fi ; \ - ${ECHO_MSG} "===> Returning to build of ${PKGNAME}"; \ + ${_INSTALL_DEPENDS} \ fi; \ fi; \ done @@ -4417,18 +4514,7 @@ lib-depends: if [ ! -d "$$dir" ]; then \ ${ECHO_MSG} " => No directory for $$lib. Skipping.."; \ else \ - if [ X${USE_PACKAGE_DEPENDS} != "X" ]; then \ - subpkgfile=`(cd $$dir; ${MAKE} $$depends_args -V PKGFILE)`; \ - if [ -r "$${subpkgfile}" -a "$$target" = "${DEPENDS_TARGET}" ]; then \ - ${ECHO_MSG} "===> Installing existing package $${subpkgfile}"; \ - ${PKG_ADD} $${subpkgfile}; \ - else \ - (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \ - fi; \ - else \ - (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \ - fi ; \ - ${ECHO_MSG} "===> Returning to build of ${PKGNAME}"; \ + ${_INSTALL_DEPENDS} \ if ! ${LDCONFIG} -r | ${GREP} -vwF -e "${PKGCOMPATDIR}" | ${GREP} -qwE -e "-l$$pattern"; then \ ${ECHO_MSG} "Error: shared library \"$$lib\" does not exist"; \ ${FALSE}; \ @@ -4438,6 +4524,35 @@ lib-depends: done .endif +.for deptype in BUILD RUN +perl-${deptype:L}-depends: +.if defined(PERL_${deptype}_DEPENDS) + @for tupple in ${PERL_${deptype}_DEPENDS}; do \ + mod=$${tupple%:*}; \ + mod=`${ECHO_CMD} $${mod} | sed -e 's/\-/::/g'`; \ + dir=$${tupple##*:}; \ + ${ECHO_MSG} -n "===> ${PKGNAME} depends on Perl module: $$mod"; \ + if ${PERL} -M$${mod} -e 1 2>/dev/null; then \ + ${ECHO_MSG} " - found"; \ + else \ + ${ECHO_MSG} " - not found"; \ + ${ECHO_MSG} "===> Verifying install for $$mod in $$dir"; \ + if [ ! -d "$$dir" ]; then \ + ${ECHO_MSG} " => No directory for $$mod. Skipping.."; \ + else \ + ${_INSTALL_DEPENDS} \ + if ! ${PERL} -M$${mod} -e 1 2>/dev/null; then \ + ${ECHO_MSG} "Error: Perl module \"$${mod}\" does not exist"; \ + ${FALSE}; \ + fi; \ + fi; \ + fi; \ + done +.else + @${DO_NADA} +.endif +.endfor + misc-depends: .if defined(DEPENDS) .if !defined(NO_DEPENDS) @@ -4467,25 +4582,42 @@ misc-depends: # Dependency lists: both build and runtime, recursive. Print out directory names. +_UNIFIED_DEPENDS=${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${RUN_DEPENDS} ${PERL_BUILD_DEPENDS} ${PERL_RUN_DEPENDS} +_DEPEND_DIRS= ${_UNIFIED_DEPENDS:C,^[^:]*:([^:]*),\1,} ${DEPENDS:C,:.*,,} + all-depends-list: -.if defined(EXTRACT_DEPENDS) || defined(PATCH_DEPENDS) || defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || defined(LIB_DEPENDS) || defined(RUN_DEPENDS) || defined(DEPENDS) @${ALL-DEPENDS-LIST} -.endif ALL-DEPENDS-LIST= \ - checked="${PARENT_CHECKED}"; \ - for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':') $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':'); do \ - if [ -d $$dir ]; then \ - if (${ECHO_CMD} $$checked | ${GREP} -qwv "$$dir"); then \ - child=$$(cd $$dir; ${MAKE} PARENT_CHECKED="$$checked" all-depends-list); \ - for d in $$child; do ${ECHO_CMD} $$d; done; \ - ${ECHO_CMD} $$dir; \ - checked="$$dir $$child $$checked"; \ - fi; \ - else \ - ${ECHO_MSG} "${PKGNAME}: \"$$dir\" non-existent -- dependency list incomplete" >&2; \ - fi; \ - done | ${SORT} -u + L="${_DEPEND_DIRS}"; \ + checked=""; \ + while [ -n "$$L" ]; do \ + l=""; \ + for d in $$L; do \ + case $$checked in \ + $$d\ *|*\ $$d\ *|*\ $$d) \ + continue;; \ + esac; \ + checked="$$checked $$d"; \ + if [ ! -d $$d ]; then \ + ${ECHO_MSG} "${PKGNAME}: \"$$d\" non-existent -- dependency list incomplete" >&2; \ + continue; \ + fi; \ + ${ECHO_CMD} $$d; \ + if ! children=$$(${MAKE} -C $$d -V _DEPEND_DIRS); then\ + ${ECHO_MSG} "${PKGNAME}: \"$$d\" erroneous -- dependency list incomplete" >&2; \ + continue; \ + fi; \ + for child in $$children; do \ + case "$$checked $$l" in \ + $$child\ *|*\ $$child\ *|*\ $$child) \ + continue;; \ + esac; \ + l="$$l $$child"; \ + done; \ + done; \ + L=$$l; \ + done .if !target(clean-depends) clean-depends: @@ -4519,7 +4651,7 @@ fetch-recursive-list: .if !target(fetch-required) fetch-required: fetch @${ECHO_MSG} "===> Fetching all required distfiles for ${PKGNAME} and dependencies" -.for deptype in EXTRACT PATCH FETCH BUILD RUN +.for deptype in EXTRACT PATCH FETCH BUILD RUN PERL_BUILD PERL_RUN .if defined(${deptype}_DEPENDS) .if !defined(NO_DEPENDS) @for i in ${${deptype}_DEPENDS}; do \ @@ -4547,7 +4679,7 @@ fetch-required: fetch .if !target(fetch-required-list) fetch-required-list: fetch-list -.for deptype in EXTRACT PATCH FETCH BUILD RUN +.for deptype in EXTRACT PATCH FETCH BUILD RUN PERL_BUILD PERL_RUN .if defined(${deptype}_DEPENDS) .if !defined(NO_DEPENDS) @for i in ${${deptype}_DEPENDS}; do \ @@ -4584,12 +4716,12 @@ checksum-recursive: # Dependency lists: build and runtime. Print out directory names. build-depends-list: -.if defined(EXTRACT_DEPENDS) || defined(PATCH_DEPENDS) || defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || defined(LIB_DEPENDS) || defined(DEPENDS) +.if defined(EXTRACT_DEPENDS) || defined(PATCH_DEPENDS) || defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || defined(LIB_DEPENDS) || defined(DEPENDS) || defined(PERL_BUILD_DEPENDS) @${BUILD-DEPENDS-LIST} .endif BUILD-DEPENDS-LIST= \ - for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | ${SORT} -u) $$(${ECHO_CMD} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//' | ${SORT} -u); do \ + for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${PERL_BUILD_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//' | ${SORT} -u) $$(${ECHO_CMD} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//' | ${SORT} -u); do \ if [ -d $$dir ]; then \ ${ECHO_CMD} $$dir; \ else \ @@ -4598,12 +4730,12 @@ BUILD-DEPENDS-LIST= \ done | ${SORT} -u run-depends-list: -.if defined(LIB_DEPENDS) || defined(RUN_DEPENDS) || defined(DEPENDS) +.if defined(LIB_DEPENDS) || defined(RUN_DEPENDS) || defined(DEPENDS) || defined(PERL_RUN_DEPENDS) @${RUN-DEPENDS-LIST} .endif RUN-DEPENDS-LIST= \ - for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':' | ${SORT} -u) $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':' | ${SORT} -u); do \ + for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS} ${PERL_RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':' | ${SORT} -u) $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':' | ${SORT} -u); do \ if [ -d $$dir ]; then \ ${ECHO_CMD} $$dir; \ else \ @@ -4615,7 +4747,7 @@ RUN-DEPENDS-LIST= \ # and package names. package-depends-list: -.if defined(CHILD_DEPENDS) || defined(LIB_DEPENDS) || defined(RUN_DEPENDS) || defined(DEPENDS) +.if defined(CHILD_DEPENDS) || defined(LIB_DEPENDS) || defined(RUN_DEPENDS) || defined(DEPENDS) || defined(PERL_RUN_DEPENDS) @${PACKAGE-DEPENDS-LIST} .endif @@ -4634,7 +4766,7 @@ PACKAGE-DEPENDS-LIST?= \ done; \ fi; \ checked="${PARENT_CHECKED}"; \ - for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':') $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':'); do \ + for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS} ${PERL_RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':') $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':'); do \ dir=$$(${REALPATH} $$dir); \ if [ -d $$dir ]; then \ if (${ECHO_CMD} $$checked | ${GREP} -qwv "$$dir"); then \ @@ -4676,6 +4808,9 @@ package-recursive: package # distribution-name|port-path|installation-prefix|comment| \ # description-file|maintainer|categories|extract-depends| \ # patch-depends|fetch-depends|build-depends|run-depends|www site +# +# If this ever changes, portmgr should contact the portsnap maintainer +# first to avoid gratuitous breakage. .if !target(describe) describe: @@ -4699,7 +4834,9 @@ describe: @rdirs = map((split /:/)[1], split(q{ }, q{${RUN_DEPENDS}})); \ @ddirs = map((split /:/)[0], split(q{ }, q{${DEPENDS}})); \ @ldirs = map((split /:/)[1], split(q{ }, q{${LIB_DEPENDS}})); \ - for my $$i (\@edirs, \@pdirs, \@fdirs, \@bdirs, \@rdirs, \@ddirs, \@ldirs) { \ + @prdirs = map((split /:/)[1], split(q{ }, q{${PERL_RUN_DEPENDS}})); \ + @pbdirs = map((split /:/)[1], split(q{ }, q{${PERL_BUILD_DEPENDS}})); \ + for my $$i (\@edirs, \@pdirs, \@fdirs, \@bdirs, \@rdirs, \@ddirs, \@ldirs, \@prdirs, \@pbdirs) { \ my @dirs = @$$i; \ @$$i = (); \ for (@dirs) { \ @@ -4723,11 +4860,11 @@ describe: $$xf{$$_} = 1; \ } \ print join(q{ }, sort keys %xf), q{|}; \ - for (@bdirs, @ddirs, @ldirs) { \ + for (@bdirs, @ddirs, @ldirs, @pbdirs) { \ $$xb{$$_} = 1; \ } \ print join(q{ }, sort keys %xb), q{|}; \ - for (@rdirs, @ddirs, @ldirs) { \ + for (@rdirs, @ddirs, @ldirs, @prdirs) { \ $$xr{$$_} = 1; \ } \ print join(q{ }, sort keys %xr), q{|}; \ @@ -4744,7 +4881,7 @@ describe: www-site: .if exists(${DESCR}) - @${GREP} '^WWW:[ ]' ${DESCR} | ${AWK} '{print $$2}' | ${HEAD} -1 + @${AWK} '$$1 ~ /^WWW:/ {print $$2}' ${DESCR} | ${HEAD} -1 .else @${ECHO_CMD} .endif @@ -4784,23 +4921,31 @@ ${.CURDIR}/README.html: # The following two targets require an up-to-date INDEX in ${PORTSDIR} +_PRETTY_PRINT_DEPENDS_LIST=\ + if [ ! -r ${PORTSDIR}/${INDEXFILE} ] ; then \ + ${ECHO_CMD} "${.TARGET} requires an INDEX file (${INDEXFILE}). Please run make index or make fetchindex."; \ + else \ + ${ECHO_CMD} -n 'This port requires package(s) "' ; \ + ${ECHO_CMD} -n `${AWK} -F\| '$$1 ~ /^${PKGNAME}/ {print $$8;}' ${PORTSDIR}/${INDEXFILE}` ; \ + ${ECHO_CMD} '" to ${.TARGET:C/pretty-print-(.*)-depends-list/\1/}.'; \ + fi; + + .if !target(pretty-print-build-depends-list) pretty-print-build-depends-list: .if defined(EXTRACT_DEPENDS) || defined(PATCH_DEPENDS) || \ defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || \ - defined(LIB_DEPENDS) || defined(DEPENDS) - @${ECHO_CMD} -n 'This port requires package(s) "' - @${ECHO_CMD} -n `${GREP} '^${PKGNAME}|' ${PORTSDIR}/${INDEXFILE} | ${AWK} -F\| '{print $$8;}'` - @${ECHO_CMD} '" to build.' + defined(LIB_DEPENDS) || defined(DEPENDS) || \ + defined(PERL_BUILD_DEPENDS) + @${_PRETTY_PRINT_DEPENDS_LIST} .endif .endif .if !target(pretty-print-run-depends-list) pretty-print-run-depends-list: -.if defined(RUN_DEPENDS) || defined(LIB_DEPENDS) || defined(DEPENDS) - @${ECHO_CMD} -n 'This port requires package(s) "' - @${ECHO_CMD} -n `${GREP} '^${PKGNAME}|' ${PORTSDIR}/${INDEXFILE} | ${AWK} -F\| '{print $$9;}'` - @${ECHO_CMD} '" to run.' +.if defined(RUN_DEPENDS) || defined(LIB_DEPENDS) || \ + defined(DEPENDS) || defined(PERL_RUN_DEPENDS) + @${_PRETTY_PRINT_DEPENDS_LIST} .endif .endif @@ -4858,15 +5003,21 @@ generate-plist: @if [ -f ${PLIST} ]; then \ ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PLIST} >> ${TMPPLIST}; \ fi +.for reinplace in ${PLIST_REINPLACE} +.if defined(PLIST_REINPLACE_${reinplace}) + @${SED} -e '${PLIST_REINPLACE_${reinplace:U}}' ${PLIST} >> ${TMPPLIST} +.endif +.endfor + .for dir in ${PLIST_DIRS} @${ECHO_CMD} ${dir} | ${SED} ${PLIST_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} | ${SED} -e 's,^,@dirrm ,' >> ${TMPPLIST} .endfor .if defined(INSTALLS_SHLIB) && !defined(INSTALL_AS_USER) - @${ECHO_CMD} "@exec ${LDCONFIG} -m ${LDCONFIG_PLIST}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec ${LDCONFIG} -R" >> ${TMPPLIST} + @${ECHO_CMD} "@exec ${LDCONFIG_PLIST_EXEC_CMD}" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec ${LDCONFIG_PLIST_UNEXEC_CMD}" >> ${TMPPLIST} .elif defined(INSTALLS_SHLIB) - @${ECHO_CMD} "@exec ${LDCONFIG} -m ${LDCONFIG_PLIST} || ${TRUE}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec ${LDCONFIG} -R || ${TRUE}" >> ${TMPPLIST} + @${ECHO_CMD} "@exec ${LDCONFIG_PLIST_EXEC_CMD} || ${TRUE}" >> ${TMPPLIST} + @${ECHO_CMD} "@unexec ${LDCONFIG_PLIST_UNEXEC_CMD} || ${TRUE}" >> ${TMPPLIST} .endif .if !defined(NO_FILTER_SHLIBS) .if (${PORTOBJFORMAT} == "aout") @@ -4941,7 +5092,7 @@ add-plist-post: install-rc-script: .if defined(USE_RCORDER) || defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES" .if defined(USE_RCORDER) - @${ECHO_CMD} "===> Installing early rcNG startup script(s)" + @${ECHO_CMD} "===> Installing early rc.d startup script(s)" @${ECHO_CMD} "@cwd /" >> ${TMPPLIST} @for i in ${USE_RCORDER}; do \ ${INSTALL_SCRIPT} ${WRKDIR}/$${i} /etc/rc.d/$${i%.sh}; \ @@ -4950,13 +5101,20 @@ install-rc-script: @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} .endif .if defined(USE_RC_SUBR) && ${USE_RC_SUBR:U} != "YES" - @${ECHO_CMD} "===> Installing rcNG startup script(s)" + @${ECHO_CMD} "===> Installing rc.d startup script(s)" @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} +.if ${OSVERSION} >= 700007 + @for i in ${USE_RC_SUBR}; do \ + ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${PREFIX}/etc/rc.d/$${i%.sh}; \ + ${ECHO_CMD} "etc/rc.d/$${i%.sh}" >> ${TMPPLIST}; \ + done +.else @for i in ${USE_RC_SUBR}; do \ ${INSTALL_SCRIPT} ${WRKDIR}/$${i} ${PREFIX}/etc/rc.d/$${i%.sh}.sh; \ ${ECHO_CMD} "etc/rc.d/$${i%.sh}.sh" >> ${TMPPLIST}; \ done .endif +.endif .else @${DO_NADA} .endif diff --git a/Mk/bsd.port.subdir.mk b/Mk/bsd.port.subdir.mk index b3f988016f6a..7c33e35257aa 100644 --- a/Mk/bsd.port.subdir.mk +++ b/Mk/bsd.port.subdir.mk @@ -265,10 +265,8 @@ README= ${TEMPLATES}/README.category .endif COMMENTFILE?= ${.CURDIR}/pkg/COMMENT DESCR?= ${.CURDIR}/pkg/DESCR -.if ${OSVERSION} >= 600000 -INDEXFILE?= INDEX-6 -.elif ${OSVERSION} >= 500036 -INDEXFILE?= INDEX-5 +.if ${OSVERSION} >= 500036 +INDEXFILE?= INDEX-${OSVERSION:C/([0-9]).*/\1/} .else INDEXFILE?= INDEX .endif @@ -333,8 +331,11 @@ PORTSEARCH_KEYLIM?=0 PORTSEARCH_XKEYLIM?=0 PORTSEARCH_IGNORECASE?=1 -search: ${PORTSDIR}/${INDEXFILE} - @here=${.CURDIR}; \ +_PORTSEARCH= \ + here=${.CURDIR}; \ + if [ ! -r ${PORTSDIR}/${INDEXFILE} ] ; then \ + echo "The ${.TARGET} target requires ${INDEXFILE}. Please run make index or make fetchindex."; \ + else \ cd ${PORTSDIR}; \ if [ -z "$$key" -a -z "$$xkey" -a \ -z "$$name" -a -z "$$xname" -a \ @@ -346,9 +347,9 @@ search: ${PORTSDIR}/${INDEXFILE} -z "$$rdeps" -a -z "$$xrdeps" -a \ -z "$$www" -a -z "$$xwww" ]; \ then \ - echo "The search target requires a keyword parameter or name parameter,"; \ - echo "e.g.: \"make search key=somekeyword\""; \ - echo "or \"make search name=somekeyword\""; \ + echo "The ${.TARGET} target requires a keyword parameter or name parameter,"; \ + echo "e.g.: \"make ${.TARGET} key=somekeyword\""; \ + echo "or \"make ${.TARGET} name=somekeyword\""; \ exit; \ fi; \ awk -F\| -v there="$$here/" -v top="$$(pwd -P)" \ @@ -365,6 +366,7 @@ search: ${PORTSDIR}/${INDEXFILE} -v keylim="$${keylim:-${PORTSEARCH_KEYLIM}}" \ -v xkeylim="$${xkeylim:-${PORTSEARCH_XKEYLIM}}" \ -v display="$${display:-${PORTSEARCH_DISPLAY_FIELDS}}" \ + -v xdisplay="$$xdisplay" \ 'BEGIN { \ gsub(/\+/,"\\+",name); \ if (substr(there, 1, length(top)) == top) \ @@ -407,6 +409,10 @@ search: ${PORTSDIR}/${INDEXFILE} for (i in d) { \ disp[fields[d[i]]] = 1; \ } \ + split(xdisplay, xd, /,[ \t]*/); \ + for (i in xd) { \ + delete disp[fields[xd[i]]]; \ + } \ } \ { \ if (substr($$2, 1, therelen) != there) \ @@ -431,4 +437,11 @@ search: ${PORTSDIR}/${INDEXFILE} if (i in disp) \ printf("%s:\t%s\n", names[i], $$i); \ print(""); \ - }' ${PORTSDIR}/${INDEXFILE} + }' ${PORTSDIR}/${INDEXFILE} ; fi + +search: + @${_PORTSEARCH} + +quicksearch: + @export display="name,path,info" ; \ + ${_PORTSEARCH} diff --git a/Mk/bsd.ruby.mk b/Mk/bsd.ruby.mk index 028d99c632a4..1efcfdf66156 100644 --- a/Mk/bsd.ruby.mk +++ b/Mk/bsd.ruby.mk @@ -114,12 +114,12 @@ RUBY_VER?= ${RUBY_DEFAULT_VER} .if defined(RUBY) .if !exists(${RUBY}) -BROKEN= "You set the variable RUBY to \"${RUBY}\", but it does not seem to exist. Please specify an already installed ruby executable." +BROKEN= You set the variable RUBY to "${RUBY}", but it does not seem to exist. Please specify an already installed ruby executable. .endif _RUBY_TEST!= ${RUBY} -e 'begin; require "rbconfig"; rescue LoadError; puts "error"; end' .if !empty(_RUBY_TEST) -BROKEN= "You set the variable RUBY to \"${RUBY}\", but it failed to include rbconfig. Please specify a properly installed ruby executable." +BROKEN= You set the variable RUBY to "${RUBY}", but it failed to include rbconfig. Please specify a properly installed ruby executable. .endif _RUBY_CONFIG= ${RUBY} -r rbconfig -e 'C = Config::CONFIG' -e @@ -147,7 +147,7 @@ RUBY_PATCHFILES?= ${RUBY_VERSION}-patch1.gz RUBY_WRKSRC= ${WRKDIR}/ruby-${RUBY_VERSION} #MASTER_SITE_SUBDIR_RUBY= snapshots .elif defined(RUBY_VER) && ${RUBY_VER} == 1.7 -BROKEN= "Ruby 1.7 is obsolete; set RUBY_VER to 1.8 instead." +BROKEN= Ruby 1.7 is obsolete; set RUBY_VER to 1.8 instead. .else RUBY_VERSION?= 1.6.8 RUBY_DISTVERSION?= ${RUBY_VERSION}-2004.07.28 diff --git a/Mk/bsd.sdl.mk b/Mk/bsd.sdl.mk index ec559e26644c..53cfa12b8f72 100644 --- a/Mk/bsd.sdl.mk +++ b/Mk/bsd.sdl.mk @@ -145,7 +145,7 @@ USE_SDL= sdl _USE_SDL= .for component in ${USE_SDL} . if ${_USE_SDL_ALL:M${component}}=="" -BROKEN= "Unknown SDL component ${component}" +BROKEN= Unknown SDL component ${component} . endif _USE_SDL+= ${_REQUIRES_${component}} ${component} .endfor diff --git a/Mk/bsd.tcl.mk b/Mk/bsd.tcl.mk index c0bfed148156..9bb3c7761fa0 100644 --- a/Mk/bsd.tcl.mk +++ b/Mk/bsd.tcl.mk @@ -79,7 +79,7 @@ TCLSH= ${LOCALBASE}/bin/tclsh${TCL_VER} .endfor .if ${_FOUND} == "no" -IGNORE= "Unknown TCL version specified: ${USE_TCL}" +IGNORE= Unknown TCL version specified: ${USE_TCL} .endif .endif # defined(USE_TCL) @@ -94,7 +94,7 @@ USE_TK= 84 TK_VER:= ${USE_TK:S/8/8./} .if defined(USE_TCL) && ${TCL_VER} != ${TK_VER} -IGNORE= "TCL and TK versions must be equal (${TCL_VER} vs ${TK_VER})" +IGNORE= TCL and TK versions must be equal (${TCL_VER} vs ${TK_VER}) .endif _FOUND= no @@ -112,7 +112,7 @@ WISH= ${LOCALBASE}/bin/wish${TK_VER} .endfor .if ${_FOUND} == "no" -IGNORE= "Unknown TK version specified: ${USE_TK}" +IGNORE= Unknown TK version specified: ${USE_TK} .endif .endif # defined(USE_TK) diff --git a/astro/sattrack/Makefile b/astro/sattrack/Makefile index ea5dcdc84403..5654c6748133 100644 --- a/astro/sattrack/Makefile +++ b/astro/sattrack/Makefile @@ -7,7 +7,7 @@ PORTNAME= sattrack PORTVERSION= 3.1.6 -CATEGORIES= astro +CATEGORIES= astro hamradio MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= trevor diff --git a/comms/acfax/Makefile b/comms/acfax/Makefile index 29a89cb9a162..7c7297139848 100644 --- a/comms/acfax/Makefile +++ b/comms/acfax/Makefile @@ -8,7 +8,7 @@ PORTNAME= acfax PORTVERSION= 0.981011 PORTREVISION= 1 -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= ftp://ftp.funet.fi/pub/ham/unix/Linux/misc/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/^0.//} diff --git a/comms/aldo/Makefile b/comms/aldo/Makefile index 0be34da73518..7c95bc4582b2 100644 --- a/comms/aldo/Makefile +++ b/comms/aldo/Makefile @@ -7,7 +7,7 @@ PORTNAME= aldo PORTVERSION= 0.6.11 -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_SAVANNAH} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/comms/cwdaemon/Makefile b/comms/cwdaemon/Makefile index 5dfdc6ae576d..ccc0f143adfa 100644 --- a/comms/cwdaemon/Makefile +++ b/comms/cwdaemon/Makefile @@ -7,7 +7,7 @@ PORTNAME= cwdaemon PORTVERSION= 0.9.2 -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= http://pg4i.mattsnetwork.co.uk/download/ DIST_SUBDIR= ${PORTNAME} diff --git a/comms/echolinux/Makefile b/comms/echolinux/Makefile index f3c49878c53a..9a04bb18c50b 100644 --- a/comms/echolinux/Makefile +++ b/comms/echolinux/Makefile @@ -8,7 +8,7 @@ PORTNAME= echolinux PORTVERSION= 0.16a PORTREVISION= 2 -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= cqinet EXTRACT_SUFX= .tgz diff --git a/comms/gmfsk/Makefile b/comms/gmfsk/Makefile index 964c1cd63f98..a512337ef51e 100644 --- a/comms/gmfsk/Makefile +++ b/comms/gmfsk/Makefile @@ -8,7 +8,7 @@ PORTNAME= gmfsk PORTVERSION= 0.6 PORTREVISION= 3 -CATEGORIES= comms audio +CATEGORIES= comms audio hamradio MASTER_SITES= http://gmfsk.connect.fi/ MAINTAINER= carl@stagecraft.cx diff --git a/comms/gpredict/Makefile b/comms/gpredict/Makefile index 821fef0cac9e..c83921a60226 100644 --- a/comms/gpredict/Makefile +++ b/comms/gpredict/Makefile @@ -6,7 +6,7 @@ PORTNAME= gpredict PORTVERSION= 0.5.1 -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= groundstation diff --git a/comms/gpsk31/Makefile b/comms/gpsk31/Makefile index c1b4d2ed83c8..79ed84d4dec1 100644 --- a/comms/gpsk31/Makefile +++ b/comms/gpsk31/Makefile @@ -6,7 +6,7 @@ PORTNAME= gpsk31 PORTVERSION= 0.3 -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= http://www.qsl.net/pg4i/download/ MAINTAINER= xride@x12.dk diff --git a/comms/grig/Makefile b/comms/grig/Makefile index 40cffd825a9e..75245671eba1 100644 --- a/comms/grig/Makefile +++ b/comms/grig/Makefile @@ -7,7 +7,7 @@ PORTNAME= grig PORTVERSION= 0.2.2 PORTREVISION= 3 -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= groundstation diff --git a/comms/hamfax/Makefile b/comms/hamfax/Makefile index 741351fea954..51d20f3152b6 100644 --- a/comms/hamfax/Makefile +++ b/comms/hamfax/Makefile @@ -6,7 +6,7 @@ PORTNAME= hamfax PORTVERSION= 0.6.4 -CATEGORIES= comms audio +CATEGORIES= comms audio hamradio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= hamfax DISTNAME= HamFax-${PORTVERSION} diff --git a/comms/hamlib/Makefile b/comms/hamlib/Makefile index 8d6260b3ea7a..62d91093d43d 100644 --- a/comms/hamlib/Makefile +++ b/comms/hamlib/Makefile @@ -7,7 +7,7 @@ PORTNAME= hamlib PORTVERSION= 1.2.2 -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= ${PORTNAME}-${PORTVERSION} diff --git a/comms/klog/Makefile b/comms/klog/Makefile index 6eb4b143e14d..26035713595b 100644 --- a/comms/klog/Makefile +++ b/comms/klog/Makefile @@ -7,7 +7,7 @@ PORTNAME= klog PORTVERSION= 0.3.2 PORTREVISION= 1 -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= http://download.berlios.de/klog/ MAINTAINER= az@FreeBSD.org diff --git a/comms/kpsk/Makefile b/comms/kpsk/Makefile index a710831e8804..fda737e1b6f4 100644 --- a/comms/kpsk/Makefile +++ b/comms/kpsk/Makefile @@ -7,7 +7,7 @@ PORTNAME= kpsk PORTVERSION= 1.0 PORTREVISION= 4 -CATEGORIES= comms kde +CATEGORIES= comms kde hamradio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= kpsk diff --git a/comms/linrad/Makefile b/comms/linrad/Makefile index af4f2091719e..7f6d0ef67ac1 100644 --- a/comms/linrad/Makefile +++ b/comms/linrad/Makefile @@ -7,7 +7,7 @@ PORTNAME= linrad PORTVERSION= 0.16a -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= http://www.nitehawk.com/sm5bsz/linuxdsp/archive/ DISTNAME= lir01-20 EXTRACT_SUFX= .tbz diff --git a/comms/nasawash/Makefile b/comms/nasawash/Makefile index d26f9e483312..7d01aac19e27 100644 --- a/comms/nasawash/Makefile +++ b/comms/nasawash/Makefile @@ -7,7 +7,7 @@ PORTNAME= nasawash PORTVERSION= 0.50 -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= ftp://ftp.amsat.org/amsat/software/Linux/ DISTNAME= nasawash EXTRACT_SUFX= .tgz diff --git a/comms/nec2c/Makefile b/comms/nec2c/Makefile index dbcdbea7cb81..091838f5a3c8 100644 --- a/comms/nec2c/Makefile +++ b/comms/nec2c/Makefile @@ -6,7 +6,7 @@ PORTNAME= nec2c PORTVERSION= .9 -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= http://www.si-list.org/NEC_Archives/ DISTNAME= nec2c DIST_SUBDIR= ${PORTNAME} diff --git a/comms/qsstv/Makefile b/comms/qsstv/Makefile index 21b71e41c6cd..4b05ec5368f2 100644 --- a/comms/qsstv/Makefile +++ b/comms/qsstv/Makefile @@ -7,7 +7,7 @@ PORTNAME= qsstv PORTVERSION= 6.0a -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= http://users.telenet.be/on4qz/snapshots/download/ EXTRACT_SUFX= .tgz diff --git a/comms/splat/Makefile b/comms/splat/Makefile index 667863a44968..206ff39c9bf9 100644 --- a/comms/splat/Makefile +++ b/comms/splat/Makefile @@ -7,7 +7,7 @@ PORTNAME= splat PORTVERSION= 1.1.0 -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/ham diff --git a/comms/thebridge/Makefile b/comms/thebridge/Makefile index 9f912c7a870b..d0877d177156 100644 --- a/comms/thebridge/Makefile +++ b/comms/thebridge/Makefile @@ -7,7 +7,7 @@ PORTNAME= thebridge PORTVERSION= 0.72 -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= cqinet EXTRACT_SUFX= .tgz diff --git a/comms/tlf/Makefile b/comms/tlf/Makefile index 7ca2c40454ab..06a1b08c7bcb 100644 --- a/comms/tlf/Makefile +++ b/comms/tlf/Makefile @@ -7,7 +7,7 @@ PORTNAME= tlf PORTVERSION= 0.9.19 -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= http://www.wwns.com/tlf/ \ http://sharon.esrac.ele.tue.nl/pub/linux/ham/tlf/ DIST_SUBDIR= ${PORTNAME} diff --git a/comms/trustedqsl/Makefile b/comms/trustedqsl/Makefile index 2d6896d61dac..76eccc183462 100644 --- a/comms/trustedqsl/Makefile +++ b/comms/trustedqsl/Makefile @@ -7,7 +7,7 @@ PORTNAME= trustedqsl PORTVERSION= 1.11 -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= trustedqsl DISTFILES= tqsllib-1.4.tar.gz TrustedQSL-1.11.tar.gz diff --git a/comms/twpsk/Makefile b/comms/twpsk/Makefile index 120bb7f53e05..8be7ad85a3a8 100644 --- a/comms/twpsk/Makefile +++ b/comms/twpsk/Makefile @@ -7,7 +7,7 @@ PORTNAME= twpsk PORTVERSION= 2.1 -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= http://www.ibiblio.org/pub/linux/apps/ham/ MAINTAINER= xride@x12.dk diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile index 46595a9e1ca9..64f3c6e2c43b 100644 --- a/comms/xastir/Makefile +++ b/comms/xastir/Makefile @@ -8,7 +8,7 @@ PORTNAME= xastir PORTVERSION= 1.7.0 PORTREVISION= 1 -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= xastir diff --git a/comms/xdx/Makefile b/comms/xdx/Makefile index 7942a8b403b8..1ed971701c0f 100644 --- a/comms/xdx/Makefile +++ b/comms/xdx/Makefile @@ -7,7 +7,7 @@ PORTNAME= xdx PORTVERSION= 1.2 PORTREVISION= 3 -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= http://www.qsl.net/pg4i/download/ \ ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= pav diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile index 361b7e6154d4..eb76881df8df 100644 --- a/comms/xlog/Makefile +++ b/comms/xlog/Makefile @@ -6,7 +6,7 @@ PORTNAME= xlog PORTVERSION= 1.3 -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= http://pg4i.mattsnetwork.co.uk/download/ \ http://www.qsl.net/pg4i/download/ diff --git a/comms/yagiuda/Makefile b/comms/yagiuda/Makefile index 878d76014531..5800bfb6fc10 100644 --- a/comms/yagiuda/Makefile +++ b/comms/yagiuda/Makefile @@ -6,7 +6,7 @@ PORTNAME= yagiuda PORTVERSION= 1.19 -CATEGORIES= comms +CATEGORIES= comms hamradio MASTER_SITES= http://www.g8wrb.org/yagi/ MAINTAINER= db@db.net diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile index 83190a56855e..64fd2b987fbd 100644 --- a/mail/ezmlm-idx/Makefile +++ b/mail/ezmlm-idx/Makefile @@ -7,7 +7,7 @@ PORTNAME= ezmlm-idx PORTVERSION= 0.40 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= mail MASTER_SITES= ftp://ftp.ezmlm.org/pub/patches/ \ ftp://gd.tuwien.ac.at/infosys/mail/qmail/ezmlm-patches/ \ @@ -22,13 +22,10 @@ PATCHFILES= ezmlm-cgi.patch MAINTAINER= sergei@FreeBSD.org COMMENT= Improved version of the ezmlm mailing list manager -RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail +USE_QMAIL_RUN= yes CONFLICTS= ezmlm-0.* -# QMAIL_DIR is the directory where qmail is installed -QMAIL_DIR?= /var/qmail - # LANGUAGE is the ISO code for the language to use in ezmlmrc LANGUAGE?= en_US @@ -91,7 +88,7 @@ post-patch: @${ECHO_CMD} ${EXTRACT_LIB} > ${WRKSRC}/sub_pgsql/conf-sqlld .endif @${ECHO_CMD} ${PREFIX}/man > ${WRKSRC}/conf-man - @${ECHO_CMD} ${QMAIL_DIR} > ${WRKSRC}/conf-qmail + @${ECHO_CMD} ${QMAIL_PREFIX} > ${WRKSRC}/conf-qmail @${REINPLACE_CMD} -e 's,/etc/ezmlm/,${PREFIX}/etc/ezmlm/,' \ ${WRKSRC}/idx.h diff --git a/mail/ezmlm/Makefile b/mail/ezmlm/Makefile index 81d90a8ff21c..84aed83d7e11 100644 --- a/mail/ezmlm/Makefile +++ b/mail/ezmlm/Makefile @@ -7,6 +7,7 @@ PORTNAME= ezmlm PORTVERSION= 0.53 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://cr.yp.to/software/ \ ftp://ftp.fu-berlin.de/unix/mail/qmail/ \ @@ -19,15 +20,12 @@ MASTER_SITES= http://cr.yp.to/software/ \ MAINTAINER= sergei@FreeBSD.org COMMENT= An easy-to-use, high-speed mailing list manager for qmail -RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail +USE_QMAIL_RUN= yes CONFLICTS= ezmlm-idx-* NO_PACKAGE= Unsure of DJB license -# QMAIL_DIR is the directory where qmail is installed -QMAIL_DIR?= /var/qmail - ALL_TARGET= it PROGRAMS= ezmlm-make ezmlm-manage ezmlm-send ezmlm-reject ezmlm-return \ @@ -43,7 +41,7 @@ post-patch: @${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc @${ECHO_CMD} ${CC} -s > ${WRKSRC}/conf-ld @${ECHO_CMD} ${PREFIX}/man > ${WRKSRC}/conf-man - @${ECHO_CMD} ${QMAIL_DIR} > ${WRKSRC}/conf-qmail + @${ECHO_CMD} ${QMAIL_PREFIX} > ${WRKSRC}/conf-qmail do-install: cd ${WRKSRC} && \ diff --git a/mail/mailfront/Makefile b/mail/mailfront/Makefile index 076b3a19411a..894389eef448 100644 --- a/mail/mailfront/Makefile +++ b/mail/mailfront/Makefile @@ -7,6 +7,7 @@ PORTNAME= mailfront PORTVERSION= 0.97 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://untroubled.org/${PORTNAME}/ \ ${MASTER_SITE_LOCAL} @@ -18,6 +19,7 @@ COMMENT= Mail server network protocol front-ends BUILD_DEPENDS= ${BGLIBS_LIB}/libbg.a:${PORTSDIR}/devel/bglibs \ ${CVM_LIB}/libcvm-v2client.a:${PORTSDIR}/security/cvm +WANT_QMAIL= yes USE_GPG= yes SIG_SUFFIX= .sig QMAIL_PREFIX?= /var/qmail diff --git a/mail/mess822/Makefile b/mail/mess822/Makefile index a163ee95fe8d..ff7273f4a5d3 100644 --- a/mail/mess822/Makefile +++ b/mail/mess822/Makefile @@ -7,6 +7,7 @@ PORTNAME= mess822 PORTVERSION= 0.58 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://cr.yp.to/software/ \ ftp://ftp.jp.qmail.org/qmail/ \ @@ -16,7 +17,7 @@ MASTER_SITES= http://cr.yp.to/software/ \ MAINTAINER= drs@rucus.ru.ac.za COMMENT= RFC 822 mail message parsing library and rewriting utilities -RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail +USE_QMAIL_RUN= yes NO_PACKAGE= Violates djb\'s license USE_REINPLACE= yes @@ -31,17 +32,11 @@ MAN3= mess822.3 mess822_addr.3 mess822_date.3 mess822_fold.3 \ MAN5= rewriting.5 MAN8= ofmipd.8 ofmipname.8 -.if exists(${PREFIX}/qmail/bin/qmail-send) -QMAIL_DIR?= ${PREFIX}/qmail -.else -QMAIL_DIR?= /var/qmail -.endif - NO_MTREE= yes post-patch: @${REINPLACE_CMD} -e "s|-O2|${CFLAGS}|" ${WRKSRC}/conf-cc - @${REINPLACE_CMD} -e "s|.var.qmail|${QMAIL_DIR}|" ${WRKSRC}/conf-qmail + @${REINPLACE_CMD} -e "s|.var.qmail|${QMAIL_PREFIX}|" ${WRKSRC}/conf-qmail @${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-home .include <bsd.port.mk> diff --git a/mail/qmHandle/Makefile b/mail/qmHandle/Makefile index 85f2e2a25258..26ae4608ef3e 100644 --- a/mail/qmHandle/Makefile +++ b/mail/qmHandle/Makefile @@ -7,7 +7,7 @@ PORTNAME= qmHandle PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= qmhandle @@ -16,18 +16,12 @@ DISTNAME= qmhandle-${PORTVERSION} MAINTAINER= petef@FreeBSD.org COMMENT= Tool to view and manage a qmail queue -RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-qstat:${PORTSDIR}/mail/qmail +USE_QMAIL_RUN= yes NO_WRKSUBDIR= yes NO_BUILD= yes USE_PERL5= yes -.if exists(${LOCALBASE}/qmail/bin/qmail-qstat) -QMAIL_DIR?= ${LOCALBASE}/qmail -.else -QMAIL_DIR?= /var/qmail -.endif - .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500601 diff --git a/mail/qmail-activedir/Makefile b/mail/qmail-activedir/Makefile index e745e6b1f980..21a43af819e0 100644 --- a/mail/qmail-activedir/Makefile +++ b/mail/qmail-activedir/Makefile @@ -7,20 +7,18 @@ PORTNAME= qmail-activedir PORTVERSION= 0.15 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://fo2k.com/qmail-activedir/ MAINTAINER= jmelo@freebsdbrasil.com.br COMMENT= Programs to allow qmail to authenticate users through a MS ad -BUILD_DEPENDS= ${QMAIL_PREFIX}/bin/qmail-send:${PORTSDIR}/mail/qmail -RUN_DEPENDS= ${BUILD_DEPENDS} - +USE_QMAIL_RUN= yes SUB_FILES= pkg-message SUB_LIST+= QMAIL_PREFIX=${QMAIL_PREFIX} USE_OPENLDAP= yes USE_REINPLACE= yes -QMAIL_PREFIX?= /var/qmail BINARIES= checkadpassword qmail-adgetpw create_alias_files diff --git a/mail/qmail-conf/Makefile b/mail/qmail-conf/Makefile index 14ddb969b307..93bf63a5c39c 100644 --- a/mail/qmail-conf/Makefile +++ b/mail/qmail-conf/Makefile @@ -7,7 +7,7 @@ PORTNAME= qmail-conf PORTVERSION= 0.60 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://www.din.or.jp/~ushijima/qmail-conf/ \ http://cr.yp.to/djbdns/ @@ -18,14 +18,14 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= roam@FreeBSD.org COMMENT= Configure various qmail services to run under daemontools +WANT_QMAIL= yes + ALL_TARGET= it INSTALL_TARGET= setup check NO_PACKAGE= "borrows code from djbdns, thus falls under the same restrictions as dns/djbdns" -# Note: this MUST be the same as the directory qmail is installed in! -QMAIL_DIR?= /var/qmail -PREFIX?= ${QMAIL_DIR} +PREFIX?= ${QMAIL_PREFIX} NO_MTREE= yes @@ -33,11 +33,13 @@ DJBDNS_VER= 1.05 DJBDNS_NAME= djbdns-${DJBDNS_VER} DJBDNS_DIST= ${DJBDNS_NAME}${EXTRACT_SUFX} +.include <bsd.port.pre.mk> + post-extract: @(cd ${WRKSRC} && ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${DISTDIR}/${DJBDNS_DIST} ${EXTRACT_AFTER_ARGS}) post-patch: - @${ECHO_CMD} "${QMAIL_DIR}" > ${WRKSRC}/conf-qmail + @${ECHO_CMD} "${QMAIL_PREFIX}" > ${WRKSRC}/conf-qmail @${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc @${ECHO_CMD} "${CC} ${CFLAGS} ${STRIP}" > ${WRKSRC}/conf-ld @${ECHO_CMD} "${LOCALBASE}" > ${WRKSRC}/conf-ucspi-tcp @@ -45,4 +47,4 @@ post-patch: pre-build: @(cd ${WRKSRC} && ${MAKE} djbdns=${DJBDNS_NAME} -f Makefile.ini) -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/mail/qmail-contrib/Makefile b/mail/qmail-contrib/Makefile index f5a3dd507aa3..97d77813f0a1 100644 --- a/mail/qmail-contrib/Makefile +++ b/mail/qmail-contrib/Makefile @@ -7,6 +7,7 @@ PORTNAME= qmail-contrib PORTVERSION= 0.1 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= ftp://ftp.qmail.org/pub/software/ \ ftp://rucus.ru.ac.za/pub/mail/qmail/src/ @@ -16,7 +17,7 @@ DISTFILES= dot-forward-${DF_VER}.tar.gz \ MAINTAINER= garga@FreeBSD.org COMMENT= Contributed programs for qmail -RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail +USE_QMAIL_RUN= yes NO_PACKAGE= Unsure of djb\'s license @@ -28,19 +29,7 @@ MAN1+= newaliases.1 printmaillist.1 setmaillist.1 newinclude.1 PLIST_SUB= DOCDIR=${DOCDIR} -.if exists(${PREFIX}/qmail/bin/qmail-send) -QMAIL_DIR?= ${PREFIX}/qmail -PREFIX?= ${PREFIX}/qmail -.else -QMAIL_DIR?= /var/qmail -PREFIX?= /var/qmail -.endif - -.if (${PREFIX} == ${LOCALBASE}) -DOCDIR= share/doc/qmail -.else -DOCDIR= doc -.endif +PREFIX?= ${QMAIL_PREFIX} FF_VER= 0.51 DF_VER= 0.71 @@ -53,12 +42,19 @@ NO_MTREE= yes USE_REINPLACE= yes +.include <bsd.port.pre.mk> + +.if (${PREFIX} == ${LOCALBASE}) +DOCDIR= share/doc/qmail +.else +DOCDIR= doc +.endif + pre-patch: @cd ${WRKFF} \ && ${PATCH} -s <${PATCHDIR}/extra-patch-newaliases post-patch: - @${REINPLACE_CMD} -e "s|-O2|${CFLAGS}|" ${WRKFF}/conf-cc @${REINPLACE_CMD} -e "s|.var.qmail|${QMAIL_DIR}|" ${WRKFF}/conf-qmail @${REINPLACE_CMD} -e '/cat/d' ${WRKFF}/hier.c @${REINPLACE_CMD} -e "s|-O2|${CFLAGS}|" ${WRKDF}/conf-cc @@ -77,4 +73,4 @@ do-install: @cd ${WRKDIR}/fastforward-${FF_VER} \ && make ${INSTALL_TARGET} -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile index 76c695e8d47e..9aa8e5667502 100644 --- a/mail/qmail-ldap/Makefile +++ b/mail/qmail-ldap/Makefile @@ -7,7 +7,7 @@ PORTNAME= qmail PORTVERSION= ${QMAIL_VERSION}.${LDAP_PATCH_DATE} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail PKGNAMESUFFIX= -ldap diff --git a/mail/qmail-mysql/Makefile b/mail/qmail-mysql/Makefile index 923ba468d284..464630cd474f 100644 --- a/mail/qmail-mysql/Makefile +++ b/mail/qmail-mysql/Makefile @@ -7,7 +7,7 @@ PORTNAME= qmail PORTVERSION= ${QMAIL_VERSION}.${MYSQL_PATCH_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= mail PKGNAMESUFFIX= -mysql diff --git a/mail/qmail-rblchk/Makefile b/mail/qmail-rblchk/Makefile index 2cb8b6766034..f348b05436da 100644 --- a/mail/qmail-rblchk/Makefile +++ b/mail/qmail-rblchk/Makefile @@ -13,14 +13,13 @@ MASTER_SITES= http://morettoni.net/qmail/ MAINTAINER= ehaupt@FreeBSD.org COMMENT= A qmail RBL filter -RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail +USE_QMAIL_RUN= yes LDFLAGS?= -s CFLAGS?= -O2 -Wimplicit -Wunused -Wcomment -Wchar-subscripts -Wuninitialized \ -Wshadow -Wcast-qual -Wcast-align -Wwrite-strings WRKSRC= ${WRKDIR}/${PORTNAME} -QMAIL_DIR?= /var/qmail ALL_TARGET= default INSTALL_TARGET= setup diff --git a/mail/qmail-scanner/Makefile b/mail/qmail-scanner/Makefile index 3ce416e540a2..caf6915735ca 100644 --- a/mail/qmail-scanner/Makefile +++ b/mail/qmail-scanner/Makefile @@ -7,7 +7,7 @@ PORTNAME= qmail-scanner PORTVERSION= 1.25 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -17,14 +17,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= freebsd@simplerezo.com COMMENT= Content/Anti-virus Scanner for qmail -BUILD_DEPENDS= ${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail \ - reformime:${PORTSDIR}/mail/maildrop \ +BUILD_DEPENDS= reformime:${PORTSDIR}/mail/maildrop \ ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes -# A normal qmail installation puts everything into /var/qmail/. -# Must match your qmail installation -QMAIL_DIR?= /var/qmail -QMAIL_QUEUE= ${QMAIL_DIR}/bin/qmail-queue +QMAIL_QUEUE= ${QMAIL_PREFIX}/bin/qmail-queue USE_PERL5= yes NO_BUILD= yes @@ -79,12 +75,14 @@ CONFIGURE_ARGS+= --spams-tosuffix "${QMAILSCAN_SPAMSTOSUFFIX}" RUN_DEPENDS= ${BUILD_DEPENDS} +USE_QMAIL= yes + SPOOLDIR= ${PREFIX}/qmailscan PLIST_SUB= SPOOLDIR="${SPOOLDIR:S,${PREFIX}/,,}" HAS_CONFIGURE= yes CONFIGURE_ARGS+= \ - --qmaildir "${QMAIL_DIR}" --spooldir "${SPOOLDIR}" \ + --qmaildir "${QMAIL_PREFIX}" --spooldir "${SPOOLDIR}" \ --bindir "${PREFIX}/bin" --qmail-queue-binary "${QMAIL_QUEUE}" \ --admin "${QMAILSCAN_ADMIN}" --notify "${QMAILSCAN_NOTIFY}" \ --silent-viruses "${QMAILSCAN_SILENTVIRUSES}" \ @@ -137,7 +135,7 @@ pre-configure: @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL @if ! ${TEST} -f ${QMAIL_QUEUE}; then \ ${ECHO_MSG} "Unable to found qmail-queue binary trying '${QMAIL_QUEUE}'."; \ - ${ECHO_MSG} "Please set QMAIL_DIR to your qmail installation directory !"; \ + ${ECHO_MSG} "Please set QMAIL_PREFIX to your qmail installation directory !"; \ exit 1; \ fi diff --git a/mail/qmail-scanner/pkg-plist b/mail/qmail-scanner/pkg-plist index 4eaf88befb04..f7e3018df384 100644 --- a/mail/qmail-scanner/pkg-plist +++ b/mail/qmail-scanner/pkg-plist @@ -2,16 +2,22 @@ bin/qmail-scanner-queue.pl bin/qs2mrtg.pl share/examples/qs2mrtg/mrtg-qmail-scanner.cfg +@dirrm share/examples/qs2mrtg +@unexec if cmp -s %D/%%SPOOLDIR%%/quarantine-attachments.txt %D/%%SPOOLDIR%%/quarantine-attachments.sample; then rm -f %D/%%SPOOLDIR%%/quarantine-attachments.txt && rm -f %D/%%SPOOLDIR%%/quarantine-attachments.db; fi %%SPOOLDIR%%/quarantine-attachments.sample -@unexec if cmp -s %%SPOOLDIR%%/quarantine-attachments.txt %%SPOOLDIR%%/quarantine-attachments.sample; then rm -f %%SPOOLDIR%%/quarantine-attachments.txt; fi -@unexec rmdir share/examples/qs2mrtg 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/archives/cur 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/archives/new 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/archives/tmp 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/archives 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/quarantine/cur 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/quarantine/new 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/quarantine/tmp 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/quarantine 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/tmp 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%% 2>/dev/null || true +@exec [ ! -f %D/%%SPOOLDIR%%/quarantine-attachments.txt ] && cp %D/%%SPOOLDIR%%/quarantine-attachments.sample %D/%%SPOOLDIR%%/quarantine-attachments.txt +%%SPOOLDIR%%/qmail-scanner-queue-version.txt +@unexec rmdir %D/%%SPOOLDIR%%/archives/cur 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/archives/new 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/archives/tmp 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/archives 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/quarantine/cur 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/quarantine/new 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/quarantine/tmp 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/quarantine 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/working/cur 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/working/new 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/working/tmp 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/working 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/tmp 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%% 2>/dev/null || true diff --git a/mail/qmail-scanner1/Makefile b/mail/qmail-scanner1/Makefile index 3ce416e540a2..caf6915735ca 100644 --- a/mail/qmail-scanner1/Makefile +++ b/mail/qmail-scanner1/Makefile @@ -7,7 +7,7 @@ PORTNAME= qmail-scanner PORTVERSION= 1.25 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -17,14 +17,10 @@ EXTRACT_SUFX= .tgz MAINTAINER= freebsd@simplerezo.com COMMENT= Content/Anti-virus Scanner for qmail -BUILD_DEPENDS= ${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail \ - reformime:${PORTSDIR}/mail/maildrop \ +BUILD_DEPENDS= reformime:${PORTSDIR}/mail/maildrop \ ${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes -# A normal qmail installation puts everything into /var/qmail/. -# Must match your qmail installation -QMAIL_DIR?= /var/qmail -QMAIL_QUEUE= ${QMAIL_DIR}/bin/qmail-queue +QMAIL_QUEUE= ${QMAIL_PREFIX}/bin/qmail-queue USE_PERL5= yes NO_BUILD= yes @@ -79,12 +75,14 @@ CONFIGURE_ARGS+= --spams-tosuffix "${QMAILSCAN_SPAMSTOSUFFIX}" RUN_DEPENDS= ${BUILD_DEPENDS} +USE_QMAIL= yes + SPOOLDIR= ${PREFIX}/qmailscan PLIST_SUB= SPOOLDIR="${SPOOLDIR:S,${PREFIX}/,,}" HAS_CONFIGURE= yes CONFIGURE_ARGS+= \ - --qmaildir "${QMAIL_DIR}" --spooldir "${SPOOLDIR}" \ + --qmaildir "${QMAIL_PREFIX}" --spooldir "${SPOOLDIR}" \ --bindir "${PREFIX}/bin" --qmail-queue-binary "${QMAIL_QUEUE}" \ --admin "${QMAILSCAN_ADMIN}" --notify "${QMAILSCAN_NOTIFY}" \ --silent-viruses "${QMAILSCAN_SILENTVIRUSES}" \ @@ -137,7 +135,7 @@ pre-configure: @PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL @if ! ${TEST} -f ${QMAIL_QUEUE}; then \ ${ECHO_MSG} "Unable to found qmail-queue binary trying '${QMAIL_QUEUE}'."; \ - ${ECHO_MSG} "Please set QMAIL_DIR to your qmail installation directory !"; \ + ${ECHO_MSG} "Please set QMAIL_PREFIX to your qmail installation directory !"; \ exit 1; \ fi diff --git a/mail/qmail-scanner1/pkg-plist b/mail/qmail-scanner1/pkg-plist index 4eaf88befb04..f7e3018df384 100644 --- a/mail/qmail-scanner1/pkg-plist +++ b/mail/qmail-scanner1/pkg-plist @@ -2,16 +2,22 @@ bin/qmail-scanner-queue.pl bin/qs2mrtg.pl share/examples/qs2mrtg/mrtg-qmail-scanner.cfg +@dirrm share/examples/qs2mrtg +@unexec if cmp -s %D/%%SPOOLDIR%%/quarantine-attachments.txt %D/%%SPOOLDIR%%/quarantine-attachments.sample; then rm -f %D/%%SPOOLDIR%%/quarantine-attachments.txt && rm -f %D/%%SPOOLDIR%%/quarantine-attachments.db; fi %%SPOOLDIR%%/quarantine-attachments.sample -@unexec if cmp -s %%SPOOLDIR%%/quarantine-attachments.txt %%SPOOLDIR%%/quarantine-attachments.sample; then rm -f %%SPOOLDIR%%/quarantine-attachments.txt; fi -@unexec rmdir share/examples/qs2mrtg 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/archives/cur 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/archives/new 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/archives/tmp 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/archives 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/quarantine/cur 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/quarantine/new 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/quarantine/tmp 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/quarantine 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%%/tmp 2>/dev/null || true -@unexec rmdir %%SPOOLDIR%% 2>/dev/null || true +@exec [ ! -f %D/%%SPOOLDIR%%/quarantine-attachments.txt ] && cp %D/%%SPOOLDIR%%/quarantine-attachments.sample %D/%%SPOOLDIR%%/quarantine-attachments.txt +%%SPOOLDIR%%/qmail-scanner-queue-version.txt +@unexec rmdir %D/%%SPOOLDIR%%/archives/cur 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/archives/new 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/archives/tmp 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/archives 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/quarantine/cur 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/quarantine/new 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/quarantine/tmp 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/quarantine 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/working/cur 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/working/new 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/working/tmp 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/working 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%%/tmp 2>/dev/null || true +@unexec rmdir %D/%%SPOOLDIR%% 2>/dev/null || true diff --git a/mail/qmail-spamcontrol/Makefile b/mail/qmail-spamcontrol/Makefile index 9f2dd84faae8..0f73edf1d773 100644 --- a/mail/qmail-spamcontrol/Makefile +++ b/mail/qmail-spamcontrol/Makefile @@ -7,7 +7,7 @@ PORTNAME= qmail PORTVERSION= ${QMAIL_VERSION}.${SPAMCONTROL_VERSION} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES+= http://www.fehcom.de/qmail/spamcontrol/:spamcontrol PKGNAMESUFFIX= -spamcontrol diff --git a/mail/qmail-tls/Makefile b/mail/qmail-tls/Makefile index dbcd08dbb7ce..69e60da536d4 100644 --- a/mail/qmail-tls/Makefile +++ b/mail/qmail-tls/Makefile @@ -7,7 +7,7 @@ PORTNAME= qmail PORTVERSION= ${QMAIL_VERSION}.${TLS_PATCH_DATE} -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= mail PKGNAMESUFFIX= -tls diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 55ac1bd239e9..0fa4474078d3 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -7,7 +7,7 @@ PORTNAME= qmail PORTVERSION?= ${QMAIL_VERSION} -PORTREVISION?= 4 +PORTREVISION?= 5 CATEGORIES= mail MASTER_SITES+= ${MASTER_SITE_QMAIL} DISTNAME= ${PORTNAME}-${QMAIL_VERSION} @@ -98,10 +98,7 @@ PATCH_SITE_SUBDIR+= garga/qmail/:dns,sendmail_flagf,rfc2821,ldap,mysql,tls,quota NO_PACKAGE= "djb\'s packaging license does not allow non-standard \ qmail binary distributions" -# A normal qmail installation puts everything into /var/qmail/. -# If you want to install to /usr/local/, then "/usr/local/qmail" is -# suggested instead of "/usr/local", but both will work. -PREFIX?= /var/qmail +PREFIX?= ${QMAIL_PREFIX} QMAIL_VERSION?= 1.03 .if !defined(BARRIER_SMTP_AUTH_PATCH) @@ -198,6 +195,10 @@ MAN8+= qmail-local.8 qmail-lspawn.8 qmail-getpw.8 qmail-remote.8 \ qmail-tcpto.8 qmail-pop3d.8 qmail-popup.8 qmail-qmqpc.8 qmail-qmqpd.8 \ qmail-qmtpd.8 qmail-smtpd.8 qmail-command.8 +.if defined(SLAVE_MYSQL) +PKGMESSAGE_SUFFIX= mysql +.endif + .if defined(SLAVE_SPAMCONTROL) EXTRA_MAN8= qmail-badloadertypes.8 qmail-badmimetypes.8 qmail-recipients.8 ALL_TARGET+= ${EXTRA_MAN8} @@ -211,7 +212,7 @@ PLIST_SUB+= README_AUTH="@comment " .endif .if defined(SLAVE_LDAP) -PKGMESSAGE_SUFFIX= -ldap +PKGMESSAGE_SUFFIX= ldap PLIST_SUB+= LDAP="" NOT_LDAP="@comment " .else PLIST_SUB+= LDAP="@comment " NOT_LDAP="" @@ -224,16 +225,27 @@ PLIST_SUB+= SPAMCONTROL="@comment " .endif .if defined(SLAVE_TLS) -PKGMESSAGE_SUFFIX= -tls +PKGMESSAGE_SUFFIX= tls PLIST_SUB+= TLS="" .else PLIST_SUB+= TLS="@comment " .endif -SUB_FILES+= pkg-message${PKGMESSAGE_SUFFIX} mailer.conf.sample \ - bootfiles.sed enable-qmail +.if defined(PKGMESSAGE_SUFFIX) +SLAVEPORT_LINE= ${PKGMESSAGE_SUFFIX} +.elif defined(SLAVE_SPAMCONTROL) +SLAVEPORT_LINE= spamcontrol +.endif + +SUB_FILES+= mailer.conf.sample bootfiles.sed enable-qmail PKGINSTALL?= ${WRKDIR}/pkg-install -PKGMESSAGE?= ${WRKDIR}/pkg-message${PKGMESSAGE_SUFFIX} + +.if defined(PKGMESSAGE_SUFFIX) +SUB_FILES+= pkg-message-${PKGMESSAGE_SUFFIX} +PKGMESSAGE?= ${WRKDIR}/pkg-message-${PKGMESSAGE_SUFFIX} +.else +SUB_FILES+= pkg-message +.endif CSH?= /bin/csh @@ -291,6 +303,8 @@ CONFIGUREPROGS= ${WRKSRC}/install ${WRKSRC}/dnsfq ${WRKSRC}/hostname \ ${WRKSRC}/dnsip ${WRKSRC}/ipmeprint ${WRKSRC}/dnsptr CONFIGUREFILES= ${WRKSRC}/config ${WRKSRC}/config-fast +.include "${.CURDIR}/../../Mk/bsd.mail.mk" + .if (${PREFIX} != ${LOCALBASE}) DOCSDIR= ${PREFIX}/doc .endif @@ -308,10 +322,8 @@ CFLAGS+= -DDEBUG .endif .if defined(SLAVE_LDAP) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}2 .if !defined(WITHOUT_TLS) -PKGNAMESUFFIX:= ${PKGNAMESUFFIX}-with_tls # we can't use USE_OPENSSL=yes after including bsd.port.pre.mk .include "${PORTSDIR}/Mk/bsd.openssl.mk" .endif @@ -469,6 +481,18 @@ pre-everything:: @${ECHO_MSG} "" .endif +.if !defined(QMAIL_PREFIX) + @${ECHO_MSG} "QMAIL_PREFIX=PREFIX_PATH" + @${ECHO_MSG} " (default PREFIX_PATH=${PREFIX})" + @${ECHO_MSG} " A normal qmail installation puts" + @${ECHO_MSG} " everything into /var/qmail/." + @${ECHO_MSG} " If you want to install to ${LOCALBASE}," + @${ECHO_MSG} " then \"${LOCALBASE}/qmail\" is suggested" + @${ECHO_MSG} " instead of \"${LOCALBASE}\", but both will" + @${ECHO_MSG} " work." + @${ECHO_MSG} "" +.endif + post-extract: .if defined(SLAVE_SPAMCONTROL) @cd ${WRKSRC} && ${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/${SPAMCONTROL_DIST} @@ -596,6 +620,17 @@ do-install: @${ECHO_CMD} @${CAT} ${PKGMESSAGE} @${ECHO_CMD} +.if defined(SLAVEPORT_LINE) + @${ECHO_CMD} "=============================================" + @${ECHO_CMD} + @${ECHO_CMD} "ATTENTION" + @${ECHO_CMD} + @${ECHO_CMD} "Add the following line to your /etc/make.conf" + @${ECHO_CMD} "QMAIL_SLAVEPORT=${SLAVEPORT_LINE}" + @${ECHO_CMD} + @${ECHO_CMD} "=============================================" + @${ECHO_CMD} +.endif certificate: .if defined(SLAVE_TLS) || defined(SLAVE_LDAP) diff --git a/mail/qmailadmin-devel/Makefile b/mail/qmailadmin-devel/Makefile index 49f61b707c86..2a476e5d3594 100644 --- a/mail/qmailadmin-devel/Makefile +++ b/mail/qmailadmin-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= qmailadmin PORTVERSION= 1.2.7 +PORTREVISION= 1 CATEGORIES= mail www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,11 +17,9 @@ MAINTAINER= ale@FreeBSD.org COMMENT= CGI program for administering Qmail with vchkpw/vpopmail BUILD_DEPENDS= \ - ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \ autorespond:${PORTSDIR}/mail/autorespond \ ${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail-devel RUN_DEPENDS= \ - ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \ autorespond:${PORTSDIR}/mail/autorespond \ ${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail-devel @@ -36,6 +35,7 @@ CONFLICTS= qmailadmin-1.* GNU_CONFIGURE= YES USE_GMAKE= YES +WANT_QMAIL= yes # # User-configurable variables @@ -73,20 +73,10 @@ PLIST_SUB+= CGIBINDIR="${CGIBINDIR}" CGIBINSUBDIR="${CGIBINSUBDIR}" \ .include <bsd.port.pre.mk> -# -# QMAIL_DIR - location of qmail directory -# - -.if exists(${LOCALBASE}/qmail/bin/qmail-send) -QMAIL_DIR?= ${LOCALBASE}/qmail -.else -QMAIL_DIR?= /var/qmail -.endif - # End of user-configurable variables CONFIGURE_ARGS+= \ - --enable-qmaildir=${QMAIL_DIR} \ + --enable-qmaildir=${QMAIL_PREFIX} \ --enable-htmldir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \ --enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR}/images \ --enable-imageurl=${WEBDATAURL}/${WEBDATASUBDIR}/images \ diff --git a/mail/qmailadmin/Makefile b/mail/qmailadmin/Makefile index 61f4ae68916b..10ca858ae3fc 100644 --- a/mail/qmailadmin/Makefile +++ b/mail/qmailadmin/Makefile @@ -7,7 +7,7 @@ PORTNAME= qmailadmin PORTVERSION= 1.2.7 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= mail www MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -43,6 +43,7 @@ CONFLICTS= qmailadmin-devel-1.* GNU_CONFIGURE= YES USE_GMAKE= YES +WANT_QMAIL= yes # # User-configurable variables @@ -81,20 +82,10 @@ PLIST_SUB+= CGIBINDIR="${CGIBINDIR}" CGIBINSUBDIR="${CGIBINSUBDIR}" \ .include <bsd.port.pre.mk> -# -# QMAIL_DIR - location of qmail directory -# - -.if exists(${LOCALBASE}/qmail/bin/qmail-send) -QMAIL_DIR?= ${LOCALBASE}/qmail -.else -QMAIL_DIR?= /var/qmail -.endif - # End of user-configurable variables CONFIGURE_ARGS+= \ - --enable-qmaildir=${QMAIL_DIR} \ + --enable-qmaildir=${QMAIL_PREFIX} \ --enable-htmldir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR} \ --enable-imagedir=${PREFIX}/${WEBDATADIR}/${WEBDATASUBDIR}/images \ --enable-imageurl=${WEBDATAURL}/${WEBDATASUBDIR}/images \ diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile index 6fc29071352a..d2b0b233c28c 100644 --- a/mail/qmailanalog/Makefile +++ b/mail/qmailanalog/Makefile @@ -7,14 +7,14 @@ PORTNAME= qmailanalog PORTVERSION= 0.70 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://cr.yp.to/software/ MAINTAINER= garga@FreeBSD.org COMMENT= A collection of tools to analyze qmail-send's activity -RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail +USE_QMAIL_RUN= yes ALL_TARGET= it INSTALL_TARGET= setup @@ -24,19 +24,13 @@ MAN1= matchup.1 xqp.1 xsender.1 xrecipient.1 columnt.1 PLIST_SUB+= MYSUBDIR=${MYSUBDIR} -.if exists(${PREFIX}/qmail/bin/qmail-send) -QMAIL_DIR?= ${PREFIX}/qmail -.else -QMAIL_DIR?= /var/qmail -.endif - .if !defined(NOSUBDIR) MYSUBDIR?= qmailanalog/ .else MYSUBDIR?= .endif -PREFIX?= ${QMAIL_DIR} +PREFIX?= ${QMAIL_PREFIX} QMPREFIX?= ${PREFIX}/${MYSUBDIR} NO_MTREE= yes @@ -44,8 +38,8 @@ USE_REINPLACE= yes .include <bsd.port.pre.mk> -.if ${PREFIX} != ${QMAIL_DIR} -BROKEN= "Cannot Make and Install with different PREFIX or QMAIL_DIR" +.if ${PREFIX} != ${QMAIL_PREFIX} +BROKEN= "Cannot Make and Install with different PREFIX or QMAIL_PREFIX" .endif post-patch: diff --git a/mail/qmailmrtg7/Makefile b/mail/qmailmrtg7/Makefile index d66de2663568..21f098a14111 100644 --- a/mail/qmailmrtg7/Makefile +++ b/mail/qmailmrtg7/Makefile @@ -7,29 +7,23 @@ PORTNAME= qmailmrtg7 PORTVERSION= 4.2 +PORTREVISION= 1 CATEGORIES= mail net-mgmt MASTER_SITES= http://www.inter7.com/qmailmrtg7/ MAINTAINER= ale@FreeBSD.org COMMENT= A program to create mrtg graphs for qmail activity -BUILD_DEPENDS= ${QMAIL_DIR}/bin/qmail-queue:${PORTSDIR}/mail/qmail -RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-queue:${PORTSDIR}/mail/qmail \ - mrtg:${PORTSDIR}/net-mgmt/mrtg +RUN_DEPENDS= mrtg:${PORTSDIR}/net-mgmt/mrtg +USE_QMAIL= yes USE_REINPLACE= yes .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/qmail/bin/qmail-queue) -QMAIL_DIR?= ${LOCALBASE}/qmail -.else -QMAIL_DIR?= /var/qmail -.endif - post-patch: @${REINPLACE_CMD} "s|cc|${CC}|g;s|-s -O|${CFLAGS}|g" ${WRKSRC}/Makefile - @${REINPLACE_CMD} "s|/usr/local|${PREFIX}|g;s|/var/qmail|${QMAIL_DIR}|g" \ + @${REINPLACE_CMD} "s|/usr/local|${PREFIX}|g;s|/var/qmail|${QMAIL_PREFIX}|g" \ ${WRKSRC}/checkq.c ${WRKSRC}/qmail.mrtg.cfg do-install: diff --git a/mail/qmhandle/Makefile b/mail/qmhandle/Makefile index 85f2e2a25258..26ae4608ef3e 100644 --- a/mail/qmhandle/Makefile +++ b/mail/qmhandle/Makefile @@ -7,7 +7,7 @@ PORTNAME= qmHandle PORTVERSION= 1.2.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= qmhandle @@ -16,18 +16,12 @@ DISTNAME= qmhandle-${PORTVERSION} MAINTAINER= petef@FreeBSD.org COMMENT= Tool to view and manage a qmail queue -RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-qstat:${PORTSDIR}/mail/qmail +USE_QMAIL_RUN= yes NO_WRKSUBDIR= yes NO_BUILD= yes USE_PERL5= yes -.if exists(${LOCALBASE}/qmail/bin/qmail-qstat) -QMAIL_DIR?= ${LOCALBASE}/qmail -.else -QMAIL_DIR?= /var/qmail -.endif - .include <bsd.port.pre.mk> .if ${PERL_LEVEL} < 500601 diff --git a/mail/qscan/Makefile b/mail/qscan/Makefile index 0cbcabf95c0b..7245986c1e72 100644 --- a/mail/qscan/Makefile +++ b/mail/qscan/Makefile @@ -7,28 +7,24 @@ PORTNAME= qscan PORTVERSION= 1.5 +PORTREVISION= 1 CATEGORIES= mail security MASTER_SITES= ftp://ftp.c9x.org/qscan/ MAINTAINER= ale@FreeBSD.org COMMENT= A mail filter for Qmail that scans messages with ClamAV -RUN_DEPENDS= ${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail \ - clamdscan:${PORTSDIR}/security/clamav \ +RUN_DEPENDS= clamdscan:${PORTSDIR}/security/clamav \ ripmime:${PORTSDIR}/mail/ripmime +USE_QMAIL_RUN= yes GNU_CONFIGURE= yes USE_REINPLACE= yes .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/qmail/bin/qmail-queue) -QMAIL_DIR?= ${LOCALBASE}/qmail -.else -QMAIL_DIR?= /var/qmail -.endif -QMAIL_QUEUE= ${QMAIL_DIR}/bin/qmail-queue -QSCAN_VAR?= ${QMAIL_DIR}/${PORTNAME} +QMAIL_QUEUE= ${QMAIL_PREFIX}/bin/qmail-queue +QSCAN_VAR?= ${QMAIL_PREFIX}/${PORTNAME} PLIST_SUB+= QSCAN_VAR="${QSCAN_VAR}" \ QMAIL_QUEUE="${QMAIL_QUEUE}" diff --git a/mail/qsheff/Makefile b/mail/qsheff/Makefile index 24cf4cfced35..5a00cd4f8d0d 100644 --- a/mail/qsheff/Makefile +++ b/mail/qsheff/Makefile @@ -7,6 +7,7 @@ PORTNAME= qsheff PORTVERSION= 1.0.r4 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.enderunix.org/ \ ${MASTER_SITE_SOURCEFORGE} @@ -16,9 +17,9 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/-r/} MAINTAINER= ports@FreeBSD.org COMMENT= A qmail-queue replacement to filter mail traffic -BUILD_DEPENDS= ${QMAIL_DIR}/bin/qmail-queue:${PORTSDIR}/mail/qmail \ - ${LOCALBASE}/bin/ripmime:${PORTSDIR}/mail/ripmime +BUILD_DEPENDS= ${LOCALBASE}/bin/ripmime:${PORTSDIR}/mail/ripmime RUN_DEPENDS= ${BUILD_DEPENDS} +USE_QMAIL= yes USE_REINPLACE= YES GNU_CONFIGURE= YES @@ -29,13 +30,7 @@ PORTDOCS= spamass-qsheff.en.html README COPYING AUTHORS ChangeLog \ OPTIONS= CLAMAV "Integrate with Clam AntiVirus" on -.if exists(${LOCALBASE}/qmail/bin/qmail-queue) -QMAIL_DIR?= ${LOCALBASE}/qmail -.else -QMAIL_DIR?= /var/qmail -.endif - -CONFIGURE_ARGS+= --with-qmaildir=${QMAIL_DIR} +CONFIGURE_ARGS+= --with-qmaildir=${QMAIL_PREFIX} .include <bsd.port.pre.mk> diff --git a/mail/qtools/Makefile b/mail/qtools/Makefile index 9dc33ceb6193..171e9a5433ef 100644 --- a/mail/qtools/Makefile +++ b/mail/qtools/Makefile @@ -7,27 +7,32 @@ PORTNAME= qtools PORTVERSION= 0.56 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://www.superscript.com/qtools/ MAINTAINER= sergei@FreeBSD.org COMMENT= Tools to use in .qmail files -RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \ - ${EZMLM_DIR}/bin/ezmlm-weed:${PORTSDIR}/mail/ezmlm +RUN_DEPENDS= ${EZMLM_DIR}/bin/ezmlm-weed:${PORTSDIR}/mail/ezmlm + +WANT_QMAIL= yes ALL_TARGET= it INSTALL_TARGET= setup check -QMAIL_DIR?= /var/qmail EZMLM_DIR?= ${LOCALBASE} +USE_REINPLACE= yes + +post-patch: + @${REINPLACE_CMD} -e 's|02755|0755|g' ${WRKSRC}/hier.c + do-configure: @${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc @${ECHO_CMD} "${CC} ${STRIP}" > ${WRKSRC}/conf-ld @${ECHO_CMD} "${PREFIX}" > ${WRKSRC}/conf-home - @${ECHO_CMD} "${QMAIL_DIR}" > ${WRKSRC}/conf-qmail + @${ECHO_CMD} "${QMAIL_PREFIX}" > ${WRKSRC}/conf-qmail @${ECHO_CMD} "${EZMLM_DIR}/bin/ezmlm" > ${WRKSRC}/conf-ezmlm .include <bsd.port.mk> diff --git a/mail/queue-fix/Makefile b/mail/queue-fix/Makefile index c58dfaaf7e6f..ccee49575a4b 100644 --- a/mail/queue-fix/Makefile +++ b/mail/queue-fix/Makefile @@ -7,16 +7,16 @@ PORTNAME= queue-fix PORTVERSION= 1.4 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.netmeridian.com/e-huss/ MAINTAINER= garga@FreeBSD.org COMMENT= Repairs or generates a qmail queue structure -RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail +USE_QMAIL_RUN= yes -QMAIL_DIR?= /var/qmail -PREFIX?= ${QMAIL_DIR} +PREFIX?= ${QMAIL_PREFIX} OPTIONS= BIG_TODO "Use big_todo patch" off @@ -31,14 +31,14 @@ PLIST_FILES+= %%DOCDIR%%/README PLIST_DIRS+= %%DOCDIR%% .endif +.include <bsd.port.pre.mk> + .if (${PREFIX} == ${LOCALBASE}) DOCDIR= share/doc/qmail/queue-fix .else DOCDIR= doc/queue-fix .endif -.include <bsd.port.pre.mk> - .if defined(WITH_BIG_TODO) PATCH_SITES+= http://www.qmail.org/ PATCHFILES+= queue-fix-todo.patch diff --git a/mail/queue-repair/Makefile b/mail/queue-repair/Makefile index 1b7ee01ef942..b070c43f7e36 100644 --- a/mail/queue-repair/Makefile +++ b/mail/queue-repair/Makefile @@ -7,6 +7,7 @@ PORTNAME= queue-repair PORTVERSION= 0.9.0 +PORTREVISION= 1 CATEGORIES= mail python MASTER_SITES= http://pyropus.ca/software/${PORTNAME}/ @@ -14,8 +15,7 @@ MAINTAINER= sergei@FreeBSD.org COMMENT= A qmail queue diagnostic and repair tool .if !defined(WITHOUT_QMAIL_PORT) -RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail -QMAIL_DIR?= /var/qmail +USE_QMAIL_RUN= yes .endif USE_PYTHON= yes diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile index 7bd3442e0a28..bff5b844bf24 100644 --- a/mail/serialmail/Makefile +++ b/mail/serialmail/Makefile @@ -7,7 +7,7 @@ PORTNAME= serialmail PORTVERSION= 0.75 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://cr.yp.to/software/ \ ftp://ftp.gbnet.net/pub/qmail/ \ @@ -17,11 +17,8 @@ MASTER_SITES= http://cr.yp.to/software/ \ MAINTAINER= sergei@FreeBSD.org COMMENT= Tools for passing mail across serial links -RUN_DEPENDS= tcpserver:${PORTSDIR}/sysutils/ucspi-tcp \ - ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail - -# QMAIL_DIR is the directory where qmail is installed -QMAIL_DIR?= /var/qmail +RUN_DEPENDS= tcpserver:${PORTSDIR}/sysutils/ucspi-tcp +USE_QMAIL_RUN= yes NO_PACKAGE= Unsure of DJB license @@ -65,7 +62,7 @@ post-configure: @${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-home @${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc @${ECHO_CMD} ${CC} -s > ${WRKSRC}/conf-ld - @${ECHO_CMD} ${QMAIL_DIR} > ${WRKSRC}/conf-qmail + @${ECHO_CMD} ${QMAIL_PREFIX} > ${WRKSRC}/conf-qmail do-install: cd ${WRKSRC} && \ diff --git a/mail/simscan/Makefile b/mail/simscan/Makefile index cd26374ee85f..68e2cc2773d4 100644 --- a/mail/simscan/Makefile +++ b/mail/simscan/Makefile @@ -7,6 +7,7 @@ PORTNAME= simscan PORTVERSION= 1.1 +PORTREVISION= 1 CATEGORIES= mail security MASTER_SITES= http://www.inter7.com/simscan/ MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,17 +16,14 @@ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.r/rc/} MAINTAINER= toxa@toxahost.ru COMMENT= Fast Content/Anti-virus Scanner for qmail Written in C -BUILD_DEPENDS= ${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail +USE_QMAIL_BUILD= yes GNU_CONFIGURE= yes USE_REINPLACE= yes -# A normal qmail installation puts everything into /var/qmail/. -# Must match your qmail installation -QMAIL_DIR?= /var/qmail -WORKDIR?= ${QMAIL_DIR}/${PORTNAME} -QMAIL_QUEUE= ${QMAIL_DIR}/bin/qmail-queue -PLIST_SUB= QMAIL_DIR=${QMAIL_DIR} \ +WORKDIR?= ${QMAIL_PREFIX}/${PORTNAME} +QMAIL_QUEUE= ${QMAIL_PREFIX}/bin/qmail-queue +PLIST_SUB= QMAIL_PREFIX=${QMAIL_PREFIX} \ SIMSCAN_DIR=${PORTNAME} OPTIONS= CLAMAV "Support for ClamAV Virus Scanning" on \ @@ -41,7 +39,7 @@ OPTIONS= CLAMAV "Support for ClamAV Virus Scanning" on \ .include <bsd.port.pre.mk> CONFIGURE_ARGS=--enable-clamavdb-path=/var/db/clamav \ - --enable-qmaildir=${QMAIL_DIR} \ + --enable-qmaildir=${QMAIL_PREFIX} \ --enable-spamc-user=n \ --enable-workdir=${WORKDIR} \ --enable-user=nobody @@ -109,7 +107,7 @@ PORTDOCS= AUTHORS ChangeLog README TODO if ! ${TEST} -f ${QMAIL_QUEUE}; then \ ${ECHO_MSG} "Unable to found qmail-queue binary trying '${QMAIL_QUEUE}'."; \ - ${ECHO_MSG} "Please set QMAIL_DIR to your qmail installation directory !"; \ + ${ECHO_MSG} "Please set QMAIL_PREFIX to your qmail installation directory !"; \ exit 1; \ fi @@ -118,7 +116,7 @@ pre-configure: @${ECHO_MSG} "=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=~=" @${ECHO_MSG} "You may also use the following build options:" @${ECHO_MSG} "" - @${ECHO_MSG} "QMAIL_DIR Base qmail directory. Default is /var/qmail" + @${ECHO_MSG} "QMAIL_PREFIX Base qmail directory. Default is /var/qmail" @${ECHO_MSG} "WORKDIR Directory to unpack emails. Default is /var/qmail/simscan" @${ECHO_MSG} "QMAIL_QUEUE Define full path and name of the qmail-queue program" @${ECHO_MSG} " Incoming mail is passed to this program after being" diff --git a/mail/simscan/pkg-plist b/mail/simscan/pkg-plist index 38fa642f64cf..5b806f15f2f3 100644 --- a/mail/simscan/pkg-plist +++ b/mail/simscan/pkg-plist @@ -1,7 +1,7 @@ -@cwd %%QMAIL_DIR%% +@cwd %%QMAIL_PREFIX%% bin/simscanmk bin/simscan -@unexec rmdir %%QMAIL_DIR%%/%%SIMSCAN_DIR%% || true +@unexec rmdir %%QMAIL_PREFIX%%/%%SIMSCAN_DIR%% || true @unexec echo "" -@unexec echo "If you're not updating this port, you can delete %%QMAIL_DIR%%/%%SIMSCAN_DIR%% directory" +@unexec echo "If you're not updating this port, you can delete %%QMAIL_PREFIX%%/%%SIMSCAN_DIR%% directory" @unexec echo "" diff --git a/mail/usendmail/Makefile b/mail/usendmail/Makefile index 7b66dc2edde7..b4959f1126ef 100644 --- a/mail/usendmail/Makefile +++ b/mail/usendmail/Makefile @@ -4,20 +4,17 @@ # # $FreeBSD$ # -# Tunables: QMAIL_DIR: Where qmail resides (default: /var/qmail) PORTNAME= usendmail PORTVERSION= 0.1.6 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.ohse.de/uwe/usendmail/ MAINTAINER= tmseck@netcologne.de COMMENT= A replacement for qmail's sendmail drop-in -BUILD_DEPENDS= ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail -RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail - -QMAIL_DIR?= /var/qmail +USE_QMAIL= yes NO_SIZE= yes USE_REINPLACE= yes @@ -26,10 +23,10 @@ WRKSRC= ${WRKDIR}/mail/${DISTNAME} PLIST_FILES= sbin/usendmail PORTDOCS= NEWS README SUB_FILES= pkg-message -SUB_LIST= QMAIL_DIR=${QMAIL_DIR} +SUB_LIST= QMAIL_PREFIX=${QMAIL_PREFIX} post-patch: - @${REINPLACE_CMD} -e 's,/var/qmail,${QMAIL_DIR},' \ + @${REINPLACE_CMD} -e 's,/var/qmail,${QMAIL_PREFIX},' \ ${WRKSRC}/src/usendmail.c @${REINPLACE_CMD} -e 's,^CC=,CC\?=,' \ ${WRKSRC}/src/Makefile diff --git a/mail/vmailmgr/Makefile b/mail/vmailmgr/Makefile index 200c2ca27600..148518e95a1f 100644 --- a/mail/vmailmgr/Makefile +++ b/mail/vmailmgr/Makefile @@ -7,26 +7,36 @@ PORTNAME= vmailmgr PORTVERSION= 0.96.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= http://www.vmailmgr.org/archive/ MAINTAINER= sergei@FreeBSD.org COMMENT= Virtual MAIL ManaGeR for virtual mailboxes and domains -RUN_DEPENDS= /var/qmail/bin/qmail-start:${PORTSDIR}/mail/qmail \ - unixserver:${PORTSDIR}/sysutils/ucspi-unix +USE_APACHE= yes +USE_QMAIL_RUN= yes -HAS_CONFIGURE=yes +HAS_CONFIGURE= yes +USE_REINPLACE= yes -SVC_DIR= "/var/qmail/service/vmailmgrd" +SVC_DIR= "${QMAIL_PREFIX}/service/vmailmgrd" +PHP_DIR= ${PREFIX}/www/data-dist/${PORTNAME} +CGI_DIR= ${PREFIX}/www/cgi-bin-dist + +PLIST_SUB+= PHP_DIR=${PHP_DIR} CGI_DIR=${CGI_DIR} MAN1= checkvpw.1 vauthenticate.1 vpasswd2cdb.1 vrehash.1 \ listvdomain.1 vadduser.1 vchattr.1 vchforwards.1 \ - vcheckquota.1 vdeliver.1 vdeluser.1 vpasswd.1 + vcheckquota.1 vdeliver.1 vdeluser.1 vpasswd.1 \ + vpasswd2db.1 vpasswds.1 vpopbull.1 vsetup.1 MAN7= vmailmgr.7 MAN8= vmailmgrd.8 +post-patch: + @${REINPLACE_CMD} -e 's|phpdir=".home.httpd.php"|phpdir="${PHP_DIR}"|g' \ + -e 's|cgidir=...prefix./cgi-bin.|cgidir="${CGI_DIR}"|g' \ + ${WRKSRC}/configure ${WRKSRC}/configure.in post-install: ${MKDIR} ${PREFIX}/etc/vmailmgr ${CP} ${WRKSRC}/scripts/autoresponder.sh ${PREFIX}/etc/vmailmgr/vdeliver-postdeliver diff --git a/mail/vmailmgr/pkg-plist b/mail/vmailmgr/pkg-plist index 22574e15fb92..5d0922cb1ac9 100644 --- a/mail/vmailmgr/pkg-plist +++ b/mail/vmailmgr/pkg-plist @@ -19,18 +19,24 @@ bin/vconf2dir bin/vauthenticate bin/checkvpw bin/showvconfig -cgi-bin/vpasswd -cgi-bin/vadduser -cgi-bin/vdeluser -cgi-bin/vaddalias -cgi-bin/vchattr -cgi-bin/vchforwards -cgi-bin/listvdomain +%%CGI_DIR%%/vpasswd +%%CGI_DIR%%/vadduser +%%CGI_DIR%%/vdeluser +%%CGI_DIR%%/vaddalias +%%CGI_DIR%%/vchattr +%%CGI_DIR%%/vchforwards +%%CGI_DIR%%/listvdomain +@unexec rmdir %D/%%CGI_DIR%% 2>/dev/null || true etc/vmailmgr/default-username etc/vmailmgr/vdeliver-postdeliver lib/courier-imap/libexec/authlib/authvmailmgr +@dirrm lib/courier-imap/libexec/authlib +@dirrm lib/courier-imap/libexec +@dirrm lib/courier-imap sbin/vmailmgrd @dirrm etc/vmailmgr +%%PHP_DIR%%/vmail.inc +@dirrm %%PHP_DIR%% @cwd /var/qmail/service vmailmgrd/log/run vmailmgrd/run diff --git a/mail/vpopmail-devel/Makefile b/mail/vpopmail-devel/Makefile index e4dab9ec5028..baefa5e5f2c1 100644 --- a/mail/vpopmail-devel/Makefile +++ b/mail/vpopmail-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= vpopmail PORTVERSION= 5.5.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,23 +16,22 @@ PKGNAMESUFFIX= -devel MAINTAINER= ale@FreeBSD.org COMMENT= Easy virtual domain and authentication package for use with qmail -BUILD_DEPENDS= ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \ - ${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp -RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \ - ${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp +BUILD_DEPENDS= ${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp +RUN_DEPENDS= ${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp +USE_QMAIL= yes CONFLICTS= vpopmail-5.* GNU_CONFIGURE= YES USE_GMAKE= YES USE_REINPLACE= YES -USE_PERL5_BUILD= YES +USE_PERL5= YES VCFGDIR?= ${WRKDIR}/vcfg VCFGFILES?= inc_deps lib_deps tcp.smtp CONFIGURE_ENV+= VCFGDIR="${VCFGDIR}" -CONFIGURE_ARGS= --enable-qmaildir=${QMAIL_DIR} \ +CONFIGURE_ARGS= --enable-qmaildir=${QMAIL_PREFIX} \ --enable-tcprules-prog=${LOCALBASE}/bin/tcprules \ --enable-tcpserver-file=${PREFIX}/vpopmail/etc/tcp.smtp @@ -74,7 +73,7 @@ CONFIGURE_ARGS= --enable-qmaildir=${QMAIL_DIR} \ # WITHOUT_AUTH_LOG - disables authentication logging # WITH_MYSQL_LOG - enable logging to a MySQL database # WITH_PGSQL_LOG - enable logging to a PostgreSQL database -# QMAIL_DIR - location of qmail directory +# QMAIL_PREFIX - location of qmail directory # PREFIX - installation area for vpopmail (see comment below) # VCHKPW_GID - the group ID of the new vchkpw group (89) # VPOPMAIL_UID - the user ID of the new vpopmail user (89) @@ -170,12 +169,6 @@ CONFIGURE_ARGS+= --enable-pgsql-logging .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/qmail/bin/qmail-send) -QMAIL_DIR?= ${LOCALBASE}/qmail -.else -QMAIL_DIR?= /var/qmail -.endif - # Uncomment this, or set PREFIX to /home if you have an existing # vpopmail install with the vpopmail users' home directory set to # /home/vpopmail - package rules dictate we default to /usr/local/vpopmail @@ -327,10 +320,11 @@ post-install: ${MKDIR} ${PREFIX}/vpopmail/etc if [ ! -e "${PREFIX}/vpopmail/etc/tcp.smtp" ]; then \ if [ -e "${VCFGDIR}/tcp.smtp" ]; then \ - ${INSTALL_DATA} ${VCFGDIR}/tcp.smtp ${PREFIX}/vpopmail/etc/; \ + ${INSTALL_DATA} ${VCFGDIR}/tcp.smtp ${PREFIX}/vpopmail/etc/tcp.smtp-dist; \ else \ - ${TOUCH} ${PREFIX}/vpopmail/etc/tcp.smtp; \ + ${TOUCH} ${PREFIX}/vpopmail/etc/tcp.smtp-dist; \ fi; \ + ${CP} -p ${PREFIX}/vpopmail/etc/tcp.smtp-dist ${PREFIX}/vpopmail/etc/tcp.smtp; \ fi .if defined(DEFAULT_DOMAIN) ${ECHO_CMD} ${DEFAULT_DOMAIN} > ${PREFIX}/vpopmail/etc/defaultdomain diff --git a/mail/vpopmail-devel/pkg-plist b/mail/vpopmail-devel/pkg-plist index 2f113a2e8d2d..98ff8626c947 100644 --- a/mail/vpopmail-devel/pkg-plist +++ b/mail/vpopmail-devel/pkg-plist @@ -41,7 +41,9 @@ vpopmail/doc/man_html/vsetuserquota.html @unexec if [ -f %D/vpopmail/etc/defaultdomain ]; then rm -f %D/vpopmail/etc/defaultdomain; fi vpopmail/etc/inc_deps vpopmail/etc/lib_deps -@unexec if [ -f %D/vpopmail/etc/tcp.smtp -a ! -s %D/vpopmail/etc/tcp.smtp ]; then rm -f %D/vpopmail/etc/tcp.smtp; fi +@unexec if cmp -s %D/vpopmail/etc/tcp.smtp %D/vpopmail/etc/tcp.smtp-dist; then rm -f %D/vpopmail/etc/tcp.smtp; fi +vpopmail/etc/tcp.smtp-dist +@exec if [ ! -f %D/vpopmail/etc/tcp.smtp ] ; then cp -p %D/%F %B/tcp.smtp; fi @unexec if cmp -s %D/vpopmail/etc/vlimits.default %D/vpopmail/etc/vlimits.default-dist; then rm -f %D/vpopmail/etc/vlimits.default; fi vpopmail/etc/vlimits.default-dist @unexec if [ -f %D/vpopmail/etc/vpopmail.mysql ]; then rm -f %D/vpopmail/etc/vpopmail.mysql; fi diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile index 537b99c05f42..b22e149d8ddb 100644 --- a/mail/vpopmail/Makefile +++ b/mail/vpopmail/Makefile @@ -7,7 +7,7 @@ PORTNAME= vpopmail PORTVERSION= 5.4.10 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,10 +15,9 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= roam@FreeBSD.org COMMENT= Easy virtual domain and authentication package for use with qmail -BUILD_DEPENDS= ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \ - ${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp -RUN_DEPENDS= ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail \ - ${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp +BUILD_DEPENDS= ${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp +RUN_DEPENDS= ${LOCALBASE}/bin/tcprules:${PORTSDIR}/sysutils/ucspi-tcp +USE_QMAIL= yes CONFLICTS= vpopmail-devel-5.* @@ -31,7 +30,7 @@ VCFGDIR?= ${WRKDIR}/vcfg VCFGFILES?= inc_deps lib_deps tcp.smtp CONFIGURE_ENV+= VCFGDIR="${VCFGDIR}" -CONFIGURE_ARGS= --enable-qmaildir=${QMAIL_DIR} \ +CONFIGURE_ARGS= --enable-qmaildir=${QMAIL_PREFIX} \ --enable-tcprules-prog=${LOCALBASE}/bin/tcprules \ --enable-tcpserver-file=${PREFIX}/vpopmail/etc/tcp.smtp CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} @@ -79,7 +78,7 @@ CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} # WITH_MYSQL_LOG - enable auth logging to a MySQL database [deprecateed] # WITH_PGSQL_LOG - enable auth logging to a PostgreSQL database [deprecated] # WITH_SQL_LOG - enable auth logging to the selected SQL database -# QMAIL_DIR - location of qmail directory +# QMAIL_PREFIX - location of qmail directory # PREFIX - installation area for vpopmail (see comment below) # VCHKPW_GID - the group ID of the new vchkpw group (89) # VPOPMAIL_UID - the user ID of the new vpopmail user (89) @@ -198,12 +197,6 @@ EXTRA_PATCHES+= ${FILESDIR}/vchkpw-smtp-auth.patch .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/qmail/bin/qmail-send) -QMAIL_DIR?= ${LOCALBASE}/qmail -.else -QMAIL_DIR?= /var/qmail -.endif - .if !defined(WITHOUT_FPIC) && ${ARCH} == "amd64" CFLAGS+= -fPIC .endif diff --git a/mail/vqadmin/Makefile b/mail/vqadmin/Makefile index fd2358437d41..d84bc5b1b9ab 100644 --- a/mail/vqadmin/Makefile +++ b/mail/vqadmin/Makefile @@ -7,6 +7,7 @@ PORTNAME= vqadmin PORTVERSION= 2.3.6 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= vqadmin @@ -21,14 +22,14 @@ RUN_DEPENDS= ${LOCALBASE}/vpopmail/lib/libvpopmail.a:${PORTSDIR}/mail/vpopmail GNU_CONFIGURE= YES CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} USE_REINPLACE= YES +WANT_QMAIL= yes CGIBINDIR?= www/cgi-bin-dist WEBDATADIR?= www/data-dist -QMAIL_DIR?= /var/qmail CONFIGURE_ARGS= --enable-cgibindir=${PREFIX}/${CGIBINDIR} \ --enable-htmldir=${PREFIX}/${WEBDATADIR} \ - --enable-qmaildir=${QMAIL_DIR} + --enable-qmaildir=${QMAIL_PREFIX} .include <bsd.port.pre.mk> diff --git a/mail/zabit/Makefile b/mail/zabit/Makefile index 5eddcb30c39d..c0282e4de4b6 100644 --- a/mail/zabit/Makefile +++ b/mail/zabit/Makefile @@ -7,24 +7,20 @@ PORTNAME= zabit PORTVERSION= 0.7.1 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= http://www.enderunix.org/zabit/ MAINTAINER= ports@FreeBSD.org COMMENT= Zabit is a content/attachment filter for qmail -RUN_DEPENDS= ${QMAIL_QUEUE}:${PORTSDIR}/mail/qmail +USE_QMAIL_RUN= yes HAS_CONFIGURE= yes .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/qmail/bin/qmail-queue) -QMAIL_DIR?= ${LOCALBASE}/qmail -.else -QMAIL_DIR?= /var/qmail -.endif -QMAIL_QUEUE= ${QMAIL_DIR}/bin/qmail-queue +QMAIL_QUEUE= ${QMAIL_PREFIX}/bin/qmail-queue pre-build: .if !defined(BATCH) diff --git a/security/amavis-perl/Makefile b/security/amavis-perl/Makefile index 008087add9b1..360f41983277 100644 --- a/security/amavis-perl/Makefile +++ b/security/amavis-perl/Makefile @@ -7,6 +7,7 @@ PORTNAME= amavis-perl PORTVERSION= 11 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= amavis @@ -54,13 +55,7 @@ CONFIGURE_ARGS+= --with-virusdir=/var/spool/quarantine --with-runtime-dir=/var/l MTA?= qmail DIROWNER?= qmailq:qmail CONFIGURE_ARGS+= --enable-qmail -.if exists(${LOCALBASE}/qmail/bin/qmail-send) -QMAIL_DIR?= ${LOCALBASE}/qmail -.else -QMAIL_DIR?= /var/qmail -.endif -BUILD_DEPENDS+= ${QMAIL_DIR}/bin/qmail-send:${PORTSDIR}/mail/qmail -RUN_DEPENDS= ${BUILD_DEPENDS} +USE_QMAIL= yes .endif .if defined(MTA) diff --git a/sysutils/dtc/Makefile b/sysutils/dtc/Makefile index 8a910b4adcdc..a6e2bff203e3 100644 --- a/sysutils/dtc/Makefile +++ b/sysutils/dtc/Makefile @@ -7,7 +7,7 @@ PORTNAME= dtc PORTVERSION= 0.12.0.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= ftp://ftp.gplhost.com/pub/dtc/bsd/ @@ -15,13 +15,11 @@ MAINTAINER= thomas@goirand.fr COMMENT= A hosting web GUI for admin and accounting apache/named/proftpd/qmail RUN_DEPENDS= ${LOCALBASE}/share/pear/Crypt/CBC.php:${PORTSDIR}/security/pear-Crypt_CBC \ - ${LOCALBASE}/libexec/proftpd:${PORTSDIR}/ftp/proftpd-mysql \ - ${LOCALBASE}/libexec/apache2/mod_log_sql.so:${PORTSDIR}/www/mod_log_sql2 \ + ${LOCALBASE}/sbin/proftpd:${PORTSDIR}/ftp/proftpd-mysql \ + ${LOCALBASE}/libexec/apache/mod_log_sql.so:${PORTSDIR}/www/mod_log_sql2 \ ${LOCALBASE}/bin/webalizer:${PORTSDIR}/www/webalizer \ - ${QMAIL_DIR}/bin/qmail-start:${PORTSDIR}/mail/qmail USE_PHP= session mysql sockets gd -QMAIL_DIR?= /var/qmail DTCROOT?= www/dtc DTCDIR= ${PREFIX}/${DTCROOT} @@ -34,14 +32,16 @@ IGNORE= Untested NO_BUILD= yes USE_MYSQL= yes +USE_QMAIL_RUN= yes + do-configure: @${SED} -e 's,%%PREFIX%%,${PREFIX},;\ s,%%LOCALBASE%%,${LOCALBASE},;\ - s,%%QMAIL_DIR%%,${QMAIL_DIR},' \ + s,%%QMAIL_PREFIX%%,${QMAIL_PREFIX},' \ ${FILESDIR}/dtc-install.in > ${WRKDIR}/dtc-install @${SED} -e 's,%%PREFIX%%,${PREFIX},;\ s,%%LOCALBASE%%,${LOCALBASE},;\ - s,%%QMAIL_DIR%%,${QMAIL_DIR},' \ + s,%%QMAIL_PREFIX%%,${QMAIL_PREFIX},' \ ${FILESDIR}/dtc-deinstall.in > ${WRKDIR}/dtc-deinstall do-install: diff --git a/sysutils/dtc/files/dtc-deinstall.in b/sysutils/dtc/files/dtc-deinstall.in index 024ffceced82..6929330f665c 100644 --- a/sysutils/dtc/files/dtc-deinstall.in +++ b/sysutils/dtc/files/dtc-deinstall.in @@ -8,13 +8,13 @@ UNIX_TYPE=freebsd PREFIX=%%PREFIX%% LOCALBASE=%%LOCALBASE%% -QMAIL_DIR=%%QMAIL_DIR%% +QMAIL_PREFIX=%%QMAIL_PREFIX%% echo "### DEAMON PATH CONFIGURATION ###" PATH_HTTPD_CONF="${LOCALBASE}/etc/apache/httpd.conf" PATH_NAMED_CONF="/etc/namedb/named.conf" PATH_PROFTPD_CONF="${LOCALBASE}/etc/proftpd.conf" -PATH_QMAIL_CTRL="${QMAIL_DIR}/control" +PATH_QMAIL_CTRL="${QMAIL_PREFIX}/control" # Multi OS (Unix system) uninstall sh script for DTC # Written by Thomas GOIRAND <thomas@goirand.fr> diff --git a/sysutils/dtc/files/dtc-install.in b/sysutils/dtc/files/dtc-install.in index 196d3b0d1580..d6d60ce6e109 100644 --- a/sysutils/dtc/files/dtc-install.in +++ b/sysutils/dtc/files/dtc-install.in @@ -7,7 +7,7 @@ PREFIX=%%PREFIX%% LOCALBASE=%%LOCALBASE%% -QMAIL_DIR=%%QMAIL_DIR%% +QMAIL_PREFIX=%%QMAIL_PREFIX%% UNIX_TYPE=freebsd @@ -128,7 +128,7 @@ then cp ${LOCALBASE}/etc/proftpd.conf.default ${LOCALBASE}/etc/proftpd.conf fi PATH_PROFTPD_CONF="${LOCALBASE}/etc/proftpd.conf" -PATH_QMAIL_CTRL="${QMAIL_DIR}/control" +PATH_QMAIL_CTRL="${QMAIL_PREFIX}/control" PATH_PHP_CGI="${LOCALBASE}/bin/php" PATH_DTC_SHARED="${PREFIX}/www/dtc" |