cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zap old lib depends for qt4

Browse Source
This commit is contained in:
espie 2010-11-05 13:47:46 +00:00
parent 2392cb69e3
commit 88f371a12f
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
print/poppler/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.37 2010/11/05 10:06:44 espie Exp $
# $OpenBSD: Makefile,v 1.38 2010/11/05 13:47:46 espie Exp $
.include <bsd.own.mk>
COMMENT-main= PDF rendering library
@ -72,7 +72,7 @@ LIB_DEPENDS-main=${MODGETTEXT_LIB_DEPENDS} \
LIB_DEPENDS-qt= ${MODQT3_LIB_DEPENDS} \
${MODLIBICONV_LIB_DEPENDS} \
::print/poppler
LIB_DEPENDS-qt4=QtCore,QtGui,QtXml::x11/qt4 \
LIB_DEPENDS-qt4=::x11/qt4 \
${MODGETTEXT_LIB_DEPENDS} \
::print/poppler
@ -84,7 +84,8 @@ WANTLIB-main= ${cWANTLIB} Xcursor Xext Xfixes Xi Xinerama Xrandr gio-2.0 \
WANTLIB-qt= ${cWANTLIB} lcms openjpeg xml2 poppler png ${MODQT3_WANTLIB}
WANTLIB-qt4= ${cWANTLIB} ICE QtCore QtGui QtXml SM X11 Xau Xdmcp Xext Xi \
Xinerama Xrender glib-2.0 gobject-2.0 gthread-2.0 lcms \
openjpeg pcre png poppler pthread-stubs xcb xml2
openjpeg pcre png poppler pthread-stubs xcb xml2 \
QtCore QtGui QtXml
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS+= --enable-xpdf-headers \

11
x11/qt4/qt4.port.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: qt4.port.mk,v 1.4 2008/11/29 12:15:57 ajacoutot Exp $
# $OpenBSD: qt4.port.mk,v 1.5 2010/11/05 13:47:46 espie Exp $
# This fragment defines MODQT_* variables to make it easier to substitute
# qt1/qt2/qt3 in a port.
@ -21,7 +21,6 @@ _MODQT4_SETUP = MOC=${MODQT4_MOC} \
_MODQT4_SETUP +=UIC=${MODQT4_UIC}
.endif
LIB_DEPENDS += lib/qt4/QtCore::x11/qt4
# may be needed to find plugins
MODQT4_MOC = ${LOCALBASE}/bin/moc4
MODQT_MOC ?= ${MODQT4_MOC}
@ -30,6 +29,14 @@ MODQT_UIC ?= ${MODQT4_UIC}
MODQT4_QTDIR = ${LOCALBASE}/lib/qt4
MODQT_QTDIR ?= ${MODQT4_QTDIR}
MODQT4_LIB_DEPENDS = lib/qt4/QtCore::x11/qt4
MODQT_LIB_DEPENDS ?= ${MODQT4_LIB_DEPENDS}
LIB_DEPENDS += ${MODQT4_LIB_DEPENDS}
MODQT4_WANTLIB = lib/qt4/QtCore
MODQT_WANTLIB ?= ${MODQT4_WANTLIB}
WANTLIB += ${MODQT4_WANTLIB}
CONFIGURE_ENV +=${_MODQT4_SETUP}
MAKE_ENV += ${_MODQT4_SETUP}
MAKE_FLAGS += ${_MODQT4_SETUP}