diff options
| -rw-r--r-- | net/corkscrew/Makefile | 5 | ||||
| -rw-r--r-- | net/httping/Makefile | 9 | ||||
| -rw-r--r-- | net/micro_proxy/Makefile | 8 | ||||
| -rw-r--r-- | net/minissdpd/Makefile | 12 | ||||
| -rw-r--r-- | net/nyancat/Makefile | 3 | ||||
| -rw-r--r-- | net/recvnet/Makefile | 3 | ||||
| -rw-r--r-- | net/socat/Makefile | 12 |
7 files changed, 20 insertions, 32 deletions
diff --git a/net/corkscrew/Makefile b/net/corkscrew/Makefile index 7577caa7b1cf..961927179294 100644 --- a/net/corkscrew/Makefile +++ b/net/corkscrew/Makefile @@ -17,14 +17,13 @@ GNU_CONFIGURE= yes OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> post-install: .if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in NEWS README TODO - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor .endif diff --git a/net/httping/Makefile b/net/httping/Makefile index f3db025de8ba..b16e1ba1dc77 100644 --- a/net/httping/Makefile +++ b/net/httping/Makefile @@ -13,15 +13,12 @@ COMMENT= Ping-like tool for HTTP requests USES= gmake gettext -MAN1= httping.1 -PLIST_FILES= bin/httping +PLIST_FILES= bin/httping man/man1/httping.1.gz OPTIONS_DEFINE= NCURSES FFTW SSL OPTIONS_DEFAULT=NCURSES SSL -NO_STAGE= yes - .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MNCURSES} @@ -46,7 +43,7 @@ MAKE_ENV+= SSL=no .endif do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/${MAN1} ${MANPREFIX}/man/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1 .include <bsd.port.mk> diff --git a/net/micro_proxy/Makefile b/net/micro_proxy/Makefile index 7ecf8fa86561..bc50f0b8820c 100644 --- a/net/micro_proxy/Makefile +++ b/net/micro_proxy/Makefile @@ -12,18 +12,16 @@ MAINTAINER= ehaupt@FreeBSD.org COMMENT= Really small HTTP/HTTPS proxy WRKSRC= ${WRKDIR}/${PORTNAME} -PLIST_FILES= libexec/micro_proxy -MAN8= micro_proxy.8 +PLIST_FILES= libexec/micro_proxy man/man8/micro_proxy.8.gz SUB_FILES= pkg-message -NO_STAGE= yes do-build: ${CC} ${CFLAGS} -c ${WRKSRC}/${PORTNAME}.c -o ${WRKSRC}/${PORTNAME}.o ${CC} ${CFLAGS} ${WRKSRC}/${PORTNAME}.o -o ${WRKSRC}/${PORTNAME} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/libexec - ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${MANPREFIX}/man/man8 + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/libexec + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MANPREFIX}/man/man8 post-install: @${CAT} ${PKGMESSAGE} diff --git a/net/minissdpd/Makefile b/net/minissdpd/Makefile index 9a8c624a67c6..5249da121c56 100644 --- a/net/minissdpd/Makefile +++ b/net/minissdpd/Makefile @@ -15,19 +15,17 @@ USE_RC_SUBR= minissdpd CFLAGS+= -D_GNU_SOURCE -MAN8= minissdpd.8 -PLIST_FILES= sbin/minissdpd +PLIST_FILES= sbin/minissdpd man/man8/minissdpd.8.gz -NO_STAGE= yes post-extract: - @${MV} ${WRKSRC}/${PORTNAME}.1 ${WRKSRC}/${MAN8} + @${MV} ${WRKSRC}/${PORTNAME}.1 ${WRKSRC}/${PORTNAME}.8 post-patch: - @${REINPLACE_CMD} -e 's|^\(\.TH.*\)1|\18|' ${WRKSRC}/${MAN8} + @${REINPLACE_CMD} -e 's|^\(\.TH.*\)1|\18|' ${WRKSRC}/${PORTNAME}.8 @${REINPLACE_CMD} -E '/^(CC|CFLAGS)/d' ${WRKSRC}/Makefile do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/${MAN8} ${MANPREFIX}/man/man8 + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin + ${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.8 ${STAGEDIR}${MANPREFIX}/man/man8 .include <bsd.port.mk> diff --git a/net/nyancat/Makefile b/net/nyancat/Makefile index bcf6f19ce3ea..234f42a7d55f 100644 --- a/net/nyancat/Makefile +++ b/net/nyancat/Makefile @@ -19,9 +19,8 @@ PLIST_FILES= bin/nyancat WRKSRC= ${WRKDIR}/${GH_ACCOUNT}-${PORTNAME}-${GH_COMMIT} -NO_STAGE= yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME} ${STAGEDIR}${PREFIX}/bin post-install: @${CAT} ${PKGMESSAGE} diff --git a/net/recvnet/Makefile b/net/recvnet/Makefile index ed6534ad8246..55dd38997fe7 100644 --- a/net/recvnet/Makefile +++ b/net/recvnet/Makefile @@ -16,12 +16,11 @@ LDFLAGS+= -lcurses PLIST_FILES= bin/recvnet -NO_STAGE= yes do-build: ${CC} ${CFLAGS} -c ${WRKSRC}/${PORTNAME}.c -o ${WRKSRC}/${PORTNAME}.o ${CC} ${LDFLAGS} ${WRKSRC}/${PORTNAME}.o -o ${WRKSRC}/${PORTNAME} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin .include <bsd.port.mk> diff --git a/net/socat/Makefile b/net/socat/Makefile index dd08e707627e..098fb6ddff16 100644 --- a/net/socat/Makefile +++ b/net/socat/Makefile @@ -20,13 +20,11 @@ USE_OPENSSL= yes PORTSCOUT= skipv:2.0.0-b2 -MAN1= socat.1 -PLIST_FILES= bin/filan bin/procan bin/socat +PLIST_FILES= bin/filan bin/procan bin/socat man/man1/socat.1.gz PORTDOCS= EXAMPLES README SECURITY FAQ OPTIONS_DEFINE= DOCS -NO_STAGE= yes .include <bsd.port.options.mk> .if defined(WITH_OPENSSL_PORT) @@ -42,12 +40,12 @@ CFLAGS+= -Wno-unused-comparison do-install: .for f in filan procan socat - ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin .endfor - ${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${MAN1PREFIX}/man/man1 + ${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${STAGEDIR}${MAN1PREFIX}/man/man1 .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .endif .if ${ARCH} == "arm" |