On Thursday 10 December 2009 16:49:04 Thomas Abthorpe wrote: > SVN commit 5736 by tabthorpe: > > - Need customised poppler to build against Qt4 > - After further testing, we will mainline into portstree > > > A poppler (directory) > A poppler/Makefile > A poppler/distinfo > A poppler/files (directory) > A poppler/files/patch-glib_Makefile.in > A poppler/files/patch-poppler_Page.cc > A poppler/files/patch-qt4_Makefile.in > A poppler/files/patch-qt4_src_Makefile.in > A poppler/files/patch-qt_Makefile.in > A poppler/files/patch-utils_Makefile.in > A poppler/pkg-descr > A poppler/pkg-plist >
It can be resolved in easy way. As Max described sutiation for me, all ports, whic now failed in qt4 dependencies list, incorrectly use OPTIONS So fix is more clear. And same for vlc -- Dima "Red Fox" Panov @ Home | C73E 2B72 1FFD 61BD E206 1234 A626 76ED 93E3 B018 Khabarovsk, Russia | 2D30 2CCB 9984 130C 6F87 BAFC FB8B A09D D539 8F29 k...@freebsd Team | FreeBSD committer since 10.08.2009 | FreeBSD since Sept 1995 Twitter.com:fluffy_khv | Skype:dima.panov | Jabber.org:fluffy.khv | ICQ:1745024
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|; \
Index: multimedia/vlc/Makefile
===================================================================
RCS file: /home/ncvs/ports/multimedia/vlc/Makefile,v
retrieving revision 1.204
diff -u -r1.204 Makefile
--- multimedia/vlc/Makefile 2 Dec 2009 17:16:15 -0000 1.204
+++ multimedia/vlc/Makefile 10 Dec 2009 13:41:10 -0000
@@ -96,20 +97,12 @@
vlc-config.1 \
vlc-wrapper.1
-.include <bsd.port.pre.mk>
-
-.if (${OSVERSION} < 701000)
-CFLAGS+= -DHAVE_SYS_MOUNT_H
-.endif
+.include <bsd.port.options.mk>
WITH_VLC_DEFAULT_FONT?= ${LOCALBASE}/lib/X11/fonts/bitstream-vera/Vera.ttf
-.if ${PERL_LEVEL} < 500800
-BROKEN= Does not compile with perl ${PERL_VERSION}
-.endif
-
.if !defined(WITHOUT_QT4) && !defined(WITHOUT_X11)
-USE_QT_VER+= 4
+USE_QT_VER= 4
QT_COMPONENTS+= gui corelib moc_build rcc_build uic_build
CONFIGURE_ARGS+=--enable-qt4
.else
@@ -602,5 +595,15 @@
CONFIGURE_ARGS+=--enable-x11
.endif
+.include <bsd.port.pre.mk>
+
+.if (${OSVERSION} < 701000)
+CFLAGS+= -DHAVE_SYS_MOUNT_H
+.endif
+
+.if ${PERL_LEVEL} < 500800
+BROKEN= Does not compile with perl ${PERL_VERSION}
+.endif
+
.include "${.CURDIR}/Makefile.inc"
.include <bsd.port.post.mk>
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ kde-freebsd mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-freebsd See also http://freebsd.kde.org/ for latest information
