Attachment #190076 for bug #225457





PORTNAME=	poudriere
DISTVERSION=	3.2.4
PORTREVISION=	1
CATEGORIES=	ports-mgmt
MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
		http://mirror.shatow.net/freebsd/${PORTNAME}/ \

GNU_CONFIGURE=	yes
ETCDIR=		${PREFIX}/etc/poudriere.d

OPTIONS_DEFINE=	DIALOG4PORTS ZSH QEMU EXAMPLES
OPTIONS_DEFAULT=DIALOG4PORTS ZSH
OPTIONS_SUB=	yes

RUN_DEPENDS+=	ca_root_nss>=0:security/ca_root_nss
RUN_DEPENDS+=	freebsd-release-manifests>0:misc/freebsd-release-manifests

DIALOG4PORTS_DESC=	Install dialog4ports (necessary for options command) as runtime dependency
DIALOG4PORTS_RUN_DEPENDS=	dialog4ports>0:ports-mgmt/dialog4ports
QEMU_DESC=	Add qemu-user-static to compile ports for non-x86 architectures
QEMU_RUN_DEPENDS=	qemu-user-static>0:emulators/qemu-user-static

.include <bsd.port.options.mk>

# rm -x support came in 10.0.  A bundled rm is used if not supported in base.
# While <10 is technically not supported in the Ports Tree, Poudriere
# detects this and it being a package build tool it should still be
# supported as a user may be installing this to build packages for upgrading
# their system to a supported release.
.if ${OSVERSION} < 1000000
PLIST_SUB+=	RM=""
.else
PLIST_SUB+=	RM="@comment "
.endif

post-patch:
	${CP} -f ${WRKSRC}/src/bin/poudriere ${WRKSRC}/poudriere
	${REINPLACE_CMD} \

Lines 18-24 Link Here

(-)ports-mgmt/poudriere/pkg-plist (-1 lines)
18	libexec/poudriere/pwait	18	libexec/poudriere/pwait
19	libexec/poudriere/rename	19	libexec/poudriere/rename
20	libexec/poudriere/rexec	20	libexec/poudriere/rexec
21	%%RM%%libexec/poudriere/rm
22	libexec/poudriere/sh	21	libexec/poudriere/sh
23	libexec/poudriere/timeout	22	libexec/poudriere/timeout
24	libexec/poudriere/timestamp	23	libexec/poudriere/timestamp





PORTNAME=	poudriere
DISTVERSION=	3.2.99.20180105
PORTREVISION=	2
CATEGORIES=	ports-mgmt
MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
		http://mirror.shatow.net/freebsd/${PORTNAME}/ \

GNU_CONFIGURE=	yes
ETCDIR=		${PREFIX}/etc/poudriere.d

OPTIONS_DEFINE=	DIALOG4PORTS ZSH QEMU EXAMPLES
OPTIONS_DEFAULT=DIALOG4PORTS ZSH
OPTIONS_SUB=	yes

RUN_DEPENDS+=	ca_root_nss>=0:security/ca_root_nss
RUN_DEPENDS+=	freebsd-release-manifests>0:misc/freebsd-release-manifests

DIALOG4PORTS_DESC=	Install dialog4ports (necessary for options command) as runtime dependency
DIALOG4PORTS_RUN_DEPENDS+=	dialog4ports>0:ports-mgmt/dialog4ports
QEMU_DESC=	Add qemu-user-static to compile ports for non-x86 architectures
QEMU_RUN_DEPENDS=	qemu-user-static>0:emulators/qemu-user-static

.include <bsd.port.options.mk>

# rm -x support came in 10.0.  A bundled rm is used if not supported in base.
# While <10 is technically not supported in the Ports Tree, Poudriere
# detects this and it being a package build tool it should still be
# supported as a user may be installing this to build packages for upgrading
# their system to a supported release.
.if ${OSVERSION} < 1000000
PLIST_SUB+=	RM=""
.else
PLIST_SUB+=	RM="@comment "
.endif

post-patch:
	${CP} -f ${WRKSRC}/src/bin/poudriere ${WRKSRC}/poudriere
	${REINPLACE_CMD} \

Lines 18-24 Link Here

(-)ports-mgmt/poudriere-devel/pkg-plist (-1 lines)
18	libexec/poudriere/pwait	18	libexec/poudriere/pwait
19	libexec/poudriere/rename	19	libexec/poudriere/rename
20	libexec/poudriere/rexec	20	libexec/poudriere/rexec
21	%%RM%%libexec/poudriere/rm
22	libexec/poudriere/sh	21	libexec/poudriere/sh
23	libexec/poudriere/timeout	22	libexec/poudriere/timeout
24	libexec/poudriere/timestamp	23	libexec/poudriere/timestamp

Return to bug 225457

Lines 2-8 Link Here

(-)ports-mgmt/poudriere/Makefile (-16 / +5 lines)
2		2
3	PORTNAME= poudriere	3	PORTNAME= poudriere
4	DISTVERSION= 3.2.4	4	DISTVERSION= 3.2.4
5	PORTREVISION= 0	5	PORTREVISION= 1
6	CATEGORIES= ports-mgmt	6	CATEGORIES= ports-mgmt
7	MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \	7	MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \
8	http://mirror.shatow.net/freebsd/${PORTNAME}/ \	8	http://mirror.shatow.net/freebsd/${PORTNAME}/ \
Lines 21-49 Link Here
21	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
22	ETCDIR= ${PREFIX}/etc/poudriere.d	22	ETCDIR= ${PREFIX}/etc/poudriere.d
23		23
24	OPTIONS_DEFINE= ZSH QEMU EXAMPLES	24	OPTIONS_DEFINE= DIALOG4PORTS ZSH QEMU EXAMPLES
25	OPTIONS_DEFAULT=ZSH	25	OPTIONS_DEFAULT=DIALOG4PORTS ZSH
26	OPTIONS_SUB= yes	26	OPTIONS_SUB= yes
27		27
28	RUN_DEPENDS+= ca_root_nss>=0:security/ca_root_nss	28	RUN_DEPENDS+= ca_root_nss>=0:security/ca_root_nss
29	RUN_DEPENDS+= freebsd-release-manifests>0:misc/freebsd-release-manifests	29	RUN_DEPENDS+= freebsd-release-manifests>0:misc/freebsd-release-manifests
30		30
		31	DIALOG4PORTS_DESC= Install dialog4ports (necessary for options command) as runtime dependency
		32	DIALOG4PORTS_RUN_DEPENDS= dialog4ports>0:ports-mgmt/dialog4ports
31	QEMU_DESC= Add qemu-user-static to compile ports for non-x86 architectures	33	QEMU_DESC= Add qemu-user-static to compile ports for non-x86 architectures
32	QEMU_RUN_DEPENDS= qemu-user-static>0:emulators/qemu-user-static	34	QEMU_RUN_DEPENDS= qemu-user-static>0:emulators/qemu-user-static
33		35
34	.include <bsd.port.options.mk>
35
36	# rm -x support came in 10.0. A bundled rm is used if not supported in base.
37	# While <10 is technically not supported in the Ports Tree, Poudriere
38	# detects this and it being a package build tool it should still be
39	# supported as a user may be installing this to build packages for upgrading
40	# their system to a supported release.
41	.if ${OSVERSION} < 1000000
42	PLIST_SUB+= RM=""
43	.else
44	PLIST_SUB+= RM="@comment "
45	.endif
46
47	post-patch:	36	post-patch:
48	${CP} -f ${WRKSRC}/src/bin/poudriere ${WRKSRC}/poudriere	37	${CP} -f ${WRKSRC}/src/bin/poudriere ${WRKSRC}/poudriere
49	${REINPLACE_CMD} \	38	${REINPLACE_CMD} \

Lines 2-8 Link Here

(-)ports-mgmt/poudriere-devel/Makefile (-16 / +5 lines)
2		2
3	PORTNAME= poudriere	3	PORTNAME= poudriere
4	DISTVERSION= 3.2.99.20180105	4	DISTVERSION= 3.2.99.20180105
5	PORTREVISION= 1	5	PORTREVISION= 2
6	CATEGORIES= ports-mgmt	6	CATEGORIES= ports-mgmt
7	MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \	7	MASTER_SITES= LOCAL/bdrewery/${PORTNAME}/ \
8	http://mirror.shatow.net/freebsd/${PORTNAME}/ \	8	http://mirror.shatow.net/freebsd/${PORTNAME}/ \
Lines 24-52 Link Here
24	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
25	ETCDIR= ${PREFIX}/etc/poudriere.d	25	ETCDIR= ${PREFIX}/etc/poudriere.d
26		26
27	OPTIONS_DEFINE= ZSH QEMU EXAMPLES	27	OPTIONS_DEFINE= DIALOG4PORTS ZSH QEMU EXAMPLES
28	OPTIONS_DEFAULT=ZSH	28	OPTIONS_DEFAULT=DIALOG4PORTS ZSH
29	OPTIONS_SUB= yes	29	OPTIONS_SUB= yes
30		30
31	RUN_DEPENDS+= ca_root_nss>=0:security/ca_root_nss	31	RUN_DEPENDS+= ca_root_nss>=0:security/ca_root_nss
32	RUN_DEPENDS+= freebsd-release-manifests>0:misc/freebsd-release-manifests	32	RUN_DEPENDS+= freebsd-release-manifests>0:misc/freebsd-release-manifests
33		33
		34	DIALOG4PORTS_DESC= Install dialog4ports (necessary for options command) as runtime dependency
		35	DIALOG4PORTS_RUN_DEPENDS+= dialog4ports>0:ports-mgmt/dialog4ports
34	QEMU_DESC= Add qemu-user-static to compile ports for non-x86 architectures	36	QEMU_DESC= Add qemu-user-static to compile ports for non-x86 architectures
35	QEMU_RUN_DEPENDS= qemu-user-static>0:emulators/qemu-user-static	37	QEMU_RUN_DEPENDS= qemu-user-static>0:emulators/qemu-user-static
36		38
37	.include <bsd.port.options.mk>
38
39	# rm -x support came in 10.0. A bundled rm is used if not supported in base.
40	# While <10 is technically not supported in the Ports Tree, Poudriere
41	# detects this and it being a package build tool it should still be
42	# supported as a user may be installing this to build packages for upgrading
43	# their system to a supported release.
44	.if ${OSVERSION} < 1000000
45	PLIST_SUB+= RM=""
46	.else
47	PLIST_SUB+= RM="@comment "
48	.endif
49
50	post-patch:	39	post-patch:
51	${CP} -f ${WRKSRC}/src/bin/poudriere ${WRKSRC}/poudriere	40	${CP} -f ${WRKSRC}/src/bin/poudriere ${WRKSRC}/poudriere
52	${REINPLACE_CMD} \	41	${REINPLACE_CMD} \