Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 13 Sep 2014 21:47:31 +0000 (UTC)
From:      Tijl Coosemans <tijl@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r368148 - head/graphics/xpaint
Message-ID:  <201409132147.s8DLlVeQ070660@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: tijl
Date: Sat Sep 13 21:47:30 2014
New Revision: 368148
URL: http://svnweb.freebsd.org/changeset/ports/368148
QAT: https://qat.redports.org/buildarchive/r368148/

Log:
  Switch to USES=libtool:build

Modified:
  head/graphics/xpaint/Makefile

Modified: head/graphics/xpaint/Makefile
==============================================================================
--- head/graphics/xpaint/Makefile	Sat Sep 13 21:45:01 2014	(r368147)
+++ head/graphics/xpaint/Makefile	Sat Sep 13 21:47:30 2014	(r368148)
@@ -25,23 +25,20 @@ RUN_DEPENDS=	psselect:${PORTSDIR}/print/
 USE_XORG=	xft xmu xpm
 USE_GHOSTSCRIPT_RUN=yes
 GNU_CONFIGURE=	yes
-USES=		libtool shebangfix tar:bzip2
-USE_AUTOTOOLS=	libtoolize
+USES=		libtool:build shebangfix tar:bzip2
 SHEBANG_FILES=	share/bin/imgmerge share/bin/xpaint_ocr
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/freetype2 \
 		-I${LOCALBASE}/include/freetype2/freetype
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 MAKE_ENV+=	RM="${RM} -f"
 
-post-extract:
-	@${RM} -f ${WRKSRC}/XPaint.ad
-
 post-patch:
+	@${RM} -f ${WRKSRC}/XPaint.ad
 	@${REINPLACE_CMD} -e 's/-ldl //' \
 		-e 's|freetype/||g' \
 		${WRKSRC}/configure ${WRKSRC}/rw/configure
-	@${REINPLACE_CMD} -e '/^LIBTOOL/d' \
+	@${REINPLACE_CMD} -e '/^LIBTOOL =/s|=.*|= ${LOCALBASE}/bin/libtool|' \
 		-e '/^install-exec-am:/s/install-libLTLIBRARIES//' \
 		${WRKSRC}/rw/Makefile.in
 	@${REINPLACE_CMD} -e '/if (!image)/s/return;/return -1;/' \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409132147.s8DLlVeQ070660>