Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 Feb 2019 13:48:07 +0000 (UTC)
From:      Tobias Kortkamp <tobik@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r491958 - in head: devel/flex-sdk devel/flex-sdk35 games/tuxfighter mail/postfinger mail/vrfy misc/amanda-perl-wrapper misc/nsf misc/tkregexp
Message-ID:  <201902021348.x12Dm7qA022679@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tobik
Date: Sat Feb  2 13:48:07 2019
New Revision: 491958
URL: https://svnweb.freebsd.org/changeset/ports/491958

Log:
  Unbreak things broken by my previous incomplete commits
  
  Pointy hat:	tobik

Modified:
  head/devel/flex-sdk/Makefile
  head/devel/flex-sdk35/Makefile
  head/games/tuxfighter/Makefile
  head/mail/postfinger/Makefile
  head/mail/vrfy/Makefile
  head/misc/amanda-perl-wrapper/Makefile
  head/misc/nsf/Makefile
  head/misc/tkregexp/Makefile

Modified: head/devel/flex-sdk/Makefile
==============================================================================
--- head/devel/flex-sdk/Makefile	Sat Feb  2 13:40:43 2019	(r491957)
+++ head/devel/flex-sdk/Makefile	Sat Feb  2 13:48:07 2019	(r491958)
@@ -28,7 +28,7 @@ post-extract:
 
 do-install:
 .for i in ${SCRIPTS}
-	${INSTALL_SCRIPT} ${WRKSRC}/${i}.sh ${STAGEDIR}${PREFIX}/bin/${i}
+	${INSTALL_SCRIPT} ${WRKDIR}/${i}.sh ${STAGEDIR}${PREFIX}/bin/${i}
 .endfor
 
 	${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}

Modified: head/devel/flex-sdk35/Makefile
==============================================================================
--- head/devel/flex-sdk35/Makefile	Sat Feb  2 13:40:43 2019	(r491957)
+++ head/devel/flex-sdk35/Makefile	Sat Feb  2 13:48:07 2019	(r491958)
@@ -31,7 +31,7 @@ post-extract:
 
 do-install:
 .for i in ${SCRIPTS}
-	${INSTALL_SCRIPT} ${WRKSRC}/${i}.sh ${STAGEDIR}${PREFIX}/bin/${i}
+	${INSTALL_SCRIPT} ${WRKDIR}/${i}.sh ${STAGEDIR}${PREFIX}/bin/${i}
 .endfor
 
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}

Modified: head/games/tuxfighter/Makefile
==============================================================================
--- head/games/tuxfighter/Makefile	Sat Feb  2 13:40:43 2019	(r491957)
+++ head/games/tuxfighter/Makefile	Sat Feb  2 13:48:07 2019	(r491958)
@@ -52,7 +52,7 @@ do-install:
 
 .for s in ${ICON_SIZES}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/
-	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}_${s}.png \
 		${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
 .endfor
 	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \

Modified: head/mail/postfinger/Makefile
==============================================================================
--- head/mail/postfinger/Makefile	Sat Feb  2 13:40:43 2019	(r491957)
+++ head/mail/postfinger/Makefile	Sat Feb  2 13:48:07 2019	(r491958)
@@ -13,7 +13,7 @@ COMMENT=	Postfix Configuration Summary Reporter
 
 EXTRACT_CMD=		${CP}
 EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS=	${WRKDIR}
+EXTRACT_AFTER_ARGS=	${WRKSRC}
 NO_BUILD=		yes
 NO_WRKSUBDIR=		yes
 

Modified: head/mail/vrfy/Makefile
==============================================================================
--- head/mail/vrfy/Makefile	Sat Feb  2 13:40:43 2019	(r491957)
+++ head/mail/vrfy/Makefile	Sat Feb  2 13:48:07 2019	(r491958)
@@ -16,6 +16,6 @@ NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/vrfy
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/vrfy ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/vrfy ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>

Modified: head/misc/amanda-perl-wrapper/Makefile
==============================================================================
--- head/misc/amanda-perl-wrapper/Makefile	Sat Feb  2 13:40:43 2019	(r491957)
+++ head/misc/amanda-perl-wrapper/Makefile	Sat Feb  2 13:48:07 2019	(r491958)
@@ -23,10 +23,10 @@ do-fetch:
 pre-build: apply-slist
 
 do-build:
-	cd ${WRKSRC} && ${CC} -o perl-amanda perl-amanda.c
+	cd ${WRKSRC} && ${CC} -o perl-amanda ${WRKDIR}/perl-amanda.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/perl-amanda ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/perl-amanda ${STAGEDIR}${PREFIX}/bin/
 
 .include <bsd.port.pre.mk>
 

Modified: head/misc/nsf/Makefile
==============================================================================
--- head/misc/nsf/Makefile	Sat Feb  2 13:40:43 2019	(r491957)
+++ head/misc/nsf/Makefile	Sat Feb  2 13:48:07 2019	(r491958)
@@ -17,7 +17,7 @@ PLIST_FILES=	bin/nsf man/man1/nsf.1.gz
 ALL_TARGET=
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKDIR}/nsf ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKDIR}/nsf.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/nsf ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/nsf.1 ${STAGEDIR}${PREFIX}/man/man1
 
 .include <bsd.port.mk>

Modified: head/misc/tkregexp/Makefile
==============================================================================
--- head/misc/tkregexp/Makefile	Sat Feb  2 13:40:43 2019	(r491957)
+++ head/misc/tkregexp/Makefile	Sat Feb  2 13:48:07 2019	(r491958)
@@ -20,12 +20,12 @@ NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/tkregexp
 
 post-extract:
-	${CP} ${DISTDIR}/${DISTFILES} ${WRKDIR}
+	${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}
 
 post-patch:
-	${REINPLACE_CMD} -e "1s|^\(.*\)|#!${WISH}|; 2d" ${WRKDIR}/visual_regexp-${PORTVERSION}.tcl
+	${REINPLACE_CMD} -e "1s|^\(.*\)|#!${WISH}|; 2d" ${WRKSRC}/visual_regexp-${PORTVERSION}.tcl
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/visual_regexp-${PORTVERSION}.tcl ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKSRC}/visual_regexp-${PORTVERSION}.tcl ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902021348.x12Dm7qA022679>