From a7f643f9eac24e075aac90d9a5184c27949f178d Mon Sep 17 00:00:00 2001 From: sthen Date: Wed, 25 Aug 2010 20:45:52 +0000 Subject: [PATCH] add missing wantlibs, new-style lib_depends/revision, bump --- audio/ladspa/Makefile | 5 +++-- databases/iodbc/Makefile | 35 +++++++++++++++++++--------------- devel/libglade2/Makefile | 13 ++++++++----- devel/libnotify/Makefile | 14 ++++++++------ graphics/py-cairo/Makefile | 10 ++++++---- multimedia/mjpegtools/Makefile | 18 +++++++++-------- www/libcroco/Makefile | 10 ++++++---- x11/gtk-engines2/Makefile | 6 +++--- 8 files changed, 64 insertions(+), 47 deletions(-) diff --git a/audio/ladspa/Makefile b/audio/ladspa/Makefile index f3ac8e31987..97477880828 100644 --- a/audio/ladspa/Makefile +++ b/audio/ladspa/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.4 2010/05/09 21:18:29 robert Exp $ +# $OpenBSD: Makefile,v 1.5 2010/08/25 20:45:52 sthen Exp $ COMMENT= linux audio developer simple plugin API HOMEPAGE= http://www.ladspa.org/ CATEGORIES= audio devel V= 1.13 +REVISION= 0 SHARED_ONLY= Yes DISTNAME= ladspa_sdk_${V} @@ -26,7 +27,7 @@ ALL_TARGET= targets MAKE_FLAGS= LIBRARIES=-lm OPTS="${CFLAGS}" PROGRAMS= analyseplugin applyplugin listplugins -WANTLIB= c m +WANTLIB= c m stdc++ do-install: .for i in ${PROGRAMS} diff --git a/databases/iodbc/Makefile b/databases/iodbc/Makefile index f8aa2a799dc..c28c244b0cf 100644 --- a/databases/iodbc/Makefile +++ b/databases/iodbc/Makefile @@ -1,14 +1,16 @@ -# $OpenBSD: Makefile,v 1.19 2009/12/09 20:36:49 sthen Exp $ +# $OpenBSD: Makefile,v 1.20 2010/08/25 20:45:52 sthen Exp $ COMMENT-main= ODBC 3.x driver manager COMMENT-admin= ODBC 3.x driver manager admin application V= 3.52.6 +REVISION-main= 0 +REVISION-admin= 1 DISTNAME= libiodbc-$V PKGNAME= iodbc-$V -PKGNAME-main= iodbc-$Vp0 -PKGNAME-admin= iodbc-admin-$Vp0 +PKGNAME-main= iodbc-$V +PKGNAME-admin= iodbc-admin-$V CATEGORIES= databases @@ -42,22 +44,25 @@ MULTI_PACKAGES= -main -admin WANTLIB= c pthread LIB_DEPENDS-admin= ${MODGETTEXT_LIB_DEPENDS} \ - iodbc,iodbcinst::databases/iodbc,-main \ - atk-1.0::devel/atk \ - glib-2.0,gmodule-2.0,gobject-2.0,gio-2.0::devel/glib2 \ - pango-1.0,pangocairo-1.0,pangoft2-1.0::devel/pango \ - pcre::devel/pcre \ - cairo::graphics/cairo \ - glitz::graphics/glitz \ - png::graphics/png \ - gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 + ::databases/iodbc,-main \ + ::devel/atk \ + ::devel/glib2 \ + ::devel/pango \ + ::devel/pcre \ + ::graphics/cairo \ + ::graphics/glitz \ + ::graphics/png \ + ::x11/gtk+2 LIB_DEPENDS-main= # this space intentionally left blank WANTLIB-admin= ${WANTLIB} \ - X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ - Xi Xinerama Xrandr Xrender expat fontconfig freetype \ - m pixman-1 pthread-stubs xcb z + X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi \ + Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig \ + freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz \ + gmodule-2.0 gobject-2.0 gtk-x11-2.0 iodbc iodbcinst m \ + pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png \ + pthread-stubs xcb xcb-render xcb-render-util z post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/iodbc diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile index 8e57f117b85..9bf9e0ef2b0 100644 --- a/devel/libglade2/Makefile +++ b/devel/libglade2/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.35 2010/03/20 17:06:45 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.36 2010/08/25 20:45:52 sthen Exp $ COMMENT= library for loading GLADE interface files at runtime GNOME_VERSION= 2.6.4 GNOME_PROJECT= libglade -PKGNAME= libglade2-${GNOME_VERSION}p1 +PKGNAME= libglade2-${GNOME_VERSION} +REVISION= 2 SHARED_LIBS += glade-2.0 1.0 # .0.8 CATEGORIES= devel @@ -16,17 +17,19 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes + WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig \ freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 m \ pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png \ - pthread-stubs xcb z + pthread-stubs xcb z gthread-2.0 xcb-render xcb-render-util \ + gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 xml2.>=7 MODULES= devel/gettext \ lang/python \ x11/gnome -LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \ - xml2.>=7:libxml->=2.6.16p6:textproc/libxml +LIB_DEPENDS= ::x11/gtk+2 \ + :libxml->=2.6.16p6:textproc/libxml USE_X11= Yes CONFIGURE_STYLE= gnu diff --git a/devel/libnotify/Makefile b/devel/libnotify/Makefile index 07b9e544c63..3964a18cb17 100644 --- a/devel/libnotify/Makefile +++ b/devel/libnotify/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.8 2009/08/10 06:31:08 kili Exp $ +# $OpenBSD: Makefile,v 1.9 2010/08/25 20:45:52 sthen Exp $ COMMENT= send desktop notifications to a notification daemon DISTNAME= libnotify-0.4.5 -PKGNAME= ${DISTNAME}p0 +REVISION= 1 CATEGORIES= devel SHARED_LIBS += notify 2.3 # .2.3 @@ -19,16 +19,18 @@ WANTLIB= X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \ Xrender Xcomposite Xdamage atk-1.0 c cairo expat pcre \ glitz gmodule-2.0 gobject-2.0 m pango-1.0 pangocairo-1.0 \ fontconfig freetype glib-2.0 pangoft2-1.0 png pixman-1 \ - pthread z gio-2.0 pthread-stubs xcb + pthread z gio-2.0 pthread-stubs xcb gthread-2.0 xcb-render \ + xcb-render-util dbus-1 dbus-glib-1 gdk_pixbuf-2.0 \ + gdk-x11-2.0 gtk-x11-2.0 MASTER_SITES= ${HOMEPAGE}/files/releases/source/libnotify/ EXTRACT_SUFX= .tar.bz2 MODULES= devel/gettext -LIB_DEPENDS= dbus-1.>=3::x11/dbus \ - dbus-glib-1.>=3::x11/dbus-glib \ - gdk_pixbuf-2.0.>=1000,gdk-x11-2.0.>=1000,gtk-x11-2.0.>=1000::x11/gtk+2 +LIB_DEPENDS= ::x11/dbus \ + ::x11/dbus-glib \ + ::x11/gtk+2 USE_X11= Yes USE_GMAKE= Yes diff --git a/graphics/py-cairo/Makefile b/graphics/py-cairo/Makefile index afd012991d4..8f473330e67 100644 --- a/graphics/py-cairo/Makefile +++ b/graphics/py-cairo/Makefile @@ -1,10 +1,11 @@ -# $OpenBSD: Makefile,v 1.19 2009/09/04 11:44:00 eric Exp $ +# $OpenBSD: Makefile,v 1.20 2010/08/25 20:45:52 sthen Exp $ COMMENT= cairo bindings for Python VERSION= 1.8.8 DISTNAME= pycairo-${VERSION} PKGNAME= py-cairo-${VERSION} +REVISION= 0 CATEGORIES= graphics HOMEPAGE= http://cairographics.org/pycairo/ @@ -19,11 +20,12 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://cairographics.org/releases/ -WANTLIB= X11 Xau Xdmcp Xrender expat fontconfig freetype glitz -WANTLIB+= m pixman-1 png pthread-stubs xcb z +WANTLIB= X11 Xau Xdmcp Xrender cairo expat fontconfig freetype glitz m +WANTLIB+= pixman-1 png pthread-stubs xcb xcb-render xcb-render-util z + MODULES= lang/python -LIB_DEPENDS= cairo::graphics/cairo +LIB_DEPENDS= ::graphics/cairo USE_LIBTOOL= Yes USE_X11= Yes diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index e443cfc25c1..25b5d5aa09b 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.20 2009/08/10 06:33:02 kili Exp $ +# $OpenBSD: Makefile,v 1.21 2010/08/25 20:45:52 sthen Exp $ COMMENT= tools to edit/modify/encode video streams DISTNAME= mjpegtools-1.9.0rc3 -PKGNAME= ${DISTNAME}p4 +REVISION= 5 CATEGORIES= multimedia SHARED_LIBS= lavfile 4.0 \ lavfile-1.9 4.0 \ @@ -33,14 +33,16 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \ expat fontconfig freetype gio-2.0 glib-2.0 glitz \ gmodule-2.0 gobject-2.0 m pango-1.0 pangocairo-1.0 \ pangoft2-1.0 pcre pthread pthread-stubs pixman-1 \ - sndio stdc++ usbhid xcb z + sndio stdc++ usbhid xcb z gthread-2.0 xcb-render \ + xcb-render-util SDL dv jpeg png gdk-x11-2.0 \ + gdk_pixbuf-2.0 gtk-x11-2.0 MODULES+= devel/gettext -LIB_DEPENDS= SDL.>=2:sdl-*-!no_x11:devel/sdl \ - dv.>=4::multimedia/libdv \ - jpeg.>=62::graphics/jpeg \ - png.>=4::graphics/png \ - gdk-x11-2.0.>=400.0,gdk_pixbuf-2.0.>=400.0,gtk-x11-2.0.>=400.0::x11/gtk+2 \ +LIB_DEPENDS= :sdl-*-!no_x11:devel/sdl \ + ::multimedia/libdv \ + ::graphics/jpeg \ + ::graphics/png \ + ::x11/gtk+2 \ USE_X11= Yes USE_LIBTOOL= Yes diff --git a/www/libcroco/Makefile b/www/libcroco/Makefile index a1d65976e0c..fce08eb5cda 100644 --- a/www/libcroco/Makefile +++ b/www/libcroco/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2009/02/05 09:47:02 jasper Exp $ +# $OpenBSD: Makefile,v 1.6 2010/08/25 20:45:52 sthen Exp $ COMMENT= generic CSS parsing library for GNOME project GNOME_PROJECT= libcroco GNOME_VERSION= 0.6.2 +REVISION= 0 SHARED_LIBS += croco-0.6 4.0 # .3.1 CATEGORIES= www devel @@ -14,13 +15,14 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c m pcre z + +WANTLIB= c glib-2.0 m pcre pthread xmlt z MODULES= devel/gettext \ x11/gnome -LIB_DEPENDS= glib-2.0::devel/glib2 \ - xml2::textproc/libxml +LIB_DEPENDS= ::devel/glib2 \ + ::textproc/libxml CONFIGURE_STYLE= gnu CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/x11/gtk-engines2/Makefile b/x11/gtk-engines2/Makefile index bbccd76c099..f4641a30fe9 100644 --- a/x11/gtk-engines2/Makefile +++ b/x11/gtk-engines2/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.41 2010/07/30 12:03:08 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.42 2010/08/25 20:45:52 sthen Exp $ SHARED_ONLY= Yes @@ -7,7 +7,7 @@ COMMENT= collection of theme engines for GTK+2 GNOME_PROJECT= gtk-engines GNOME_VERSION= 2.20.1 -REVISION= 0 +REVISION= 1 # warning: PKGNAME does not default to ${DISTNAME} PKGNAME= gtk-engines2-${GNOME_VERSION} @@ -27,7 +27,7 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 m \ pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png z pcre \ pthread-stubs xcb xcb-render xcb-render-util gdk-x11-2.0 \ - gdk_pixbuf-2.0 gtk-x11-2.0 + gdk_pixbuf-2.0 gthread-2.0 gtk-x11-2.0 LIB_DEPENDS= ::x11/gtk+2 RUN_DEPENDS= :hicolor-icon-theme-*:x11/hicolor-icon-theme