diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2013-09-23 19:24:41 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2013-09-23 19:24:41 +0800 |
| commit | 84a95842ad19be27ef67cf14b849b13ccd0d71e3 (patch) | |
| tree | 8c1af8161e6a14476d1da1395fade0bc3e9cf752 /ports-mgmt/poudriere | |
| parent | 7ad845156f5c231e590c87fa83d7d24bda79ee65 (diff) | |
| download | freebsd-ports-gnome-84a95842ad19be27ef67cf14b849b13ccd0d71e3.tar.gz freebsd-ports-gnome-84a95842ad19be27ef67cf14b849b13ccd0d71e3.tar.zst freebsd-ports-gnome-84a95842ad19be27ef67cf14b849b13ccd0d71e3.zip | |
- Support STAGEDIR
Diffstat (limited to 'ports-mgmt/poudriere')
| -rw-r--r-- | ports-mgmt/poudriere/Makefile | 10 | ||||
| -rw-r--r-- | ports-mgmt/poudriere/files/patch-Makefile | 34 | ||||
| -rw-r--r-- | ports-mgmt/poudriere/files/patch-src__libexec__poudriere__Makefile | 20 |
3 files changed, 58 insertions, 6 deletions
diff --git a/ports-mgmt/poudriere/Makefile b/ports-mgmt/poudriere/Makefile index 69b50b63533f..b9cea88816e6 100644 --- a/ports-mgmt/poudriere/Makefile +++ b/ports-mgmt/poudriere/Makefile @@ -13,15 +13,13 @@ COMMENT= Port build and test system LICENSE= BSD -MANCOMPRESSED= yes -MAN8= poudriere.8 - OPTIONS_DEFINE= ZSH CONFLICTS_INSTALL= poudriere-devel PLIST_FILES= etc/poudriere.conf.sample \ bin/poudriere \ + man/man8/poudriere.8.gz \ libexec/poudriere/dirwatch \ libexec/poudriere/dirempty \ libexec/poudriere/make_index \ @@ -52,7 +50,6 @@ PLIST_DIRS= libexec/poudriere \ share/poudriere/html \ share/poudriere -NO_STAGE= yes .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MZSH} @@ -63,8 +60,9 @@ PLIST_DIRSTRY+= share/zsh/ post-install: .if ${PORT_OPTIONS:MZSH} - @${MKDIR} ${PREFIX}/share/zsh/site-functions/ - @${INSTALL_DATA} ${WRKSRC}/zsh-completions ${PREFIX}/share/zsh/site-functions/_poudriere + @${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/ + @${INSTALL_DATA} ${WRKSRC}/zsh-completions \ + ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_poudriere .endif .include <bsd.port.mk> diff --git a/ports-mgmt/poudriere/files/patch-Makefile b/ports-mgmt/poudriere/files/patch-Makefile new file mode 100644 index 000000000000..ed756777ef68 --- /dev/null +++ b/ports-mgmt/poudriere/files/patch-Makefile @@ -0,0 +1,34 @@ +--- ./Makefile.orig 2013-09-22 20:24:45.271132014 -0500 ++++ ./Makefile 2013-09-22 20:26:48.067130247 -0500 +@@ -5,17 +5,22 @@ + ${MAKE} -C src/libexec/poudriere + + install: +- install -m 755 -o root -g wheel src/bin/poudriere.sh ${PREFIX}/bin/poudriere +- mkdir -p ${PREFIX}/share/poudriere +- mkdir -p ${PREFIX}/share/poudriere/awk +- mkdir -p ${PREFIX}/share/poudriere/html +- install -m 755 -o root -g wheel src/share/poudriere/*.sh ${PREFIX}/share/poudriere/ +- install -m 644 -o root -g wheel src/share/poudriere/awk/* ${PREFIX}/share/poudriere/awk/ +- install -m 644 -o root -g wheel src/share/poudriere/html/* ${PREFIX}/share/poudriere/html/ +- install -m 644 -o root -g wheel conf/poudriere.conf.sample ${PREFIX}/etc/ ++ install -m 755 -o root -g wheel src/bin/poudriere.sh \ ++ ${DESTDIR}${PREFIX}/bin/poudriere ++ mkdir -p ${DESTDIR}${PREFIX}/share/poudriere ++ mkdir -p ${DESTDIR}${PREFIX}/share/poudriere/awk ++ mkdir -p ${DESTDIR}${PREFIX}/share/poudriere/html ++ install -m 755 -o root -g wheel src/share/poudriere/*.sh \ ++ ${DESTDIR}${PREFIX}/share/poudriere/ ++ install -m 644 -o root -g wheel src/share/poudriere/awk/* \ ++ ${DESTDIR}${PREFIX}/share/poudriere/awk/ ++ install -m 644 -o root -g wheel src/share/poudriere/html/* \ ++ ${DESTDIR}${PREFIX}/share/poudriere/html/ ++ install -m 644 -o root -g wheel conf/poudriere.conf.sample \ ++ ${DESTDIR}${PREFIX}/etc/ + if [ -f poudriere.8.gz ]; then rm -f poudriere.8.gz; fi + gzip -k -9 poudriere.8 +- install -m 644 poudriere.8.gz ${MAN8DIR} ++ install -m 644 poudriere.8.gz ${DESTDIR}${MAN8DIR} + ${MAKE} -C src/libexec/poudriere install + + clean: diff --git a/ports-mgmt/poudriere/files/patch-src__libexec__poudriere__Makefile b/ports-mgmt/poudriere/files/patch-src__libexec__poudriere__Makefile new file mode 100644 index 000000000000..d4761c2e637d --- /dev/null +++ b/ports-mgmt/poudriere/files/patch-src__libexec__poudriere__Makefile @@ -0,0 +1,20 @@ +--- ./src/libexec/poudriere/Makefile.orig 2013-09-22 20:26:56.291128390 -0500 ++++ ./src/libexec/poudriere/Makefile 2013-09-22 20:27:15.594134042 -0500 +@@ -12,10 +12,13 @@ + ${CC} -Wall -Werror ${CFLAGS} make_index.c -o make_index -lsbuf + + install: dirwatch make_index dirempty +- mkdir -p ${PREFIX}/libexec/poudriere +- install -m 755 -o root -g wheel dirwatch ${PREFIX}/libexec/poudriere +- install -m 755 -o root -g wheel make_index ${PREFIX}/libexec/poudriere +- install -m 755 -o root -g wheel dirempty ${PREFIX}/libexec/poudriere ++ mkdir -p ${DESTDIR}${PREFIX}/libexec/poudriere ++ install -m 755 -o root -g wheel dirwatch \ ++ ${DESTDIR}${PREFIX}/libexec/poudriere ++ install -m 755 -o root -g wheel make_index \ ++ ${DESTDIR}${PREFIX}/libexec/poudriere ++ install -m 755 -o root -g wheel dirempty \ ++ ${DESTDIR}${PREFIX}/libexec/poudriere + + clean: + rm -f dirwatch make_index dirempty |