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

convert qt3 to new style

Browse Source
This commit is contained in:
espie 2010-11-05 10:06:44 +00:00
parent fa90b67d7c
commit 90c0904de3
6 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
devel/bouml/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.7 2010/10/24 21:10:56 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.8 2010/11/05 10:06:44 espie Exp $
COMMENT-main= free UML builder with extensions
COMMENT-docs= bouml documentation
@ -26,7 +26,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MULTI_PACKAGES= -main -docs
WANTLIB-main= X11 Xext c m pthread stdc++
WANTLIB = X11 Xext c m pthread stdc++
RUN_DEPENDS-main= ::devel/desktop-file-utils
@ -40,6 +40,7 @@ CONFIGURE_STYLE= # empty
PKG_ARCH-docs= *
LIB_DEPENDS-docs= # empty
RUN_DEPENDS-docs= # empty
WANTLIB-docs = # empty
pre-configure:
${SUBST_CMD} ${WRKSRC}/Makefile

5
editors/openoffice3/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.53 2010/10/24 21:16:25 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.54 2010/11/05 10:06:44 espie Exp $
ONLY_FOR_ARCHS= amd64 i386
@ -127,7 +127,8 @@ MODULES+= x11/qt3
RUN_DEPENDS-kde= ::editors/openoffice3
LIB_DEPENDS-kde= ${MODQT_LIB_DEPENDS} \
kabc,kdecore,kdeui,kio::x11/kde/libs3
WANTLIB-kde= X11 Xau Xdmcp Xext Xrandr Xrender ${STDLIB} m \
WANTLIB-kde= ${MODQT_WANTLIB} \
X11 Xau Xdmcp Xext Xrandr Xrender ${STDLIB} m \
pthread-stubs xcb
.if !${FLAVOR:L:Mno_java}

13
inputmethods/uim/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.28 2010/10/24 21:21:44 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.29 2010/11/05 10:06:44 espie Exp $
COMMENT-main= multilingual input method library
COMMENT-gtk= uim for GTK
@ -51,14 +51,14 @@ USE_GROFF = Yes
AUTOCONF_VERSION= 2.62
SUBST_VARS= MODQT_PLUGINS
WANTLIB= X11 Xau Xdmcp Xext c m pthread-stubs xcb
Wcommon = X11 Xau Xdmcp Xext c m pthread-stubs xcb
RUN_DEPENDS-main=${RUN_DEPENDS} \
:desktop-file-utils-*:devel/desktop-file-utils
LIB_DEPENDS-main=::inputmethods/anthy \
${MODLIBICONV_LIB_DEPENDS} \
${MODGETTEXT_LIB_DEPENDS}
WANTLIB-main= ${WANTLIB} Xrender fontconfig freetype curses \
WANTLIB-main= ${Wcommon} Xrender fontconfig freetype curses \
util Xft expat z stdc++ anthy anthydic
uim_LIB_DEPENDS=::inputmethods/uim
@ -67,19 +67,20 @@ LIB_DEPENDS-qt= ${MODQT_LIB_DEPENDS} \
${uim_LIB_DEPENDS} \
${MODLIBICONV_LIB_DEPENDS} \
${MODGETTEXT_LIB_DEPENDS}
WANTLIB-qt= ${WANTLIB} pthread stdc++ uim uim-custom gcroots uim-scm
WANTLIB-qt = ${Wcommon} ${MODQT_WANTLIB} \
pthread stdc++ uim uim-custom gcroots uim-scm
LIB_DEPENDS-kde=uim,gcroots,uim-scm::inputmethods/uim \
${MODLIBICONV_LIB_DEPENDS} \
${MODGETTEXT_LIB_DEPENDS} \
kdecore.>=7,DCOP,kdefx,kdeui::x11/kde/libs3
WANTLIB-kde= ${WANTLIB} Xrender ICE SM idn jpeg png util z \
WANTLIB-kde = ${Wcommon} Xrender ICE SM idn jpeg png util z \
art_lgpl_2 qt-mt stdc++
LIB_DEPENDS-gtk=${LIB_DEPENDS-main} ${uim_LIB_DEPENDS} \
::x11/gtk+2
WANTLIB-gtk= ${WANTLIB} gio-2.0 glib-2.0 gmodule-2.0 pangoft2-1.0 \
WANTLIB-gtk = ${Wcommon} gio-2.0 glib-2.0 gmodule-2.0 pangoft2-1.0 \
gobject-2.0 pango-1.0 atk-1.0 uim uim-custom gcroots uim-scm \
pangocairo-1.0 cairo png z expat \
Xcomposite Xcursor Xdamage Xfixes Xi Xinerama Xrandr \

8
net/avahi/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.39 2010/10/29 12:54:43 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.40 2010/11/05 10:06:44 espie Exp $
COMMENT-main= framework for Multicast DNS Service Discovery
COMMENT-gtk= GUI client utilities for avahi
@ -53,11 +53,11 @@ MODULES= devel/gettext \
textproc/intltool
USE_GROFF = Yes
WANTLIB= c expat glib-2.0 gobject-2.0 pcre pthread
BUILD_DEPENDS= ::converters/xmltoman
WANTLIB-main= ${WANTLIB} glib-2.0 gobject-2.0 gthread-2.0 gdbm \
WANTLIB-main= c expat glib-2.0 gobject-2.0 pcre pthread \
glib-2.0 gobject-2.0 gthread-2.0 gdbm \
daemon dbus-1
LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
::devel/glib2 \
@ -130,7 +130,7 @@ LIB_DEPENDS-qt3= ${MODGETTEXT_LIB_DEPENDS} \
WANTLIB-qt3= GL ICE SM X11 Xau Xcursor Xdmcp Xext Xfixes Xft Xi \
Xinerama Xmu Xrandr Xrender Xt expat fontconfig \
freetype jpeg lcms m mng png pthread-stubs xcb z \
avahi-common stdc++
avahi-common stdc++ ${MODQT3_WANTLIB}
.else
CONFIGURE_ARGS+= --disable-qt3
.endif

10
print/poppler/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.36 2010/11/05 00:05:15 espie Exp $
# $OpenBSD: Makefile,v 1.37 2010/11/05 10:06:44 espie Exp $
.include <bsd.own.mk>
COMMENT-main= PDF rendering library
@ -39,7 +39,7 @@ FLAVOR?=${FLAVOR-${MACHINE_ARCH}}
NOT_FOR_ARCHS-qt4 = arm powerpc
WANTLIB= expat freetype fontconfig jpeg m z stdc++
cWANTLIB= expat freetype fontconfig jpeg m z stdc++
CXXFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libpng
@ -76,13 +76,13 @@ LIB_DEPENDS-qt4=QtCore,QtGui,QtXml::x11/qt4 \
${MODGETTEXT_LIB_DEPENDS} \
::print/poppler
WANTLIB-main= ${WANTLIB} Xcursor Xext Xfixes Xi Xinerama Xrandr gio-2.0 \
WANTLIB-main= ${cWANTLIB} Xcursor Xext Xfixes Xi Xinerama Xrandr gio-2.0 \
glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 pango-1.0 xml2 \
pangocairo-1.0 pangoft2-1.0 pixman-1 gdk_pixbuf-2.0 openjpeg \
X11 Xau Xcomposite Xdamage Xdmcp Xrender cairo pcre png \
pthread-stubs xcb xcb-render xcb-render-util gdk-x11-2.0 lcms
WANTLIB-qt= ${WANTLIB} lcms openjpeg xml2 poppler png
WANTLIB-qt4= ${WANTLIB} ICE QtCore QtGui QtXml SM X11 Xau Xdmcp Xext Xi \
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

9
x11/qt3/qt3.port.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: qt3.port.mk,v 1.12 2008/09/03 21:58:17 brad Exp $
# $OpenBSD: qt3.port.mk,v 1.13 2010/11/05 10:06:44 espie Exp $
# This fragment defines MODQT_* variables to make it easier to substitute
# qt1/qt2/qt3 in a port.
@ -17,13 +17,16 @@ _MODQT3_SETUP = MOC=${MODQT3_MOC} \
MODQT_INCDIR=${MODQT3_INCDIR} \
MODQT_LIBDIR=${MODQT3_LIBDIR}
.if ${MODQT3_OVERRIDE_UIC:L} == "yes"
_MODQT3_SETUP +=UIC=${MODQT3_UIC}
_MODQT3_SETUP += UIC=${MODQT3_UIC}
.endif
_MODQT_SETUP ?= ${MODQT3_SETUP}
MODQT3_LIB_DEPENDS = lib/qt3/qt-mt.>=3::x11/qt3
MODQT3_LIB_DEPENDS = ::x11/qt3
MODQT_LIB_DEPENDS ?= ${MODQT3_LIB_DEPENDS}
MODQT3_WANTLIB = lib/qt3/qt-mt.>=3
MODQT_WANTLIB ?= ${MODQT3_WANTLIB}
LIB_DEPENDS += ${MODQT3_LIB_DEPENDS}
WANTLIB += ${MODQT3_WANTLIB}
# may be needed to find plugins
MODQT3_MOC = ${LOCALBASE}/bin/moc3-mt