Attachment 163136 Details for Bug 204534 – patch2

[patch] patch2

autoreconf.patch (text/plain), 3.15 KB, created by Tijl Coosemans on 2015-11-15 14:30:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tijl Coosemans

Created: 2015-11-15 14:30:58 UTC

Size: 3.15 KB

patch

obsolete

>Index: Mk/Uses/autoreconf.mk
>===================================================================
>--- Mk/Uses/autoreconf.mk	(revision 401701)
>+++ Mk/Uses/autoreconf.mk	(working copy)
>@@ -64,6 +64,8 @@ BUILD_DEPENDS+=	autoconf-2.69:${PORTSDIR
> BUILD_DEPENDS+=	libtoolize:${PORTSDIR}/devel/libtool
> .endif
> 
>+AUTORECONF?=	${LOCALBASE}/bin/autoreconf
>+
> .endif
> 
> .if defined(_POSTMKINCLUDED) && !defined(_INCLUDE_USES_AUTORECONF_POST_MK)
>@@ -83,7 +85,7 @@ do-autoreconf:
> 		if ${EGREP} -q '^(AC|IT)_PROG_INTLTOOL' $${configure}; \
> 		then ${LOCALBASE}/bin/intltoolize -f -c; fi)
> .endif
>-	@(cd ${CONFIGURE_WRKSRC} && ${LOCALBASE}/bin/autoreconf -f -i)
>+	@(cd ${CONFIGURE_WRKSRC} && ${AUTORECONF} -f -i)
> .endif
> 
> .endif
>Index: games/qqwing/Makefile
>===================================================================
>--- games/qqwing/Makefile	(revision 401701)
>+++ games/qqwing/Makefile	(working copy)
>@@ -30,7 +30,7 @@ pre-configure:
> 		target/automake
> 	@cd ${WRKSRC} && ${CP} doc/qqwing.man target/automake/qqwing.1
> 	@cd ${WRKSRC}/target/automake && ${TOUCH} config.h.in
>-	@cd ${WRKSRC}/target/automake && autoreconf --force --install
>+	@cd ${WRKSRC}/target/automake && ${AUTORECONF} --force --install
> 
> pre-build:
> 	@cd ${WRKSRC} && ${CP} src/cpp/*.cpp target/automake
>Index: net/tigervnc/Makefile
>===================================================================
>--- net/tigervnc/Makefile	(revision 401701)
>+++ net/tigervnc/Makefile	(working copy)
>@@ -134,7 +134,7 @@ post-patch:
> 	@cd ${WRKSRC}/unix/xserver/ && ${PATCH} -p1 < ${WRKSRC}/unix/xserver${TIGERVNC_XORG_PATCH_VER}.patch
> 
> post-configure:
>-	@cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/autoreconf -fiv
>+	@cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ${AUTORECONF} -fiv
> 	@cd ${WRKSRC}/unix/xserver/ && ${SETENV} ${CONFIGURE_ENV} ./configure ${CONFIGURE_ARGS}
> 
> post-build:
>Index: print/fontforge/Makefile
>===================================================================
>--- print/fontforge/Makefile	(revision 401701)
>+++ print/fontforge/Makefile	(working copy)
>@@ -77,6 +77,6 @@ pre-configure:
> 		${SH} -c '. ./bootstrap.conf ; \
> 		${LOCALBASE}/bin/libtoolize -i -c -q ; \
> 		${LOCALBASE}/bin/gnulib-tool --aux-dir=config --m4-base=m4 --libtool --symlink --import $${gnulib_modules}' ; \
>-		export LIBTOOLIZE=true ; ${LOCALBASE}/bin/autoreconf -s -i)
>+		export LIBTOOLIZE=true ; ${AUTORECONF} -f -i)
> 
> .include <bsd.port.mk>
>Index: devel/ptlib/Makefile
>===================================================================
>--- devel/ptlib/Makefile	(revision 401701)
>+++ devel/ptlib/Makefile	(working copy)
>@@ -16,8 +16,7 @@ LIB_DEPENDS=	libexpat.so:${PORTSDIR}/tex
> 
> CONFLICTS=	pwlib-1.*
> 
>-USES=		bison gmake pkgconfig tar:xz
>-USE_AUTOTOOLS=	autoconf:env automake:env
>+USES=		autoreconf:build bison gmake pkgconfig tar:xz
> GNU_CONFIGURE=	yes
> USE_OPENSSL=	yes
> USE_LDCONFIG=	yes
>@@ -162,7 +161,7 @@ post-patch:
> 	@${REINPLACE_CMD} -e 's/RTF_WASCLONED/0x20000/' ${WRKSRC}/src/ptlib/unix/socket.cxx
> 
> pre-configure:
>-	cd ${WRKSRC}/plugins/ && autoreconf -fi
>+	(cd ${WRKSRC}/plugins/ && ${AUTORECONF} -fi)
> 
> post-install:
> 	${LN} -sf libpt.so.${PORTVERSION} ${STAGEDIR}${PREFIX}/lib/libpt.so.${PVERSION_MAJOR}

Flags:

antoine: maintainer-approval+

Actions: View | Diff

Attachments on bug 204534: 163104 | 163136