Date: Fri, 11 Dec 2009 01:47:21 +1000 From: "Dima Panov" <fluffy@FreeBSD.org> To: "FreeBSD gnats submit" <FreeBSD-gnats-submit@FreeBSD.org> Subject: ports/141347: graphics/poppler: Fix of usage USE_QT= macro Message-ID: <1260460041.54969@Fluffy.Khv.RU> Resent-Message-ID: <200912101550.nBAFo5JR070387@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 141347
>Category: ports
>Synopsis: graphics/poppler: Fix of usage USE_QT= macro
>Confidential: no
>Severity: serious
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Dec 10 15:50:05 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Dima Panov
>Release: FreeBSD 9.0-900002-CURRENT amd64
>Organization:
Fluffy.Khv.RU
>Environment:
System: FreeBSD 9.0-900002-CURRENT #0: Wed Dec 2 05:03:55 VLAT 2009
root@Fluffy.Khv.RU:/usr/obj/usr/src/sys/Spot
>Description:
graphics/poppler: Fix of usage USE_QT= macro.
Current state of port is incorrect.
Optional USE_QT should be decrared before including of bsd.port.pre.mk but after bsd.port.options.mk
>How-To-Repeat:
>Fix:
--- poppler.diff begins here ---
Index: graphics/poppler/Makefile
===================================================================
RCS file: /home/ncvs/ports/graphics/poppler/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- graphics/poppler/Makefile 28 Nov 2009 20:05:44 -0000 1.53
+++ graphics/poppler/Makefile 10 Dec 2009 13:36:38 -0000
@@ -35,7 +35,7 @@
OPENJPEG "Enable JPEG 2000 support" on
.endif
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
.if defined(SLAVEPORT)
LIB_DEPENDS+= poppler.5:${PORTSDIR}/graphics/poppler
@@ -106,6 +106,8 @@
.endif
.endif
+.include <bsd.port.pre.mk>
+
post-patch:
.if defined(SLAVEPORT) && ${SLAVEPORT}=="qt"
@${REINPLACE_CMD} -e 's|/usr/local/qt/include|${LOCALBASE}/include|; \
--- poppler.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1260460041.54969>