cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Update to 3.0.7

Browse Source 
Changes:
  - Respect DESTDIR on poudriere install
  - testport -i: Fix when orphans are found with staging
  - bulk -v: Reword distfiles message
  - bulk: Fix INDEX building showing wrong origins
  - bulk: Remove stray " done" message
  - Staging fixes for testing ports-mgmt/pkg [1]
  - jail: Deprecate csup [2]

Reported by:	madpilot [1]
Submitted by:	brd [2]
This commit is contained in:
Bryan Drewery 2013-09-24 02:17:45 +00:00
parent 27f024e3d5
commit b32119ff8e
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=328084
6 changed files with 3 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ports-mgmt/poudriere/Makefile
View File

@ -1,8 +1,7 @@
# $FreeBSD$
PORTNAME= poudriere
PORTVERSION= 3.0.6
PORTREVISION= 2
PORTVERSION= 3.0.7
CATEGORIES= ports-mgmt
MASTER_SITES= http://fossil.etoilebsd.net/poudriere/tarball/ \
LOCAL/bdrewery/${PORTNAME}/

4
ports-mgmt/poudriere/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (poudriere-3.0.6.tar.gz?uuid=3.0.6) = 6bf68e150d56971416248c1b7958adf86b09d6640cd174e2144f0bc4c8fa94a9
SIZE (poudriere-3.0.6.tar.gz?uuid=3.0.6) = 109681
SHA256 (poudriere-3.0.7.tar.gz?uuid=3.0.7) = 31f596d99a1cc52301fb80a521c2148b5513006751a04c3f8c950f1e98aeb66e
SIZE (poudriere-3.0.7.tar.gz?uuid=3.0.7) = 109928

34
ports-mgmt/poudriere/files/patch-Makefile
View File

@ -1,34 +0,0 @@
--- ./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:

20
ports-mgmt/poudriere/files/patch-src__libexec__poudriere__Makefile
View File

@ -1,20 +0,0 @@
--- ./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

14
ports-mgmt/poudriere/files/patch-src__share__poudriere__common.sh
View File

@ -1,14 +0,0 @@
--- ./src/share/poudriere/common.sh.orig 2013-09-23 10:17:57.011126466 -0500
+++ ./src/share/poudriere/common.sh 2013-09-23 10:18:06.769131620 -0500
@@ -588,10 +588,7 @@
zfs snapshot ${fs}@${name}
fi
- if [ $domtree -eq 0 ]; then
- echo " done"
- return 0
- fi
+ [ $domtree -eq 0 ] && return 0
mkdir -p ${mnt}/poudriere/
case "${name}" in

11
ports-mgmt/poudriere/files/patch-src__share__poudriere__testport.sh
View File

@ -1,11 +0,0 @@
--- ./src/share/poudriere/testport.sh.orig 2013-09-23 08:16:41.841131967 -0500
+++ ./src/share/poudriere/testport.sh 2013-09-23 08:16:54.533133490 -0500
@@ -185,7 +185,7 @@
if [ -f ${MASTERMNT}/tmp/pkgs/${PKGNAME}.${PKG_EXT} ]; then
msg "Installing from package"
- injail ${PKG_ADD} /tmp/pkgs/${PKGNAME}.${PKG_EXT}
+ injail ${PKG_ADD} /tmp/pkgs/${PKGNAME}.${PKG_EXT} || :
fi
# Interactive test mode