Date: Wed, 14 Apr 2021 15:41:41 GMT From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 85737aec4a31 - main - Mk: Cleanup after moving apply-slist earlier. Message-ID: <202104141541.13EFff5p030211@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by mat: URL: https://cgit.FreeBSD.org/ports/commit/?id=85737aec4a3190a4f4d86583ad46a3615505a569 commit 85737aec4a3190a4f4d86583ad46a3615505a569 Author: Mathieu Arnold <mat@FreeBSD.org> AuthorDate: 2021-04-13 10:58:16 +0000 Commit: Mathieu Arnold <mat@FreeBSD.org> CommitDate: 2021-04-14 15:41:02 +0000 Mk: Cleanup after moving apply-slist earlier. --- japanese/font-ayu18/Makefile | 2 -- japanese/font-ayu20/Makefile | 2 -- japanese/font-elisa10/Makefile | 2 -- japanese/font-elisa8/Makefile | 2 -- japanese/font-kaname12/Makefile | 2 -- japanese/font-kanji18/Makefile | 2 -- japanese/font-kappa20/Makefile | 2 +- japanese/font-marumoji/Makefile | 2 +- japanese/font-naga10/Makefile | 2 -- japanese/font-shinonome/Makefile | 2 -- japanese/kinput2/Makefile | 2 +- japanese/onew/Makefile | 2 -- japanese/sj3-lib/Makefile | 2 +- japanese/sj3-server/Makefile | 2 +- lang/ghc/Makefile | 2 +- lang/tcl-wrapper/Makefile | 2 +- misc/amanda-perl-wrapper/Makefile | 2 -- net/pxe-pdhcp/Makefile | 2 +- print/ghostscript7-commfont/Makefile | 2 +- security/ca_root_nss/Makefile | 2 +- security/ipv6toolkit/Makefile | 2 +- x11/waybar/Makefile | 1 - 22 files changed, 11 insertions(+), 32 deletions(-) diff --git a/japanese/font-ayu18/Makefile b/japanese/font-ayu18/Makefile index 091d96ab6bf3..c5b8bcbb0487 100644 --- a/japanese/font-ayu18/Makefile +++ b/japanese/font-ayu18/Makefile @@ -25,8 +25,6 @@ PORTDOCS= README.txt OPTIONS_DEFINE= DOCS -pre-build: apply-slist - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} diff --git a/japanese/font-ayu20/Makefile b/japanese/font-ayu20/Makefile index 2425c7b4161d..68483c21034e 100644 --- a/japanese/font-ayu20/Makefile +++ b/japanese/font-ayu20/Makefile @@ -24,8 +24,6 @@ MAKEFILE= ${WRKDIR}/Makefile OPTIONS_DEFINE= DOCS -pre-build: apply-slist - post-install: ${INSTALL_DATA} ${FILESDIR}/fonts.alias \ ${STAGEDIR}${FONTSDIR} diff --git a/japanese/font-elisa10/Makefile b/japanese/font-elisa10/Makefile index 92d8f4f4a30d..76eded70419a 100644 --- a/japanese/font-elisa10/Makefile +++ b/japanese/font-elisa10/Makefile @@ -31,8 +31,6 @@ PLIST_FILES= ${FONTSDIR:S,^${PREFIX}/,,}/elisau10.pcf.gz \ OPTIONS_DEFINE= DOCS -pre-build: apply-slist - post-install: ${INSTALL_DATA} ${WRKSRC}/fonts.alias ${STAGEDIR}${FONTSDIR} diff --git a/japanese/font-elisa8/Makefile b/japanese/font-elisa8/Makefile index 2a13e94fe8c7..343485aa8130 100644 --- a/japanese/font-elisa8/Makefile +++ b/japanese/font-elisa8/Makefile @@ -31,8 +31,6 @@ PORTDOCS= elisa100.doc elisat10.doc elisat10.html OPTIONS_DEFINE= DOCS -pre-build: apply-slist - post-install: ${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${FONTSDIR} diff --git a/japanese/font-kaname12/Makefile b/japanese/font-kaname12/Makefile index 60964cda0f95..8eca432fee56 100644 --- a/japanese/font-kaname12/Makefile +++ b/japanese/font-kaname12/Makefile @@ -28,8 +28,6 @@ PORTDOCS= readme readme.kaname_bdf kaname.doc \ OPTIONS_DEFINE= DOCS -pre-build: apply-slist - post-install: ${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${FONTSDIR} diff --git a/japanese/font-kanji18/Makefile b/japanese/font-kanji18/Makefile index 68cd3ee52b42..f7c9b92e513e 100644 --- a/japanese/font-kanji18/Makefile +++ b/japanese/font-kanji18/Makefile @@ -50,8 +50,6 @@ post-extract: ${SED} -f ${RESIZESED_FILE} < ${PORTNAME}${PKGNAMESUFFIX}.bdf \ > ${PORTNAME}${RESIZESED_FILE:R:C/^[0-9][0-9]to//}.bdf -pre-build: apply-slist - post-install: ${INSTALL_DATA} ${FILESDIR}/fonts.alias.${PKGNAMESUFFIX} \ ${STAGEDIR}${FONTSDIR}/fonts.alias.${PKGNAMESUFFIX} diff --git a/japanese/font-kappa20/Makefile b/japanese/font-kappa20/Makefile index 4f57a62182cb..fda47394daee 100644 --- a/japanese/font-kappa20/Makefile +++ b/japanese/font-kappa20/Makefile @@ -26,7 +26,7 @@ PORTDOCS= README OPTIONS_DEFINE= DOCS -pre-build: apply-slist +pre-build: cd ${WRKSRC} && ${SH} makebdf.sh post-install-DOCS-on: diff --git a/japanese/font-marumoji/Makefile b/japanese/font-marumoji/Makefile index cb9af20d4523..088e532e287e 100644 --- a/japanese/font-marumoji/Makefile +++ b/japanese/font-marumoji/Makefile @@ -27,7 +27,7 @@ PKGDEINSTALL= ${WRKDIR}/pkg-install ${WRKSRC}/maru16.bdf: cd ${WRKSRC} && ${SED} -f m18to16.sed < maru18.bdf > maru16.bdf -pre-build: ${WRKSRC}/maru16.bdf apply-slist +pre-build: ${WRKSRC}/maru16.bdf ${INSTALL_DATA} ${WRKDIR}/Makefile ${WRKSRC} .include <bsd.port.mk> diff --git a/japanese/font-naga10/Makefile b/japanese/font-naga10/Makefile index cee4ddef6a67..7c2b0fb53db7 100644 --- a/japanese/font-naga10/Makefile +++ b/japanese/font-naga10/Makefile @@ -28,8 +28,6 @@ PORTDOCS= README OPTIONS_DEFINE= DOCS -pre-build: apply-slist - post-install: ${INSTALL_DATA} ${FILESDIR}/fonts.alias ${STAGEDIR}${FONTSDIR} diff --git a/japanese/font-shinonome/Makefile b/japanese/font-shinonome/Makefile index faab502e1d2b..99d4db095038 100644 --- a/japanese/font-shinonome/Makefile +++ b/japanese/font-shinonome/Makefile @@ -33,8 +33,6 @@ PORTDOCS= AUTHORS BUGS ChangeLog ChangeLog.0 DESIGN.12 DESIGN.14 \ DESIGN.16 DESIGN.18 INSTALL README THANKS TODO OPTIONS_DEFINE= DOCS -pre-build: apply-slist - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} diff --git a/japanese/kinput2/Makefile b/japanese/kinput2/Makefile index 01919d084507..9a8bfc9c511c 100644 --- a/japanese/kinput2/Makefile +++ b/japanese/kinput2/Makefile @@ -87,7 +87,7 @@ CONF+= ${${I}_CONF} CONF+= TRANSPORTDEFS="-DNO_TCP_TRANSPORT" .endif -pre-configure: apply-slist +pre-configure: ${INSTALL_DATA} ${WRKDIR}/Kinput2.conf ${WRKSRC}/Kinput2.conf ${PRINTF} "%s\n" ${CONF} > ${WRKSRC}/Kinput2_im.conf diff --git a/japanese/onew/Makefile b/japanese/onew/Makefile index 4b9492067cf3..cdbd6f96b6b9 100644 --- a/japanese/onew/Makefile +++ b/japanese/onew/Makefile @@ -51,8 +51,6 @@ RK_DIR+= ${RK_DIR.${I}} .endif .endfor -pre-build: apply-slist - do-build: .for I in ${INPUT_METHOD} ${INSTALL_DATA} ${WRKDIR}/ONEW_CONF-for-${I} ${WRKSRC}/ONEW_CONF diff --git a/japanese/sj3-lib/Makefile b/japanese/sj3-lib/Makefile index 16ace5c848f2..4d8624d4ad0c 100644 --- a/japanese/sj3-lib/Makefile +++ b/japanese/sj3-lib/Makefile @@ -33,7 +33,7 @@ POSTPATCHES= ${FILESDIR}/post-patch-Imakefile \ post-patch: cd ${WRKSRC} && ${CAT} ${POSTPATCHES} | ${PATCH} -pre-configure: apply-slist +pre-configure: ${INSTALL_DATA} ${WRKDIR}/sj3_freebsd.tmpl ${WRKSRC}/sj3_freebsd.tmpl .include <bsd.port.mk> diff --git a/japanese/sj3-server/Makefile b/japanese/sj3-server/Makefile index cba4966c7c42..961f1bf82ce6 100644 --- a/japanese/sj3-server/Makefile +++ b/japanese/sj3-server/Makefile @@ -54,7 +54,7 @@ post-patch: cd ${WRKSRC} && ${CAT} ${POSTPATCHES.nodocports} | ${PATCH} .endif -pre-configure: apply-slist +pre-configure: ${INSTALL_DATA} ${WRKDIR}/sj3_freebsd.tmpl ${WRKSRC}/sj3_freebsd.tmpl post-install: diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile index 0ff26f0384c5..93c57dca4853 100644 --- a/lang/ghc/Makefile +++ b/lang/ghc/Makefile @@ -205,7 +205,7 @@ post-patch: ${WRKSRC}/configure ${WRKSRC}/aclocal.m4 .endif -pre-configure: apply-slist +pre-configure: # Copy the subbed build.mk to the proper position ${CP} ${WRKDIR}/build.mk ${WRKSRC}/mk/build.mk diff --git a/lang/tcl-wrapper/Makefile b/lang/tcl-wrapper/Makefile index b96281c8c404..87a7e8d3b7b1 100644 --- a/lang/tcl-wrapper/Makefile +++ b/lang/tcl-wrapper/Makefile @@ -55,7 +55,7 @@ SUB_LIST+= ECHO_CMD="${ECHO_CMD}" GREP="${GREP}" LS="${LS}" \ TX_CAT="${TX_CAT}" TX_VER="${TX_VER}" TX_CONF="${TX_CONF}" \ TX_CONF_FULL="${TX_CONF_FULL:S/${STAGEDIR}//}" -do-build: apply-slist +do-build: ${MAKE_ENV} ${LOCALBASE}/bin/shc -r -f ${WRKDIR}/wrapper do-install: diff --git a/misc/amanda-perl-wrapper/Makefile b/misc/amanda-perl-wrapper/Makefile index 5fd3905c97a1..6ee038ddad74 100644 --- a/misc/amanda-perl-wrapper/Makefile +++ b/misc/amanda-perl-wrapper/Makefile @@ -18,8 +18,6 @@ PLIST_FILES= bin/perl-amanda do-fetch: @${DO_NADA} -pre-build: apply-slist - do-build: cd ${WRKSRC} && ${CC} -o perl-amanda ${WRKDIR}/perl-amanda.c diff --git a/net/pxe-pdhcp/Makefile b/net/pxe-pdhcp/Makefile index 1748b9805545..18c773d09a62 100644 --- a/net/pxe-pdhcp/Makefile +++ b/net/pxe-pdhcp/Makefile @@ -19,7 +19,7 @@ PORTDOCS= README.md OPTIONS_DEFINE= DOCS -post-extract: apply-slist +pre-build: @${INSTALL_DATA} ${WRKDIR}/Makefile ${FILESDIR}/${PORTNAME}.8 ${WRKSRC} .include <bsd.port.mk> diff --git a/print/ghostscript7-commfont/Makefile b/print/ghostscript7-commfont/Makefile index 0f6cd9cb3b43..a07997e7b914 100644 --- a/print/ghostscript7-commfont/Makefile +++ b/print/ghostscript7-commfont/Makefile @@ -31,7 +31,7 @@ CONFLICTS_INSTALL= \ CMAPDIR?= ${LOCALBASE}/share/fonts/adobe-cmaps GS_RESDIR?= share/ghostscript/Resource -post-extract: apply-slist +pre-build: @cd ${WRKDIR} && ${MV} Makefile template.* ${WRKSRC} .include <bsd.port.mk> diff --git a/security/ca_root_nss/Makefile b/security/ca_root_nss/Makefile index ae3860bd3f7e..58dda4ee0d18 100644 --- a/security/ca_root_nss/Makefile +++ b/security/ca_root_nss/Makefile @@ -34,7 +34,7 @@ BUNDLE_PROCESSOR= MAca-bundle.pl SUB_FILES= MAca-bundle.pl pkg-message SUB_LIST= VERSION_NSS=${VERSION_NSS} -do-build: apply-slist +do-build: @${SETENV} PATH=${LOCALBASE}/bin:$${PATH} \ ${PERL} ${WRKDIR}/${BUNDLE_PROCESSOR} \ < ${WRKSRC}/${CERTDATA_TXT_PATH} > \ diff --git a/security/ipv6toolkit/Makefile b/security/ipv6toolkit/Makefile index fe59f81e9c24..e2969e85033d 100644 --- a/security/ipv6toolkit/Makefile +++ b/security/ipv6toolkit/Makefile @@ -26,7 +26,7 @@ OPTIONS_DEFINE= DOCS post-extract: @cd ${WRKSRC} && ${MKDIR} ${PROGDIRS} ${LIBDIRS} -post-patch: apply-slist +pre-build: ${INSTALL_DATA} ${WRKDIR}/BSDMakefile ${WRKSRC} for D in ${PROGDIRS}; do \ ${INSTALL_DATA} ${WRKDIR}/Makefile ${WRKSRC}/$$D; \ diff --git a/x11/waybar/Makefile b/x11/waybar/Makefile index e00a59de249d..2a517a1ad3fa 100644 --- a/x11/waybar/Makefile +++ b/x11/waybar/Makefile @@ -29,7 +29,6 @@ PLIST_FILES= bin/${PORTNAME} \ .if exists(${.CURDIR}/files/date.pc.in) CONFIGURE_ENV+= PKG_CONFIG_PATH="${WRKDIR}" SUB_FILES+= date.pc -post-patch: apply-slist .endif OPTIONS_DEFINE= DBUS GLS ICONSFONT MANPAGES MPD PULSEAUDIO SNDIO UDEV
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104141541.13EFff5p030211>