Date: Wed, 16 Oct 2013 11:27:25 +0000 (UTC) From: Alex Kozlov <ak@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330498 - in head/archivers: squsq szip unalz Message-ID: <201310161127.r9GBRPRB068837@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ak Date: Wed Oct 16 11:27:24 2013 New Revision: 330498 URL: http://svnweb.freebsd.org/changeset/ports/330498 Log: - Support STAGEDIR Modified: head/archivers/squsq/Makefile (contents, props changed) head/archivers/szip/Makefile head/archivers/unalz/Makefile Modified: head/archivers/squsq/Makefile ============================================================================== --- head/archivers/squsq/Makefile Wed Oct 16 10:58:13 2013 (r330497) +++ head/archivers/squsq/Makefile Wed Oct 16 11:27:24 2013 (r330498) @@ -4,13 +4,12 @@ PORTNAME= squsq PORTVERSION= 3.3 CATEGORIES= archivers -MASTER_SITES= NETBSD http://freebsd.nsu.ru/distfiles/ +MASTER_SITES= http://freebsd.nsu.ru/distfiles/ NETBSD DISTNAME= t20-squsq-3.3 MAINTAINER= ports@FreeBSD.org COMMENT= Compressor/decompressor for CP/M "Squeeze" compressed files -NO_STAGE= yes CONFLICTS= squirrel-[0-9]* WRKSRC= ${WRKDIR}/t20-squsq MAKEFILE= ${FILESDIR}/Makefile @@ -19,6 +18,6 @@ CFLAGS+= -Wno-error=return-type PLIST_FILES= bin/sq bin/usq do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/sq ${WRKSRC}/usq ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/sq ${WRKSRC}/usq ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> Modified: head/archivers/szip/Makefile ============================================================================== --- head/archivers/szip/Makefile Wed Oct 16 10:58:13 2013 (r330497) +++ head/archivers/szip/Makefile Wed Oct 16 11:27:24 2013 (r330498) @@ -13,15 +13,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Fast compression utility USES= gmake -NO_STAGE= yes WRKSRC= ${WRKDIR} PLIST_FILES= bin/${PORTNAME} PORTDOCS= *.txt -.include <bsd.port.options.mk> - post-patch: @${REINPLACE_CMD} -e 's,more logfile,cat logfile,' \ -e "s,^CFLAGS.*,CFLAGS= ${CFLAGS}," \ @@ -31,10 +28,8 @@ do-build: ${GMAKE} -C ${WRKDIR} do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/*.txt ${DOCSDIR} -.endif + ${INSTALL_PROGRAM} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKDIR}/*.txt ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/archivers/unalz/Makefile ============================================================================== --- head/archivers/unalz/Makefile Wed Oct 16 10:58:13 2013 (r330497) +++ head/archivers/unalz/Makefile Wed Oct 16 11:27:24 2013 (r330498) @@ -15,10 +15,9 @@ LICENSE_FILE= ${WRKSRC}/readme.txt WRKSRC= ${WRKDIR}/${PORTNAME} -NO_STAGE= yes USES= iconv USE_DOS2UNIX= yes -MAKE_ARGS= CPP="${CXX}" CC="${CC}" OBJ="${UNALZ_OBJS}" \ +MAKE_ARGS+= CPP="${CXX}" CC="${CC}" OBJ="${UNALZ_OBJS}" \ LDFLAGS="${LDFLAGS}" CFLAGS="${CFLAGS}" ALL_TARGET= posix-utf8 @@ -35,6 +34,6 @@ post-patch: '/<sys\/timeb.h>/d' ${WRKSRC}/main.cpp do-install: - (cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} ${PREFIX}/bin) + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310161127.r9GBRPRB068837>