From d7f6fc7e2368c7165eb3fd04947b84e575794cfb Mon Sep 17 00:00:00 2001 From: espie Date: Mon, 8 Nov 2010 10:28:22 +0000 Subject: [PATCH] more conversions --- devel/mcs/Makefile | 6 +++--- devel/mpfr/Makefile | 5 +++-- devel/mysql++/Makefile | 6 +++--- devel/opencm/Makefile | 9 +++++---- devel/p5-Device-USB/Makefile | 5 +++-- devel/p5-Glib2/Makefile | 5 +++-- devel/p5-Pango/Makefile | 7 ++++--- devel/p5-SDL/Makefile | 15 ++++++++------- devel/pango/Makefile | 12 +++++++----- devel/pangomm/Makefile | 11 ++++++----- devel/pcre++/Makefile | 10 ++++++---- devel/poedit/Makefile | 14 ++++++++------ devel/ptlib/Makefile | 8 ++++---- devel/py-notify/Makefile | 6 +++--- devel/py-orbit/Makefile | 10 +++++----- devel/py-silc/Makefile | 5 +++-- devel/pygame/Makefile | 10 +++++----- devel/pyusb/Makefile | 5 +++-- devel/qt-creator/Makefile | 12 +++++++----- devel/qt4-eventsview/Makefile | 9 +++++---- devel/rapidsvn/Makefile | 15 ++++++++++----- devel/rsvndump/Makefile | 8 ++++---- devel/smpeg/Makefile | 11 +++++------ devel/startup-notification/Makefile | 6 +++--- 24 files changed, 116 insertions(+), 94 deletions(-) diff --git a/devel/mcs/Makefile b/devel/mcs/Makefile index 6ab75c03d65..b9040bdd3f8 100644 --- a/devel/mcs/Makefile +++ b/devel/mcs/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 2009/01/14 21:07:17 fgsch Exp $ +# $OpenBSD: Makefile,v 1.4 2010/11/08 10:28:22 espie Exp $ COMMENT = abstract the storage of configuration settings @@ -15,12 +15,12 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM = Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = c +WANTLIB = c mowgli MASTER_SITES = http://distfiles.atheme.org/ EXTRACT_SUFX = .tgz -LIB_DEPENDS = mowgli::devel/mowgli +LIB_DEPENDS = ::devel/mowgli MAKE_ENV = LIBmcs_VERSION=${LIBmcs_VERSION} diff --git a/devel/mpfr/Makefile b/devel/mpfr/Makefile index 57b65894792..956d3e814a5 100644 --- a/devel/mpfr/Makefile +++ b/devel/mpfr/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/09/26 13:40:11 naddy Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/08 10:28:22 espie Exp $ COMMENT= library for multiple-precision floating-point computations @@ -18,8 +18,9 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${HOMEPAGE}${DISTNAME}/ DIST_SUBDIR= ${DISTNAME} +LIB_DEPENDS = :gmp->=4.2.0:devel/gmp # no interlibrary dependency, though -LIB_DEPENDS= gmp:gmp->=4.2.0:devel/gmp +WANTLIB = gmp SEPARATE_BUILD= simple USE_LIBTOOL= Yes diff --git a/devel/mysql++/Makefile b/devel/mysql++/Makefile index 3c4cbd6ffb4..58ede8890ad 100644 --- a/devel/mysql++/Makefile +++ b/devel/mysql++/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2009/11/13 20:41:43 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.28 2010/11/08 10:28:22 espie Exp $ SHARED_ONLY = Yes @@ -26,8 +26,8 @@ MASTER_SITES = ${HOMEPAGE}releases/ MULTI_PACKAGES = -main -docs -LIB_DEPENDS-main = mysqlclient::databases/mysql -WANTLIB-main = m +LIB_DEPENDS-main = ::databases/mysql +WANTLIB-main = m mysqlclient PKG_ARCH-docs = * NO_REGRESS = Yes diff --git a/devel/opencm/Makefile b/devel/opencm/Makefile index 9d1f6481347..075cb0f4e97 100644 --- a/devel/opencm/Makefile +++ b/devel/opencm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2008/04/01 17:42:12 kurt Exp $ +# $OpenBSD: Makefile,v 1.29 2010/11/08 10:28:22 espie Exp $ COMMENT= OpenCM change management system @@ -6,7 +6,8 @@ V= 0.1.2alpha8 sV= -2 DISTFILES= opencm-${V}${sV}-src.tgz DISTNAME= opencm-${V} -PKGNAME= opencm-${V}p1 +PKGNAME= opencm-${V} +REVISION = 1 CATEGORIES= devel HOMEPAGE= http://www.opencm.org/ @@ -18,7 +19,7 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c crypto ncurses pthread readline ssl z +WANTLIB= c crypto ncurses pthread readline ssl z gc.>=3 MASTER_SITES= ${HOMEPAGE}releases/ @@ -48,7 +49,7 @@ post-install: gunzip ${PREFIX}/info/opencm.info.gz -LIB_DEPENDS= gc.>=3::devel/boehm-gc +LIB_DEPENDS= ::devel/boehm-gc WRKSRC= ${WRKDIST}/base diff --git a/devel/p5-Device-USB/Makefile b/devel/p5-Device-USB/Makefile index 1a1d899989b..87b9b780694 100644 --- a/devel/p5-Device-USB/Makefile +++ b/devel/p5-Device-USB/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/18 21:50:38 sthen Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/08 10:28:22 espie Exp $ COMMENT= perl wrapper around libusb @@ -19,7 +19,8 @@ PERMIT_DISTFILES_FTP= Yes BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= ::devel/p5-Inline -LIB_DEPENDS = usb::devel/libusb +LIB_DEPENDS = ::devel/libusb +WANTLIB = usb CONFIGURE_ENV+= LIBUSB_INCDIR="${LOCALBASE}/include" \ LIBUSB_LIBDIR="${LOCALBASE}/lib" diff --git a/devel/p5-Glib2/Makefile b/devel/p5-Glib2/Makefile index 9c835a77978..af07b19bf3d 100644 --- a/devel/p5-Glib2/Makefile +++ b/devel/p5-Glib2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.18 2010/10/18 21:50:38 sthen Exp $ +# $OpenBSD: Makefile,v 1.19 2010/11/08 10:28:22 espie Exp $ BROKEN= glib2 is threaded but our perl is not so we end up with undefined symbols @@ -22,9 +22,10 @@ MODULES+= cpan \ devel/gettext USE_GROFF = Yes -LIB_DEPENDS= glib-2.0,gobject-2.0::devel/glib2 +LIB_DEPENDS= ::devel/glib2 BUILD_DEPENDS= ::devel/p5-ExtUtils-Depends \ ::devel/p5-ExtUtils-PkgConfig +WANTLIB = glib-2.0 gobject-2.0 CONFIGURE_ARGS= --disable-threadsafe diff --git a/devel/p5-Pango/Makefile b/devel/p5-Pango/Makefile index 1d4d2d90f2d..f77496f3926 100644 --- a/devel/p5-Pango/Makefile +++ b/devel/p5-Pango/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.7 2010/10/18 21:50:38 sthen Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/08 10:28:22 espie Exp $ SHARED_ONLY= Yes @@ -19,11 +19,12 @@ MODULES= cpan \ devel/gettext USE_GROFF = Yes -LIB_DEPENDS= pangocairo-1.0,pango-1.0,pangoft2-1.0::devel/pango +LIB_DEPENDS= ::devel/pango WANTLIB= X11 Xau Xdmcp Xrender cairo expat fontconfig freetype \ glib-2.0 gmodule-2.0 gobject-2.0 m pixman-1 png \ - pthread-stubs xcb z xcb-render xcb-render-util + pthread-stubs xcb z xcb-render xcb-render-util \ + pangocairo-1.0 pango-1.0 pangoft2-1.0 RUN_DEPENDS= ::devel/p5-Glib2 \ ::graphics/p5-Cairo diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile index 47c1ae24f27..ce3aa489c58 100644 --- a/devel/p5-SDL/Makefile +++ b/devel/p5-SDL/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/10/18 17:48:06 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2010/11/08 10:28:22 espie Exp $ SHARED_ONLY = Yes COMMENT = Simple DirectMedia Layer for Perl @@ -24,12 +24,13 @@ WANTLIB += GL GLU SDL jpeg png pthread RUN_DEPENDS = ::devel/p5-YAML BUILD_DEPENDS = ${RUN_DEPENDS} -LIB_DEPENDS = SDL_gfx::devel/sdl-gfx \ - SDL_image::devel/sdl-image \ - SDL_mixer::devel/sdl-mixer \ - SDL_net::devel/sdl-net \ - SDL_ttf::devel/sdl-ttf \ - smpeg::devel/smpeg +LIB_DEPENDS = ::devel/sdl-gfx \ + ::devel/sdl-image \ + ::devel/sdl-mixer \ + ::devel/sdl-net \ + ::devel/sdl-ttf \ + ::devel/smpeg +WANTLIB += SDL_gfx SDL_image SDL_mixer SDL_net SDL_ttf smpeg CONFIGURE_STYLE = perl modbuild USE_GROFF = Yes diff --git a/devel/pango/Makefile b/devel/pango/Makefile index e18bf21d64b..d335cb1502f 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.46 2010/10/24 21:11:02 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.47 2010/11/08 10:28:22 espie Exp $ COMMENT= library for layout and rendering of text @@ -24,19 +24,21 @@ PERMIT_DISTFILES_FTP= Yes WANTLIB= X11 Xau Xdmcp Xft Xrender c expat fontconfig freetype \ m pcre pixman-1 png pthread pthread-stubs xcb \ - xcb-render xcb-render-util z + xcb-render xcb-render-util z \ + glib-2.0.>=1800.0 gmodule-2.0.>=1800.0 gobject-2.0.>=1800.0 \ + gthread-2.0.>=1800.0 cairo.>=9 MASTER_SITES= ${MASTER_SITE_GNOME:=sources/pango/${V:C/^([0-9]+\.[0-9]+).*/\1/}/} EXTRACT_SUFX= .tar.bz2 MODULES= devel/gettext -LIB_DEPENDS= glib-2.0.>=1800.0,gmodule-2.0.>=1800.0,gobject-2.0.>=1800.0,gthread-2.0.>=1800.0::devel/glib2 \ - cairo.>=9::graphics/cairo +LIB_DEPENDS= ::devel/glib2 \ + ::graphics/cairo USE_GMAKE= Yes USE_LIBTOOL= Yes -USE_GROFF = Yes +USE_GROFF = Yes CONFIGURE_STYLE= gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} \ diff --git a/devel/pangomm/Makefile b/devel/pangomm/Makefile index f7c7cdd8efd..bb48dd575b3 100644 --- a/devel/pangomm/Makefile +++ b/devel/pangomm/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.9 2010/10/24 21:11:02 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.10 2010/11/08 10:28:22 espie Exp $ COMMENT = C++ interface for pango @@ -22,14 +22,15 @@ EXTRACT_SUFX = .tar.bz2 MODULES = devel/gettext -LIB_DEPENDS = pangoft2-1.0,pangocairo-1.0,pango-1.0::devel/pango \ - glibmm-2.4::devel/glib2mm \ - cairomm-1.0::graphics/cairomm +LIB_DEPENDS = ::devel/pango \ + ::devel/glib2mm \ + ::graphics/cairomm WANTLIB = X11 Xau Xdmcp Xrender cairo expat fontconfig freetype \ glib-2.0 gmodule-2.0 gobject-2.0 m pcre pixman-1 \ png pthread-stubs sigc-2.0 xcb z xcb-render \ - gthread-2.0 xcb-render-util + gthread-2.0 xcb-render-util pangoft2-1.0 \ + pangocairo-1.0 pango-1.0 glibmm-2.4 cairomm-1.0 USE_GMAKE = Yes USE_LIBTOOL = Yes diff --git a/devel/pcre++/Makefile b/devel/pcre++/Makefile index 741e1e0e570..c2bac6daa82 100644 --- a/devel/pcre++/Makefile +++ b/devel/pcre++/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.7 2010/10/18 17:48:12 espie Exp $ +# $OpenBSD: Makefile,v 1.8 2010/11/08 10:28:22 espie Exp $ COMMENT= wrapper class around the pcre library DISTNAME= pcre++-0.9.5 -PKGNAME= ${DISTNAME}p1 +PKGNAME= ${DISTNAME} +REVISION = 1 SHARED_LIBS= pcre++ 1.0 CATEGORIES= devel @@ -19,7 +20,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -LIB_DEPENDS= pcre::devel/pcre +LIB_DEPENDS = ::devel/pcre +WANTLIB = pcre CONFIGURE_STYLE= gnu CONFIGURE_ARGS= ${CONFIGURE_SHARED} @@ -28,7 +30,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ USE_GMAKE= Yes USE_LIBTOOL= Yes -USE_GROFF = Yes +USE_GROFF = Yes do-regress: @cd ${WRKBUILD}/test && ./test testinput diff --git a/devel/poedit/Makefile b/devel/poedit/Makefile index 3912a210372..90b152bcd28 100644 --- a/devel/poedit/Makefile +++ b/devel/poedit/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.9 2010/10/24 21:11:02 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.10 2010/11/08 10:28:22 espie Exp $ COMMENT= cross-platform gettext catalogs (PO-files) editor DISTNAME= poedit-1.3.7 -PKGNAME= ${DISTNAME}p2 +PKGNAME= ${DISTNAME} +REVISION = 2 CATEGORIES= devel HOMEPAGE= http://www.poedit.net/ @@ -20,10 +21,10 @@ PERMIT_DISTFILES_FTP= Yes USE_GROFF = Yes -WANTLIB= c m pthread stdc++ - +WANTLIB= c m pthread stdc++ wx_base_xml wx_gtk2_html wx_gtk2_adv \ + wx_gtk2_xrc wx_base wx_gtk2_core RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils -LIB_DEPENDS= wx_base_xml,wx_gtk2_html,wx_gtk2_adv,wx_gtk2_xrc,wx_base,wx_gtk2_core:wxWidgets-gtk2->=2.6.3:x11/wxWidgets +LIB_DEPENDS= :wxWidgets-gtk2->=2.6.3:x11/wxWidgets CONFIGURE_STYLE=gnu @@ -35,7 +36,8 @@ FLAVOR?= .if ${FLAVOR:L:Mno_db} CONFIGURE_ARGS+=--disable-transmem .else -LIB_DEPENDS+= db.>=4::databases/db/v4 +LIB_DEPENDS += ::databases/db/v4 +WANTLIB += db.>=4 CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib/db4" \ CPPFLAGS="-I${LOCALBASE}/include/db4" diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile index 25bae834a9a..cbc14685be3 100644 --- a/devel/ptlib/Makefile +++ b/devel/ptlib/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/24 21:11:02 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/08 10:28:22 espie Exp $ SHARED_ONLY= Yes @@ -22,15 +22,15 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c crypto expat m sasl2 sndio ssl +WANTLIB= c crypto expat m sasl2 sndio ssl lber ldap ldap_r SDL MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=opalvoip/} BUILD_DEPENDS= ::devel/bison \ ${MODGNU_AUTOCONF_DEPENDS} \ ${MODGNU_AUTOMAKE_DEPENDS} -LIB_DEPENDS= lber,ldap,ldap_r::databases/openldap \ - SDL::devel/sdl +LIB_DEPENDS= ::databases/openldap \ + ::devel/sdl .include .if !${COMPILER_VERSION:L:Mgcc4} diff --git a/devel/py-notify/Makefile b/devel/py-notify/Makefile index a26ba6a0c05..ea38c7e95c4 100644 --- a/devel/py-notify/Makefile +++ b/devel/py-notify/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.10 2010/10/11 08:12:31 jasper Exp $ +# $OpenBSD: Makefile,v 1.11 2010/11/08 10:28:22 espie Exp $ COMMENT= python bindings for libnotify @@ -22,7 +22,7 @@ WANTLIB += expat ffi fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += pcre pixman-1 png pthread-stubs xcb xcb-render xcb-render-util -WANTLIB += z +WANTLIB += z notify MASTER_SITES= ${HOMEPAGE}/files/releases/source/notify-python/ EXTRACT_SUFX= .tar.bz2 @@ -32,7 +32,7 @@ MODULES= devel/gettext \ BUILD_DEPENDS= ${RUN_DEPENDS} RUN_DEPENDS= ::x11/py-gtk2 -LIB_DEPENDS= notify::devel/libnotify +LIB_DEPENDS= ::devel/libnotify USE_GMAKE= Yes USE_LIBTOOL= Yes diff --git a/devel/py-orbit/Makefile b/devel/py-orbit/Makefile index cf493f21ac9..551af718384 100644 --- a/devel/py-orbit/Makefile +++ b/devel/py-orbit/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2010/10/24 15:53:55 sthen Exp $ +# $OpenBSD: Makefile,v 1.22 2010/11/08 10:28:22 espie Exp $ COMMENT= ORBit2 Python bindings @@ -16,16 +16,16 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= m util IDL-2 pcre glib-2.0 gmodule-2.0 gobject-2.0 \ - gthread-2.0 -WANTLIB += ${MODPY_WANTLIB} +WANTLIB = m util IDL-2 pcre glib-2.0 gmodule-2.0 gobject-2.0 \ + gthread-2.0 ORBit-2 ORBit-imodule-2 +WANTLIB += ${MODPY_WANTLIB} MODULES= devel/gettext \ lang/python \ x11/gnome LIB_DEPENDS= ${MODPY_LIB_DEPENDS} \ - ORBit-2,ORBit-imodule-2::devel/ORBit2 + ::devel/ORBit2 USE_GMAKE= Yes LIBTOOL_FLAGS+= --tag=disable-static diff --git a/devel/py-silc/Makefile b/devel/py-silc/Makefile index 654f647d248..97166ea3950 100644 --- a/devel/py-silc/Makefile +++ b/devel/py-silc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.11 2010/08/30 22:24:15 jasper Exp $ +# $OpenBSD: Makefile,v 1.12 2010/11/08 10:28:22 espie Exp $ SHARED_ONLY= Yes @@ -26,7 +26,8 @@ EXTRACT_SUFX= .tar.bz2 MODULES= lang/python converters/libiconv -LIB_DEPENDS= silc.>=7,silcclient.>=5::devel/silc-toolkit +LIB_DEPENDS= ::devel/silc-toolkit +WANTLIB += silc.>=7 silcclient.>=5 NO_REGRESS= Yes diff --git a/devel/pygame/Makefile b/devel/pygame/Makefile index 98a384e3a01..fdfcee554ef 100644 --- a/devel/pygame/Makefile +++ b/devel/pygame/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2010/10/24 21:11:02 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.26 2010/11/08 10:28:22 espie Exp $ SHARED_ONLY= Yes @@ -17,7 +17,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += SDL X11 jpeg png pthread-stubs smpeg xcb +WANTLIB += SDL X11 jpeg png pthread-stubs smpeg xcb SDL_ttf SDL_image SDL_mixer MASTER_SITES= ${HOMEPAGE}ftp/ @@ -25,9 +25,9 @@ MODULES= lang/python BUILD_DEPENDS+= :py-Numeric-*:math/py-Numeric -LIB_DEPENDS= SDL_ttf::devel/sdl-ttf \ - SDL_image::devel/sdl-image \ - SDL_mixer::devel/sdl-mixer +LIB_DEPENDS= ::devel/sdl-ttf \ + ::devel/sdl-image \ + ::devel/sdl-mixer MAKE_ENV+= LOCALBASE="${LOCALBASE}" \ diff --git a/devel/pyusb/Makefile b/devel/pyusb/Makefile index d370362c5cc..e0db27991a4 100644 --- a/devel/pyusb/Makefile +++ b/devel/pyusb/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2010/08/30 22:24:16 jasper Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/08 10:28:22 espie Exp $ SHARED_ONLY= Yes COMMENT= python interface to libusb @@ -20,7 +20,8 @@ NO_REGRESS= Yes MODULES= lang/python -LIB_DEPENDS= usb::devel/libusb +LIB_DEPENDS= ::devel/libusb +WANTLIB = usb pre-configure: @perl -pi -e 's|_LOCALBASE_|${LOCALBASE}|g' ${WRKSRC}/setup.py diff --git a/devel/qt-creator/Makefile b/devel/qt-creator/Makefile index 0ead8a20e51..4a760cedc45 100644 --- a/devel/qt-creator/Makefile +++ b/devel/qt-creator/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.6 2010/10/24 21:11:02 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.7 2010/11/08 10:28:22 espie Exp $ COMMENT = cross-platform IDE for use with Qt V = 1.3.1 DISTNAME = qt-creator-${V}-src -PKGNAME = qt-creator-${V}p2 +PKGNAME = qt-creator-${V} +REVISION = 2 EXTRACT_SUFX = .zip ONLY_FOR_ARCHS = ${GCC4_ARCHS} @@ -33,14 +34,15 @@ PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes WANTLIB += c m pthread stdc++ sqlite3 - +WANTLIB += QtDBus QtWebKit QtXmlPatterns QtDesigner.>=7 +WANTLIB += QtDesignerComponents.>=7 QtGui.>=8 QtHelp QtNetwork.>=7 +WANTLIB += QtScript QtSql.>=7 QtSvg.>=7 QtXml.>=7 phonon MASTER_SITES = http://get.qt.nokia.com/qtcreator/ MODULES = x11/qt4 -LIB_DEPENDS = QtDBus,QtWebKit,QtXmlPatterns,QtDesigner.>=7,QtDesignerComponents.>=7,QtGui.>=8,QtHelp,QtNetwork.>=7,QtScript,QtSql.>=7,QtSvg.>=7,QtXml.>=7,phonon::x11/qt4 BUILD_DEPENDS = ::x11/qt4,-sqlite -RUN_DEPENDS = ::x11/qt4,-sqlite ::devel/gmake +RUN_DEPENDS = ::x11/qt4,-sqlite ::devel/gmake PORTHOME = ${WRKDIR} diff --git a/devel/qt4-eventsview/Makefile b/devel/qt4-eventsview/Makefile index 02ea27f9e67..fde178aef6a 100644 --- a/devel/qt4-eventsview/Makefile +++ b/devel/qt4-eventsview/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2010/09/03 16:23:26 naddy Exp $ +# $OpenBSD: Makefile,v 1.6 2010/11/08 10:28:22 espie Exp $ BROKEN= does not work with Qt >= 4.6 @@ -18,7 +18,8 @@ MAKE_FLAGS+=LIB$l_VERSION=$v DIST_SUBDIR= qt4-eventsview-$V V= 0.1 DISTNAME= 57337-eventsview -PKGNAME= qt4-eventsview-$Vp1 +PKGNAME= qt4-eventsview-$V +REVISION = 1 MASTER_SITES= http://qt-apps.org/CONTENT/content-files/ WRKDIST= ${WRKDIR}/eventsview @@ -38,11 +39,11 @@ do-install: ${INSTALL_DATA} ${WRKBUILD}/test/{Makefile,main.cpp} ${SAMPLE} ${INSTALL_PROGRAM} ${WRKBUILD}/test/test ${SAMPLE} -LIB_DEPENDS= glib-2.0,gobject-2.0,gthread-2.0::devel/glib2 \ - lib/qt4/QtGui::x11/qt4 +LIB_DEPENDS= ::devel/glib2 WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c expat fontconfig WANTLIB += freetype iconv intl m png pthread pthread-stubs stdc++ xcb z +WANTLIB += glib-2.0 gobject-2.0 gthread-2.0 lib/qt4/QtGui SUBST_VARS= SAMPLE diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile index 640b148c6a9..5addf1393ab 100644 --- a/devel/rapidsvn/Makefile +++ b/devel/rapidsvn/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.10 2010/10/24 21:11:02 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.11 2010/11/08 10:28:22 espie Exp $ COMMENT= graphical subversion client VERSION= 0.9.4 DISTNAME= rapidsvn-${VERSION} -PKGNAME= ${DISTNAME}p6 +REVISION = 6 CATEGORIES= devel HOMEPAGE= http://www.rapidsvn.org/ @@ -26,10 +26,15 @@ USE_LIBTOOL= Yes WANTLIB += apr-1 aprutil-1 asn1 c crypto db expat gssapi krb5 WANTLIB += m neon pthread sasl2 sqlite3 ssl stdc++ z +WANTLIB += wx_base_xml wx_gtk2_html wx_gtk2_dbgrid wx_gtk2_adv wx_gtk2_xrc +WANTLIB += wx_base_net wx_gtk2_qa wx_base wx_base_odbc wx_gtk2_core +WANTLIB += wx_gtk2_aui wx_gtk2_richtext +WANTLIB += svn_client-1 svn_delta-1 svn_diff-1 svn_fs-1 svn_fs_base-1 +WANTLIB += svn_fs_fs-1 svn_ra-1 svn_ra_local-1 svn_ra_svn-1 svn_repos-1 +WANTLIB += svn_subr-1 svn_wc-1 svn_fs_util-1 svn_ra_neon-1 -LIB_DEPENDS= wx_base_xml,wx_gtk2_html,wx_gtk2_dbgrid,wx_gtk2_adv,wx_gtk2_xrc,wx_base_net,wx_gtk2_qa,wx_base,wx_base_odbc,wx_gtk2_core,wx_gtk2_aui,wx_gtk2_richtext:wxWidgets-gtk2->=2.6.3:x11/wxWidgets \ - svn_client-1,svn_delta-1,svn_diff-1,svn_fs-1,svn_fs_base-1,svn_fs_fs-1,svn_ra-1,svn_ra_local-1,svn_ra_svn-1,svn_repos-1,svn_subr-1,svn_wc-1,svn_fs_util-1,svn_ra_neon-1:subversion->=1.2:devel/subversion - +LIB_DEPENDS= :wxWidgets-gtk2->=2.6.3:x11/wxWidgets \ + :subversion->=1.2:devel/subversion MODULES= devel/gettext CONFIGURE_STYLE=gnu diff --git a/devel/rsvndump/Makefile b/devel/rsvndump/Makefile index 46d1c6b3538..9ffc388dc55 100644 --- a/devel/rsvndump/Makefile +++ b/devel/rsvndump/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2009/10/10 11:02:52 sthen Exp $ +# $OpenBSD: Makefile,v 1.2 2010/11/08 10:28:23 espie Exp $ COMMENT = remote svn repository dump CATEGORIES = devel @@ -15,11 +15,11 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB = c apr-1 - +WANTLIB = c apr-1 \ + svn_client-1 svn_delta-1 svn_fs-1 svn_ra-1 svn_subr-1 MODULES = devel/gettext -LIB_DEPENDS = svn_client-1,svn_delta-1,svn_fs-1,svn_ra-1,svn_subr-1:subversion->=1.4:devel/subversion +LIB_DEPENDS = :subversion->=1.4:devel/subversion CONFIGURE_STYLE = gnu diff --git a/devel/smpeg/Makefile b/devel/smpeg/Makefile index 47e15b8a47b..87d3041e1f0 100644 --- a/devel/smpeg/Makefile +++ b/devel/smpeg/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.33 2010/10/24 21:11:03 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.34 2010/11/08 10:28:23 espie Exp $ COMMENT= mpeg video player library with sound support DISTNAME= smpeg-0.4.4 -PKGNAME= ${DISTNAME}p10 +PKGNAME= ${DISTNAME} +REVISION = 10 SHARED_LIBS= smpeg 2.0 CATEGORIES= devel graphics @@ -15,14 +16,14 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= X11 Xau Xdmcp Xext Xrandr Xrender \ +WANTLIB= X11 Xau Xdmcp Xext Xrandr Xrender SDL \ c iconv m pthread pthread-stubs sndio usbhid xcb MASTER_SITES= http://www.dulug.de/loki/open-source/smpeg/ \ http://gd.tuwien.ac.at/video/lib/smpeg/ \ http://mirrors.sunsite.dk/lokigames/open-source/smpeg/ -LIB_DEPENDS= SDL::devel/sdl +LIB_DEPENDS= ::devel/sdl USE_LIBTOOL= Yes USE_GROFF = Yes @@ -34,8 +35,6 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ --disable-opengl-player \ --disable-gtk-player -.include - post-install: ${INSTALL_MAN} ${FILESDIR}/smpeg.3 ${PREFIX}/man/man3 diff --git a/devel/startup-notification/Makefile b/devel/startup-notification/Makefile index 6275f699352..9944d7443ae 100644 --- a/devel/startup-notification/Makefile +++ b/devel/startup-notification/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.14 2010/10/24 21:11:03 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.15 2010/11/08 10:28:23 espie Exp $ COMMENT= library for tracking application startup @@ -16,11 +16,11 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB += ICE SM X11 Xau Xdmcp pthread-stubs xcb xcb-atom xcb-aux -WANTLIB += xcb-event +WANTLIB += xcb-event execinfo MASTER_SITES= http://www.freedesktop.org/software/startup-notification/releases/ -LIB_DEPENDS= execinfo::devel/libexecinfo +LIB_DEPENDS= ::devel/libexecinfo USE_LIBTOOL= Yes CONFIGURE_STYLE= gnu