svn commit: r479405 - in head: cad/astk-serveur databases/dbh databases/libgda5 databases/pglogical devel/grumpy devel/pth devel/smack devel/statcvs emulators/mame emulators/mtools german/BBBike gr...
Mathieu Arnold
mat at FreeBSD.org
Mon Sep 10 13:11:31 UTC 2018
Author: mat
Date: Mon Sep 10 13:11:23 2018
New Revision: 479405
URL: https://svnweb.freebsd.org/changeset/ports/479405
Log:
After an include, PLIST_SUB must be appended to, not overwritten.
If it is overwritten, many values will be clobbered, and
pain will ensue.
PR: 230864
Submitted by: mat
exp-runs by: antoine
Modified:
head/cad/astk-serveur/Makefile (contents, props changed)
head/databases/dbh/Makefile (contents, props changed)
head/databases/libgda5/Makefile (contents, props changed)
head/databases/pglogical/Makefile (contents, props changed)
head/devel/grumpy/Makefile (contents, props changed)
head/devel/pth/Makefile (contents, props changed)
head/devel/smack/Makefile (contents, props changed)
head/devel/statcvs/Makefile (contents, props changed)
head/emulators/mame/Makefile (contents, props changed)
head/emulators/mtools/Makefile (contents, props changed)
head/german/BBBike/Makefile (contents, props changed)
head/graphics/OpenEXR/Makefile (contents, props changed)
head/graphics/tgif/Makefile (contents, props changed)
head/japanese/skkinput3/Makefile (contents, props changed)
head/lang/gcc48/Makefile (contents, props changed)
head/lang/gcc49/Makefile (contents, props changed)
head/lang/gcc5/Makefile (contents, props changed)
head/lang/gcc6-devel/Makefile (contents, props changed)
head/lang/gcc6/Makefile (contents, props changed)
head/lang/gcc7-devel/Makefile (contents, props changed)
head/lang/gcc7/Makefile (contents, props changed)
head/lang/gcc8-devel/Makefile (contents, props changed)
head/lang/modula3/Makefile (contents, props changed)
head/lang/smlnj/Makefile (contents, props changed)
head/mail/cclient/Makefile (contents, props changed)
head/mail/panda-cclient/Makefile (contents, props changed)
head/news/leafnode/Makefile (contents, props changed)
head/print/pdflib/Makefile (contents, props changed)
head/science/cgnslib/Makefile (contents, props changed)
head/sysutils/xcdroast/Makefile (contents, props changed)
head/www/polipo/Makefile (contents, props changed)
head/x11/rxvt-unicode/Makefile (contents, props changed)
head/x11/xkbset/Makefile (contents, props changed)
Modified: head/cad/astk-serveur/Makefile
==============================================================================
--- head/cad/astk-serveur/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/cad/astk-serveur/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -62,7 +62,7 @@ WRKCONF= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/config
.if !defined(CLIENT_SEUL)
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/ASTK_SERV
PATCHDIR= ${MASTERDIR}/files
-PLIST_SUB= ASTKDIR=${LINSTDIR}/ASTK_SERV SERV="" CLIENT="@comment "\
+PLIST_SUB+= ASTKDIR=${LINSTDIR}/ASTK_SERV SERV="" CLIENT="@comment "\
vaster=${vaster}
PATCH2RM= bin/as_run bin/parallel_cp etc/asrun etc/profile.sh \
asrun/config.py asrun/installation.py asrun/system.py \
@@ -90,7 +90,7 @@ TKPNG_VER= 0.9
TKPNG= tkpng${TKPNG_VER}
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/ASTK_CLIENT
PATCHDIR= ${MASTERDIR}/files.client
-PLIST_SUB= ASTKDIR=${LINSTDIR}/ASTK_CLIENT SERV="@comment " CLIENT="" vaster="" \
+PLIST_SUB+= ASTKDIR=${LINSTDIR}/ASTK_CLIENT SERV="@comment " CLIENT="" vaster="" \
BWidget_DIR=${LINSTDIR}/ASTK_CLIENT/lib/BWidget-${BWidget_VER}
PATCH2RM= bin/astk bin/bsf etc/astkrc/outils lib/init.tcl lib/tkselecteur.tcl
.endif
Modified: head/databases/dbh/Makefile
==============================================================================
--- head/databases/dbh/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/databases/dbh/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -28,10 +28,10 @@ GTKDOC_DESC= Enable GTK html documentation
.if ${PORT_OPTIONS:MGTKDOC}
CONFIGURE_ARGS+= --enable-gtk-doc-html
-PLIST_SUB= GTKDOC=""
+PLIST_SUB+= GTKDOC=""
.else
CONFIGURE_ARGS+= --disable-gtk-doc-html
-PLIST_SUB= GTKDOC="@comment "
+PLIST_SUB+= GTKDOC="@comment "
.endif
post-patch:
Modified: head/databases/libgda5/Makefile
==============================================================================
--- head/databases/libgda5/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/databases/libgda5/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -37,7 +37,7 @@ CONFIGURE_ARGS= --without-oracle \
.include <bsd.port.options.mk>
VERSION= 5.0
-PLIST_SUB= VERSION=${VERSION}
+PLIST_SUB+= VERSION=${VERSION}
.if ${LIBGDA5_SLAVE}!="no"
USE_GNOME+= libgda5
Modified: head/databases/pglogical/Makefile
==============================================================================
--- head/databases/pglogical/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/databases/pglogical/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -29,9 +29,9 @@ DOCS_PORTDOCS= *
.include <bsd.port.pre.mk>
.if ${PGSQL_VER:M9.4}
-PLIST_SUB= PGSQL94=""
+PLIST_SUB+= PGSQL94=""
.else
-PLIST_SUB= PGSQL94="@comment "
+PLIST_SUB+= PGSQL94="@comment "
.endif
# FFI
Modified: head/devel/grumpy/Makefile
==============================================================================
--- head/devel/grumpy/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/devel/grumpy/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -21,10 +21,10 @@ BINARY_ALIAS= python=${PYTHON_CMD}
.include <bsd.port.options.mk>
.if ${ARCH} == "amd64"
-PLIST_SUB= ARCH=amd64
+PLIST_SUB+= ARCH=amd64
.endif
.if ${ARCH} == "i386"
-PLIST_SUB= ARCH=386
+PLIST_SUB+= ARCH=386
.endif
do-install:
Modified: head/devel/pth/Makefile
==============================================================================
--- head/devel/pth/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/devel/pth/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -30,10 +30,10 @@ CONFLICTS?= pth-hard-2.*
.if ${PKGNAMESUFFIX} == "-hard"
CONFIGURE_ARGS+= --enable-syscall-hard --disable-syscall-soft
-PLIST_SUB= PTHREAD="@comment "
+PLIST_SUB+= PTHREAD="@comment "
.else
CONFIGURE_ARGS+= --enable-syscall-soft --enable-pthread
-PLIST_SUB= PTHREAD=""
+PLIST_SUB+= PTHREAD=""
.endif
post-patch:
Modified: head/devel/smack/Makefile
==============================================================================
--- head/devel/smack/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/devel/smack/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -28,11 +28,11 @@ OPTIONS_DEFINE= EXAMPLES
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MEXAMPLES}
-PLIST_SUB= EXAMPLES=""
+PLIST_SUB+= EXAMPLES=""
CMAKE_ARGS= -DENABLE_EXAMPLES=ON
.else
CMAKE_ARGS= -DENABLE_EXAMPLES=OFF
-PLIST_SUB= EXAMPLES="@comment "
+PLIST_SUB+= EXAMPLES="@comment "
.endif
.include <bsd.port.mk>
Modified: head/devel/statcvs/Makefile
==============================================================================
--- head/devel/statcvs/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/devel/statcvs/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -39,9 +39,9 @@ DOCS_ALL_TARGET=javadoc
.include <bsd.port.pre.mk>
.if ${JAVA_PORT_VERSION} == "1.6.0"
-PLIST_SUB= JDK6=""
+PLIST_SUB+= JDK6=""
.else
-PLIST_SUB= JDK6="@comment "
+PLIST_SUB+= JDK6="@comment "
.endif
do-install:
Modified: head/emulators/mame/Makefile
==============================================================================
--- head/emulators/mame/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/emulators/mame/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -62,7 +62,7 @@ EMULATOR= ${MSUBTARGET}64
.else
EMULATOR= ${MSUBTARGET}
.endif
-PLIST_SUB= EMULATOR=${EMULATOR}
+PLIST_SUB+= EMULATOR=${EMULATOR}
post-patch:
@${RM} ${WRKSRC}/3rdparty/bx/include/compat/freebsd/dirent.h
Modified: head/emulators/mtools/Makefile
==============================================================================
--- head/emulators/mtools/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/emulators/mtools/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -38,10 +38,10 @@ CONFIGURE_ENV+= ac_cv_header_iconv_h=no
.if ${PORT_OPTIONS:MX11}
USE_XORG= x11 sm ice xau
-PLIST_SUB= X11=""
+PLIST_SUB+= X11=""
.else
CONFIGURE_ARGS+= --without-x
-PLIST_SUB= X11="@comment "
+PLIST_SUB+= X11="@comment "
MAKE_ENV+= WITHOUT_X11=yes
.endif
Modified: head/german/BBBike/Makefile
==============================================================================
--- head/german/BBBike/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/german/BBBike/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -59,7 +59,7 @@ MYDESTDIR= ${STAGEDIR}${PREFIX}/BBBike
.if exists(${PERL5})
LOCAL_PERL_ARCH!= ${PERL5} -MConfig -e '$$x = qq{$$Config{version}/$$Config{archname}}; $$x =~ s{/}{\\\\/}g; print $$x'
.endif
-PLIST_SUB= LOCAL_PERL_ARCH=${LOCAL_PERL_ARCH}
+PLIST_SUB+= LOCAL_PERL_ARCH=${LOCAL_PERL_ARCH}
BBBIKE_PERL_EXE= bbbike cbbbike bbbikeclient cmdbbbike smsbbbike
post-patch:
Modified: head/graphics/OpenEXR/Makefile
==============================================================================
--- head/graphics/OpenEXR/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/graphics/OpenEXR/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -57,7 +57,7 @@ USE_GCC= yes
MAJORVER= 2_2
VER= 23
-PLIST_SUB= MAJORVER=${MAJORVER}
+PLIST_SUB+= MAJORVER=${MAJORVER}
PLIST_SUB+= VER=${VER}
post-patch:
Modified: head/graphics/tgif/Makefile
==============================================================================
--- head/graphics/tgif/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/graphics/tgif/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -32,9 +32,9 @@ USE_XORG= x11 xext xt sm ice
.if ${PORT_OPTIONS:MNLS}
USES+= gettext
IMAKEDEFINES+= WITH_NLS
-PLIST_SUB= NLS=""
+PLIST_SUB+= NLS=""
.else
-PLIST_SUB= NLS="@comment "
+PLIST_SUB+= NLS="@comment "
.endif
.if ${PORT_OPTIONS:MA4SIZE}
IMAKEDEFINES+= WITH_A4SIZE
Modified: head/japanese/skkinput3/Makefile
==============================================================================
--- head/japanese/skkinput3/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/japanese/skkinput3/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -31,9 +31,9 @@ SKK10_DESC= Install SKK10 elisp files
.include <bsd.port.options.mk>
.if ${PORT_OPTIONS:MSKK10}
-PLIST_SUB= SKK8="@comment " SKK10=""
+PLIST_SUB+= SKK8="@comment " SKK10=""
.else
-PLIST_SUB= SKK8="" SKK10="@comment "
+PLIST_SUB+= SKK8="" SKK10="@comment "
.endif
.if ${PORT_OPTIONS:MDBSKKD}
Modified: head/lang/gcc48/Makefile
==============================================================================
--- head/lang/gcc48/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/lang/gcc48/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -102,7 +102,7 @@ CONFIGURE_ARGS+=--disable-nls \
--enable-languages=${LANGUAGES}
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
USE_LDCONFIG= ${TARGLIB}
-PLIST_SUB= GCC_VERSION=${GCC_VERSION} \
+PLIST_SUB+= GCC_VERSION=${GCC_VERSION} \
GNU_HOST=${CONFIGURE_TARGET} \
SUFFIX=${SUFFIX}
INFO= gcc${SUFFIX}/cpp \
Modified: head/lang/gcc49/Makefile
==============================================================================
--- head/lang/gcc49/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/lang/gcc49/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -102,7 +102,7 @@ CONFIGURE_ARGS+=--disable-nls \
--enable-languages=${LANGUAGES}
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
USE_LDCONFIG= ${TARGLIB}
-PLIST_SUB= GCC_VERSION=${GCC_VERSION} \
+PLIST_SUB+= GCC_VERSION=${GCC_VERSION} \
GNU_HOST=${CONFIGURE_TARGET} \
SUFFIX=${SUFFIX}
INFO= gcc${SUFFIX}/cpp \
Modified: head/lang/gcc5/Makefile
==============================================================================
--- head/lang/gcc5/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/lang/gcc5/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -101,7 +101,7 @@ CONFIGURE_ARGS+=--disable-nls \
--with-system-zlib
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
USE_LDCONFIG= ${TARGLIB}
-PLIST_SUB= GCC_VERSION=${GCC_VERSION} \
+PLIST_SUB+= GCC_VERSION=${GCC_VERSION} \
GNU_HOST=${CONFIGURE_TARGET} \
SUFFIX=${SUFFIX}
INFO= gcc${SUFFIX}/cpp \
Modified: head/lang/gcc6-devel/Makefile
==============================================================================
--- head/lang/gcc6-devel/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/lang/gcc6-devel/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -117,7 +117,7 @@ CONFIGURE_ARGS+=--disable-nls \
--with-system-zlib
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
USE_LDCONFIG= ${TARGLIB}
-PLIST_SUB= GCC_VERSION=${GCC_VERSION} \
+PLIST_SUB+= GCC_VERSION=${GCC_VERSION} \
GNU_HOST=${CONFIGURE_TARGET} \
SUFFIX=${SUFFIX}
INFO= gcc${SUFFIX}/cpp \
Modified: head/lang/gcc6/Makefile
==============================================================================
--- head/lang/gcc6/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/lang/gcc6/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -117,7 +117,7 @@ CONFIGURE_ARGS+=--disable-nls \
--with-system-zlib
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
USE_LDCONFIG= ${TARGLIB}
-PLIST_SUB= GCC_VERSION=${GCC_VERSION} \
+PLIST_SUB+= GCC_VERSION=${GCC_VERSION} \
GNU_HOST=${CONFIGURE_TARGET} \
SUFFIX=${SUFFIX}
INFO= gcc${SUFFIX}/cpp \
Modified: head/lang/gcc7-devel/Makefile
==============================================================================
--- head/lang/gcc7-devel/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/lang/gcc7-devel/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -101,7 +101,7 @@ CONFIGURE_ARGS+=--disable-nls \
--with-system-zlib
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
USE_LDCONFIG= ${TARGLIB}
-PLIST_SUB= GCC_VERSION=${GCC_VERSION} \
+PLIST_SUB+= GCC_VERSION=${GCC_VERSION} \
GNU_HOST=${CONFIGURE_TARGET} \
SUFFIX=${SUFFIX}
INFO= gcc${SUFFIX}/cpp \
Modified: head/lang/gcc7/Makefile
==============================================================================
--- head/lang/gcc7/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/lang/gcc7/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -97,7 +97,7 @@ CONFIGURE_ARGS+=--disable-nls \
--with-system-zlib
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
USE_LDCONFIG= ${TARGLIB}
-PLIST_SUB= GCC_VERSION=${GCC_VERSION} \
+PLIST_SUB+= GCC_VERSION=${GCC_VERSION} \
GNU_HOST=${CONFIGURE_TARGET} \
SUFFIX=${SUFFIX}
INFO= gcc${SUFFIX}/cpp \
Modified: head/lang/gcc8-devel/Makefile
==============================================================================
--- head/lang/gcc8-devel/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/lang/gcc8-devel/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -99,7 +99,7 @@ CONFIGURE_ARGS+=--disable-nls \
--with-system-zlib
MAKE_ARGS+= MAKEINFOFLAGS="--no-split"
USE_LDCONFIG= ${TARGLIB}
-PLIST_SUB= GCC_VERSION=${GCC_VERSION} \
+PLIST_SUB+= GCC_VERSION=${GCC_VERSION} \
GNU_HOST=${CONFIGURE_TARGET} \
SUFFIX=${SUFFIX}
INFO= gcc${SUFFIX}/cpp \
Modified: head/lang/modula3/Makefile
==============================================================================
--- head/lang/modula3/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/lang/modula3/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -77,7 +77,7 @@ MARCH= x86_64
NEWBOOTNAME= m3-bootstrap.${MARCH}.${OPSYS:tu}.${OSREL:S/.//}.tar.bz2
M3TARGET= ${MARCH}_${OPSYS:tu}
-PLIST_SUB= T=${M3TARGET} P=cm3/pkg B=cm3/bin L=cm3/lib
+PLIST_SUB+= T=${M3TARGET} P=cm3/pkg B=cm3/bin L=cm3/lib
.endif
post-extract:
Modified: head/lang/smlnj/Makefile
==============================================================================
--- head/lang/smlnj/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/lang/smlnj/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -57,7 +57,7 @@ DISTFILES+= MLRISC.tgz ckit.tgz cml.tgz doc.tgz heap2a
ml-burg.tgz ml-lpt.tgz ml-lex.tgz ml-yacc.tgz nlffi.tgz \
smlnj-lib.tgz trace-debug-profile.tgz
-PLIST_SUB= MLARCH=${MLARCH}
+PLIST_SUB+= MLARCH=${MLARCH}
.if ${PORT_OPTIONS:MPOSITION64} || defined(ML_POSITION64)
ML_POSITION64?= ${PORT_OPTIONS:MPOSITION64}
Modified: head/mail/cclient/Makefile
==============================================================================
--- head/mail/cclient/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/mail/cclient/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -55,7 +55,7 @@ SHLIBBASE= c-client4
SHLIBMAJ= 9
SHLIBNAME= lib${SHLIBBASE}.so.${SHLIBMAJ}
MAKE_ENV+= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
-PLIST_SUB= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
+PLIST_SUB+= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
post-patch:
.for file in Makefile src/osdep/unix/Makefile src/osdep/unix/Makefile.gss
Modified: head/mail/panda-cclient/Makefile
==============================================================================
--- head/mail/panda-cclient/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/mail/panda-cclient/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -57,7 +57,7 @@ SHLIBBASE= c-client4
SHLIBMAJ= 10
SHLIBNAME= lib${SHLIBBASE}.so.${SHLIBMAJ}
MAKE_ENV+= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
-PLIST_SUB= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
+PLIST_SUB+= SHLIBNAME=${SHLIBNAME} SHLIBBASE=${SHLIBBASE}
pre-configure:
.for file in Makefile src/osdep/unix/Makefile src/osdep/unix/Makefile.gss
Modified: head/news/leafnode/Makefile
==============================================================================
--- head/news/leafnode/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/news/leafnode/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -31,7 +31,7 @@ LEAFNODE_SPOOLDIR?=/var/spool/news
LEAFNODE_SPOOLDIR?=${LOCALBASE}/var/spool/leafnode
.endif
LEAFNODE_SPOOLDIR?=/var/spool/leafnode
-PLIST_SUB= SPOOLDIR=${LEAFNODE_SPOOLDIR} REALPREFIX=${PREFIX}
+PLIST_SUB+= SPOOLDIR=${LEAFNODE_SPOOLDIR} REALPREFIX=${PREFIX}
CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc/leafnode \
--with-spooldir=${LEAFNODE_SPOOLDIR} --with-ipv6 \
Modified: head/print/pdflib/Makefile
==============================================================================
--- head/print/pdflib/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/print/pdflib/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -29,11 +29,11 @@ PERL_USES= perl5
.include <bsd.port.pre.mk>
.if ${PORT_OPTIONS:MPERL}
-PLIST_SUB= PERL=""
+PLIST_SUB+= PERL=""
CONFIGURE_ARGS+=--with-perl=${PERL}
.else
CONFIGURE_ARGS+=--with-perl=no
-PLIST_SUB= PERL="@comment "
+PLIST_SUB+= PERL="@comment "
.endif
.if ${PORT_OPTIONS:MJAVA}
Modified: head/science/cgnslib/Makefile
==============================================================================
--- head/science/cgnslib/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/science/cgnslib/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -34,13 +34,13 @@ OPTIONS_DEFAULT=HDF5 TESTS TOOLS
LIB_DEPENDS+= libhdf5.so:science/hdf5
CMAKE_ARGS+= -DCGNS_ENABLE_HDF5:BOOL=TRUE -DHDF5_NEED_ZLIB:BOOL=TRUE \
-DHDF5_INCLUDE_PATH:PATH="${LOCALBASE}/include"
-PLIST_SUB= HDF5=""
+PLIST_SUB+= HDF5=""
. if ${PORT_OPTIONS:MSZIP}
CMAKE_ARGS+= -DHDF5_NEED_SZIP:BOOL=OFF
. endif
.else
CMAKE_ARGS+= -DCGNS_ENABLE_HDF5:BOOL=OFF
-PLIST_SUB= HDF5="@comment "
+PLIST_SUB+= HDF5="@comment "
.endif
.if ${PORT_OPTIONS:MTESTS}
@@ -56,9 +56,9 @@ USE_XORG= x11 xmu
CMAKE_ARGS+= -DCGNS_BUILD_CGNSTOOLS:BOOL=TRUE \
-DTCL_INCLUDE_PATH:STRING="${TCL_INCLUDEDIR}" \
-DTK_INCLUDE_PATH:STRING="${TK_INCLUDEDIR}"
-PLIST_SUB= TOOLS=""
+PLIST_SUB+= TOOLS=""
.else
-PLIST_SUB= TOOLS="@comment "
+PLIST_SUB+= TOOLS="@comment "
.endif
LIBVER= ${PORTVERSION:R}
Modified: head/sysutils/xcdroast/Makefile
==============================================================================
--- head/sysutils/xcdroast/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/sysutils/xcdroast/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -34,9 +34,9 @@ CONFIGURE_ARGS= --with-cdrtools-prefix=${LOCALBASE} \
.if ${PORT_OPTIONS:MNLS}
CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB= NLS="@comment "
+PLIST_SUB+= NLS="@comment "
.else
-PLIST_SUB= NLS=""
+PLIST_SUB+= NLS=""
.endif
.if ${PORT_OPTIONS:MGTK2}
Modified: head/www/polipo/Makefile
==============================================================================
--- head/www/polipo/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/www/polipo/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -27,7 +27,7 @@ SUB_FILES= pkg-message pkg-install pkg-deinstall 400.p
SUB_LIST+= USER=${PUSER} GROUP=${PGRP} DESTDIR=${DESTDIR} PCONFIGDIR=${PCONFIGDIR} \
PCACHEDIR=${PCACHEDIR} PPIDDIR=${PPIDDIR} PPIDFILE=${PPIDFILE} \
PLOGFILE=${PLOGFILE}
-PLIST_SUB= PCACHEDIR=${PCACHEDIR}
+PLIST_SUB+= PCACHEDIR=${PCACHEDIR}
# polipo installation options, propagated to install scripts
PUSER?= polipo
Modified: head/x11/rxvt-unicode/Makefile
==============================================================================
--- head/x11/rxvt-unicode/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/x11/rxvt-unicode/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -73,10 +73,10 @@ PATCH_DEPENDS+= p5-Encode-HanExtra>=0:chinese/p5-Encod
CONFIGURE_ARGS+= --disable-perl
USES+= perl5
USE_PERL5= build
-PLIST_SUB= PERL="@comment "
+PLIST_SUB+= PERL="@comment "
.else
USES+= perl5
-PLIST_SUB= PERL=""
+PLIST_SUB+= PERL=""
.endif
# disable XIM (X Input Method) protocol support
Modified: head/x11/xkbset/Makefile
==============================================================================
--- head/x11/xkbset/Makefile Mon Sep 10 13:11:12 2018 (r479404)
+++ head/x11/xkbset/Makefile Mon Sep 10 13:11:23 2018 (r479405)
@@ -28,10 +28,10 @@ GUI_DESC= Install Tk GUI
.if ${PORT_OPTIONS:MGUI}
RUN_DEPENDS+= p5-Tk>=0:x11-toolkits/p5-Tk
-PLIST_SUB= GUI=""
+PLIST_SUB+= GUI=""
MAKE_ARGS+= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
.else
-PLIST_SUB= GUI="@comment "
+PLIST_SUB+= GUI="@comment "
MAKE_ARGS+= INSTALL_SCRIPT=:
.endif
More information about the svn-ports-all
mailing list