From 114231115b12746609fc96426ff2ed55f1319736 Mon Sep 17 00:00:00 2001 From: wilfried Date: Tue, 15 Nov 2005 21:14:27 +0000 Subject: [PATCH] fix wantlib + bump --- www/cssed/Makefile | 10 +++++----- x11/gnome/applets2/Makefile | 16 ++++++++-------- x11/gromit/Makefile | 8 ++++---- x11/gtk-thinice-engine/Makefile | 7 ++++--- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/www/cssed/Makefile b/www/cssed/Makefile index 8fb8728e47d..f787ed37e71 100755 --- a/www/cssed/Makefile +++ b/www/cssed/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.2 2005/10/29 12:12:04 alek Exp $ +# $OpenBSD: Makefile,v 1.3 2005/11/15 21:14:27 wilfried Exp $ COMMENT= "CSS editor" DISTNAME= cssed-0.3.0 -PKGNAME= ${DISTNAME}p0 +PKGNAME= ${DISTNAME}p1 CATEGORIES= www HOMEPAGE= http://cssed.sourceforge.net/ @@ -18,10 +18,10 @@ PERMIT_DISTFILES_FTP= yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cssed/} -WANTLIB= Xrender c freetype pthread Xft stdc++ m X11 fontconfig \ +WANTLIB= c freetype pthread stdc++ m X11 fontconfig \ gthread-2.0.0.0 glib-2.0.0.0 gmodule-2.0.0.0 \ - pangox-1.0.0.0 gobject-2.0.0.0 pangoxft-1.0.0.0 \ - pango-1.0.0.0 atk-1.0.0.0 + gobject-2.0.0.0 atk-1.0.0.0 cairo pango-1.0.0.0 \ + pangocairo-1.0.0.0 pangoft2-1.0.0.0 BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig LIB_DEPENDS= gtk-x11-2.0.600.10,gdk_pixbuf-2.0.600.0,gdk-x11-2.0.600.0::x11/gtk+2 \ diff --git a/x11/gnome/applets2/Makefile b/x11/gnome/applets2/Makefile index 3f71aa267ac..7cbddf8f243 100644 --- a/x11/gnome/applets2/Makefile +++ b/x11/gnome/applets2/Makefile @@ -1,12 +1,12 @@ -# $OpenBSD: Makefile,v 1.22 2005/09/16 09:51:28 espie Exp $ +# $OpenBSD: Makefile,v 1.23 2005/11/15 21:17:02 wilfried Exp $ COMMENT= "applets for use with the GNOME panel" COMMENT-battstat= "GNOME applet for monitoring battery level" VERSION= 2.10.1 -SUBVERS= p0 +SUBVERS= p1 DISTNAME= gnome-applets-${VERSION} -PKGNAME= gnome-applets2-${VERSION}p1 +PKGNAME= gnome-applets2-${VERSION}p2 PKGNAME-battstat= gnome-applets2-battstat-${VERSION}${SUBVERS} CATEGORIES= x11 x11/gnome @@ -20,15 +20,15 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xft \ +WANTLIB= ICE ORBit-2 ORBitCosNaming-2 SM X11 Xext \ Xrender art_lgpl_2 atk-1.0.0.0 audiofile bonobo-2 \ bonobo-activation bonoboui-2 c crypto esd fontconfig \ freetype gconf-2 gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 \ glade-2.0.0.0 glib-2.0.0.0 gmodule-2.0.0.0 gnome-2 \ gnome-keyring gnomecanvas-2 gnomeui-2 gnomevfs-2 \ - gobject-2.0.0.0 gthread-2.0.0.0 gtk-x11-2.0.0.0 \ - jpeg m pango-1.0.0.0 pangoft2-1.0.0.0 pangox-1.0.0.0 \ - pangoxft-1.0.0.0 popt pthread ssl xml2 z + gobject-2.0.0.0 gthread-2.0.0.0 gtk-x11-2.0.0.0 jpeg \ + m pango-1.0.0.0 pangocairo-1.0.0.0 pangoft2-1.0.0.0 \ + cairo glitz png popt pthread ssl xml2 z MODULES= devel/gettext @@ -74,7 +74,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ ONLY_FOR_ARCHS= i386 powerpc LIB_DEPENDS= panel-applet-2.0::x11/gnome/panel . else -WANTLIB+= Xext XRes kvm xkbfile gstreamer-0.8.5.0 startup-notification-1 wnck-1 +WANTLIB+= XRes kvm xkbfile gstreamer-0.8.5.0 startup-notification-1 wnck-1 . endif .endif diff --git a/x11/gromit/Makefile b/x11/gromit/Makefile index d13671beac8..9098aad8d4b 100644 --- a/x11/gromit/Makefile +++ b/x11/gromit/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2005/06/15 17:30:20 niallo Exp $ +# $OpenBSD: Makefile,v 1.2 2005/11/15 21:17:48 wilfried Exp $ COMMENT= "small tool to make annotations on the screen" DISTNAME= gromit-20041213 +PKGNAME= ${DISTNAME}p0 CATEGORIES= x11 HOMEPAGE= http://www.home.unix-ag.org/simon/gromit/ @@ -17,9 +18,9 @@ PERMIT_DISTFILES_FTP= Yes MODULES= devel/gettext -WANTLIB= Xrender c freetype X11 m Xft fontconfig atk-1.0.0.0 \ +WANTLIB= c cairo freetype X11 m fontconfig atk-1.0.0.0 \ glib-2.0.0.0 gobject-2.0.0.0 gmodule-2.0.0.0 \ - pango-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 + pango-1.0.0.0 pangocairo-1.0.0.0 pangoft2-1.0.0.0 MASTER_SITES= ${HOMEPAGE} @@ -40,4 +41,3 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/gromitrc ${DOCDIR} .include - diff --git a/x11/gtk-thinice-engine/Makefile b/x11/gtk-thinice-engine/Makefile index 0c5c3c51ad2..37b049abec0 100644 --- a/x11/gtk-thinice-engine/Makefile +++ b/x11/gtk-thinice-engine/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.6 2004/12/17 15:18:33 alek Exp $ +# $OpenBSD: Makefile,v 1.7 2005/11/15 21:21:26 wilfried Exp $ NOT_FOR_ARCHS= ${NO_SHARED_ARCHS} @@ -6,6 +6,7 @@ COMMENT= "simple, clean theme engine for GTK+2" VERSION= 2.0.2 DISTNAME= gtk-thinice-engine-${VERSION} +PKGNAME= ${DISTNAME}p0 CATEGORIES= x11 HOMEPAGE= http://thinice.sourceforge.net/ @@ -15,9 +16,9 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= X11 Xcursor Xext Xft Xinerama Xrender atk-1.0.0.0 fontconfig \ +WANTLIB= X11 atk-1.0.0.0 cairo fontconfig \ freetype glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 iconv \ - intl m pango-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 + intl m pango-1.0.0.0 pangocairo-1.0.0.0 pangoft2-1.0.0.0 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=thinice/}