diff options
| author | Alex Kozlov <ak@FreeBSD.org> | 2013-10-16 11:27:24 +0000 |
|---|---|---|
| committer | Alex Kozlov <ak@FreeBSD.org> | 2013-10-16 11:27:24 +0000 |
| commit | b41129a04e6d98e435f89564196100db640d046d (patch) | |
| tree | 9a742772b5d006fbeed96e3bac3346b394bb38b0 /archivers | |
| parent | Fix at cross-device build (use "ln -sf" rather "ln -f"): (diff) | |
- Support STAGEDIR
Notes
Notes:
svn path=/head/; revision=330498
Diffstat (limited to 'archivers')
| -rw-r--r-- | archivers/squsq/Makefile | 5 | ||||
| -rw-r--r-- | archivers/szip/Makefile | 11 | ||||
| -rw-r--r-- | archivers/unalz/Makefile | 5 |
3 files changed, 7 insertions, 14 deletions
diff --git a/archivers/squsq/Makefile b/archivers/squsq/Makefile index e5e0f4a11976..d4e5e861d926 100644 --- a/archivers/squsq/Makefile +++ b/archivers/squsq/Makefile @@ -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> diff --git a/archivers/szip/Makefile b/archivers/szip/Makefile index 410464864c13..4b365fedfc59 100644 --- a/archivers/szip/Makefile +++ b/archivers/szip/Makefile @@ -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> diff --git a/archivers/unalz/Makefile b/archivers/unalz/Makefile index cb000570ff33..900273cbb713 100644 --- a/archivers/unalz/Makefile +++ b/archivers/unalz/Makefile @@ -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> |