diff --git a/databases/mdbtools/snapshot/Makefile b/databases/mdbtools/snapshot/Makefile index 578e8b46c1d..710d099c5f1 100644 --- a/databases/mdbtools/snapshot/Makefile +++ b/databases/mdbtools/snapshot/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.17 2009/01/25 14:51:23 sturm Exp $ +# $OpenBSD: Makefile,v 1.18 2009/06/17 01:20:59 sthen Exp $ COMMENT-main= read microsoft Access MDB COMMENT-gmdb= graphical interface to MDB tools DATE= 20070603 DISTNAME= mdbtools-${DATE} PKGNAME-main= mdbtools-${DATE}p2 -PKGNAME-gmdb= gmdb-${DATE}p4 +PKGNAME-gmdb= gmdb-${DATE}p5 HOMEPAGE= http://mdbtools.sourceforge.net/ CATEGORIES= databases converters @@ -32,7 +32,7 @@ BUILD_DEPENDS= ::devel/bison \ ::lang/gawk LIB_DEPENDS= glib-2.0::devel/glib2 -WANTLIB= c pcre +WANTLIB= c pcre avahi-client avahi-common avahi-glib MODULES= devel/gettext diff --git a/databases/ocaml-sqlite3/Makefile b/databases/ocaml-sqlite3/Makefile index 1304d021e29..392e532d1af 100644 --- a/databases/ocaml-sqlite3/Makefile +++ b/databases/ocaml-sqlite3/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.13 2009/05/20 01:40:56 avsm Exp $ +# $OpenBSD: Makefile,v 1.14 2009/06/17 01:20:59 sthen Exp $ COMMENT= Objective Caml bindings for SQLite3 CATEGORIES= databases V= 1.5.0 DISTNAME= release-${V} -PKGNAME= ocaml-sqlite3-${V} +PKGNAME= ocaml-sqlite3-${V}p0 EXTRACT_SUFX= .tar.bz2 MASTER_SITES= http://hg.ocaml.info/release/ocaml-sqlite3/archive/ WRKDIST= ${WRKDIR}/ocaml-sqlite3-release-${V} @@ -31,8 +31,8 @@ CONFIGURE_ENV= CFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib -L." CONFIGURE_ARGS= --with-sqlite3=${LOCALBASE} BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ::sysutils/findlib \ - ::databases/sqlite3 +RUN_DEPENDS= ::sysutils/findlib +LIB_DEPENDS= sqlite3::databases/sqlite3 FAKE_ENV= OCAMLFIND_DESTDIR=${PREFIX}/lib/ocaml/site-lib/sqlite3 diff --git a/devel/beediff/Makefile b/devel/beediff/Makefile index 14f2f9a26bf..f71a1d2971f 100644 --- a/devel/beediff/Makefile +++ b/devel/beediff/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.3 2008/12/16 08:14:54 jasper Exp $ +# $OpenBSD: Makefile,v 1.4 2009/06/17 01:20:59 sthen Exp $ COMMENT= graphical file comparator V= 1.9 DISTNAME= beediff_${V}_src -PKGNAME= beediff-${V} +PKGNAME= beediff-${V}p0 CATEGORIES= textproc x11 devel HOMEPAGE= http://www.beesoft.pl/index.php?id=beediff @@ -16,9 +16,9 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= ICE SM X11 Xext Xi Xinerama Xrandr Xrender c fontconfig \ - freetype glib-2.0 gthread-2.0 iconv intl m png pthread \ - stdc++ z +WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c expat fontconfig +WANTLIB += freetype glib-2.0 gobject-2.0 gthread-2.0 iconv intl +WANTLIB += m png pthread stdc++ z LIB_DEPENDS+= lib/qt4/QtGui::x11/qt4 diff --git a/devel/gconf-editor/Makefile b/devel/gconf-editor/Makefile index 8e93d6b19e0..e7e8463483d 100644 --- a/devel/gconf-editor/Makefile +++ b/devel/gconf-editor/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.37 2009/06/11 18:27:02 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.38 2009/06/17 01:20:59 sthen Exp $ COMMENT= editor for the GConf configuration system GNOME_PROJECT= gconf-editor GNOME_VERSION= 2.24.1 -PKGNAME= ${DISTNAME}p6 +PKGNAME= ${DISTNAME}p7 CATEGORIES= devel HOMEPAGE= http://www.gnome.org/projects/gconf/ @@ -15,16 +15,16 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite \ - Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr \ - Xrender art_lgpl_2 atk-1.0 bonobo-2 bonobo-activation \ - bonoboui-2 c cairo crypto dbus-1 dbus-glib-1 expat \ - fontconfig freetype gailutil gdk-x11-2.0 \ - gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0 \ - gnome-2 gnome-keyring gnomecanvas-2 gnomevfs-2 \ - gobject-2.0 gthread-2.0 gtk-x11-2.0 m pango-1.0 \ - pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png popt \ - pthread ssl util xml2 z +WANTLIB += ICE ORBit-2 ORBitCosNaming-2 SM X11 Xau Xcomposite +WANTLIB += Xcursor Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr +WANTLIB += Xrender art_lgpl_2 atk-1.0 avahi-client avahi-common +WANTLIB += avahi-glib bonobo-2 bonobo-activation bonoboui-2 c +WANTLIB += cairo crypto dbus-1 dbus-glib-1 expat fontconfig freetype +WANTLIB += gailutil gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 +WANTLIB += glitz gmodule-2.0 gnome-2 gnome-keyring gnomecanvas-2 +WANTLIB += gnomevfs-2 gobject-2.0 gthread-2.0 gtk-x11-2.0 m pango-1.0 +WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png popt +WANTLIB += pthread ssl util xml2 z LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui diff --git a/devel/giggle/Makefile b/devel/giggle/Makefile index 157bdfee192..cf608d66650 100644 --- a/devel/giggle/Makefile +++ b/devel/giggle/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 2008/06/15 00:06:25 sthen Exp $ +# $OpenBSD: Makefile,v 1.4 2009/06/17 01:20:59 sthen Exp $ COMMENT= gtk-based git repository viewer CATEGORIES= devel x11 DISTNAME= giggle-0.4 -PKGNAME= ${DISTNAME}p1 +PKGNAME= ${DISTNAME}p2 SHARED_LIBS+= giggle 0.0 # .0.0 HOMEPAGE= http://developer.imendio.com/projects/giggle @@ -35,7 +35,7 @@ LIB_DEPENDS= glade-2.0.>=0::devel/libglade2 \ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \ - freetype gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0 glitz \ + 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 m pango-1.0 pangocairo-1.0 \ pangoft2-1.0 pcre pixman-1 png xml2 z diff --git a/devel/qt4-eventsview/Makefile b/devel/qt4-eventsview/Makefile index f367de186ef..e023154656b 100644 --- a/devel/qt4-eventsview/Makefile +++ b/devel/qt4-eventsview/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2007/09/16 02:53:12 merdely Exp $ +# $OpenBSD: Makefile,v 1.3 2009/06/17 01:20:59 sthen Exp $ COMMENT= event viewer for qt4 CATEGORIES= devel x11 @@ -13,9 +13,10 @@ SHARED_LIBS= eventsview 0.0 .for l v in $(SHARED_LIBS) MAKE_FLAGS+=LIB$l_VERSION=$v .endfor -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= qt4-eventsview-$V +V= 0.1 DISTNAME= 57337-eventsview -PKGNAME= qt4-eventsview-0.1 +PKGNAME= qt4-eventsview-$Vp0 MASTER_SITES= http://qt-apps.org/CONTENT/content-files/ WRKDIST= ${WRKDIR}/eventsview @@ -35,13 +36,11 @@ do-install: ${INSTALL_DATA} ${WRKBUILD}/test/{Makefile,main.cpp} ${SAMPLE} ${INSTALL_PROGRAM} ${WRKBUILD}/test/test ${SAMPLE} -LIB_DEPENDS= glib-2.0,gthread-2.0::devel/glib2 +LIB_DEPENDS= glib-2.0,gobject-2.0,gthread-2.0::devel/glib2 \ + lib/qt4/QtGui::x11/qt4 -WANTLIB += ICE SM X11 Xcursor Xext Xfixes Xi Xinerama Xrandr Xrender -WANTLIB += c fontconfig freetype iconv intl m png pthread stdc++ -WANTLIB += z - -WANTLIB += QtGui +WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c expat fontconfig +WANTLIB += freetype iconv intl m png pthread stdc++ z SUBST_VARS= SAMPLE