Date: Tue, 31 Mar 2015 15:31:50 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r382834 - in head/sysutils: pbi-manager pcbsd-appweb pcbsd-libsh pcbsd-syscache pcbsd-utils Message-ID: <201503311531.t2VFVo0v053233@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Tue Mar 31 15:31:49 2015 New Revision: 382834 URL: https://svnweb.freebsd.org/changeset/ports/382834 QAT: https://qat.redports.org/buildarchive/r382834/ Log: Remove useless execution of script Simplify Makefile and make it respects the common framework variable Modified: head/sysutils/pbi-manager/Makefile head/sysutils/pcbsd-appweb/Makefile head/sysutils/pcbsd-libsh/Makefile head/sysutils/pcbsd-syscache/Makefile head/sysutils/pcbsd-utils/Makefile Modified: head/sysutils/pbi-manager/Makefile ============================================================================== --- head/sysutils/pbi-manager/Makefile Tue Mar 31 15:23:53 2015 (r382833) +++ head/sysutils/pbi-manager/Makefile Tue Mar 31 15:31:49 2015 (r382834) @@ -17,6 +17,7 @@ RUN_DEPENDS= ${LOCALBASE}/share/pcbsd/sc WRKSRC= ${WRKDIR}/pbi-manager USES= pkgconfig tar:xz NO_BUILD= yes +MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} .include <bsd.port.pre.mk> @@ -24,10 +25,4 @@ NO_BUILD= yes IGNORE= requires FreeBSD 10 or later .endif -do-install: - cd ${WRKSRC} && make install PREFIX=${STAGEDIR}${PREFIX} - -post-install: - PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - .include <bsd.port.post.mk> Modified: head/sysutils/pcbsd-appweb/Makefile ============================================================================== --- head/sysutils/pcbsd-appweb/Makefile Tue Mar 31 15:23:53 2015 (r382833) +++ head/sysutils/pcbsd-appweb/Makefile Tue Mar 31 15:31:49 2015 (r382834) @@ -23,6 +23,7 @@ USE_PHP= gd filter session WRKSRC= ${WRKDIR}/src-webui USES= pkgconfig tar:xz NO_BUILD= yes +MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} .include <bsd.port.pre.mk> @@ -30,10 +31,4 @@ NO_BUILD= yes IGNORE= requires FreeBSD 10 or later .endif -do-install: - cd ${WRKSRC} && make install PREFIX=${STAGEDIR}${PREFIX} - -post-install: - PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - .include <bsd.port.post.mk> Modified: head/sysutils/pcbsd-libsh/Makefile ============================================================================== --- head/sysutils/pcbsd-libsh/Makefile Tue Mar 31 15:23:53 2015 (r382833) +++ head/sysutils/pcbsd-libsh/Makefile Tue Mar 31 15:31:49 2015 (r382834) @@ -15,6 +15,7 @@ LICENSE= BSD WRKSRC= ${WRKDIR}/libsh USES= pkgconfig tar:xz NO_BUILD= yes +MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} .include <bsd.port.pre.mk> @@ -22,10 +23,4 @@ NO_BUILD= yes IGNORE= requires FreeBSD 10 or later .endif -do-install: - cd ${WRKSRC} && make install PREFIX=${STAGEDIR}${PREFIX} - -post-install: - PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - .include <bsd.port.post.mk> Modified: head/sysutils/pcbsd-syscache/Makefile ============================================================================== --- head/sysutils/pcbsd-syscache/Makefile Tue Mar 31 15:23:53 2015 (r382833) +++ head/sysutils/pcbsd-syscache/Makefile Tue Mar 31 15:31:49 2015 (r382834) @@ -16,6 +16,7 @@ WRKSRC= ${WRKDIR}/syscache USE_QT5= core network buildtools qmake USES= pkgconfig tar:xz NO_BUILD= yes +MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} .include <bsd.port.pre.mk> @@ -23,10 +24,4 @@ NO_BUILD= yes IGNORE= requires FreeBSD 10 or later .endif -do-install: - cd ${WRKSRC} && make install PREFIX=${STAGEDIR}${PREFIX} - -post-install: - PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - .include <bsd.port.post.mk> Modified: head/sysutils/pcbsd-utils/Makefile ============================================================================== --- head/sysutils/pcbsd-utils/Makefile Tue Mar 31 15:23:53 2015 (r382833) +++ head/sysutils/pcbsd-utils/Makefile Tue Mar 31 15:31:49 2015 (r382834) @@ -21,6 +21,7 @@ CONFLICTS?= pbi-manager-[0-9]* USE_QT5= core network buildtools qmake USES= pkgconfig tar:xz NO_BUILD= yes +MAKE_ARGS= PREFIX=${STAGEDIR}${PREFIX} .include <bsd.port.pre.mk> @@ -28,10 +29,4 @@ NO_BUILD= yes IGNORE= requires FreeBSD 10 or later .endif -do-install: - cd ${WRKSRC} && make install PREFIX=${STAGEDIR}${PREFIX} - -post-install: - PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL - .include <bsd.port.post.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201503311531.t2VFVo0v053233>