From 969d8f3cd8ca70f4902f49b26513cacf32e7594f Mon Sep 17 00:00:00 2001 From: wilfried Date: Wed, 16 Nov 2005 11:45:00 +0000 Subject: [PATCH] fix wantlib + bump --- www/minimo/Makefile | 10 +++++----- x11/xfce4/xfce4-appfinder/Makefile | 9 +++++---- x11/xfce4/xfce4-session/Makefile | 9 +++++---- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/www/minimo/Makefile b/www/minimo/Makefile index a1f3a663104..39b491f6e30 100644 --- a/www/minimo/Makefile +++ b/www/minimo/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.11 2005/11/08 07:19:07 jolan Exp $ +# $OpenBSD: Makefile,v 1.12 2005/11/16 11:45:33 wilfried Exp $ ONLY_FOR_ARCHS= alpha amd64 i386 powerpc sparc64 SHARED_ONLY= Yes COMMENT= "mini mozilla" DISTNAME= minimo-20050802 -PKGNAME= ${DISTNAME}p1 +PKGNAME= ${DISTNAME}p2 CATEGORIES= www MASTER_SITES= http://mirrors.protection.cx/~jolan/ @@ -32,9 +32,9 @@ LIB_DEPENDS= jpeg.62::graphics/jpeg \ png.3::graphics/png \ gdk-x11-2.0.600.0,gdk_pixbuf-2.0.600.0,gtk-x11-2.0.600.0::x11/gtk+2 WANTLIB= ICE SM X11 Xft Xrender Xt c fontconfig freetype m pthread z \ - atk-1.0.1011.0 glib-2.0.600.0 gmodule-2.0.600.0 \ - gobject-2.0.600.0 pango-1.0.800.0 pangox-1.0.800.0 \ - pangoxft-1.0.800.0 + atk-1.0.1011.0 cairo glib-2.0.600.0 gmodule-2.0.600.0 \ + gobject-2.0.600.0 pango-1.0.800.0 pangocairo-1.0.0.0 \ + pangoft2-1.0.0.0 .if empty(MACHINE_ARCH:Malpha) WANTLIB+= stdc++ .endif diff --git a/x11/xfce4/xfce4-appfinder/Makefile b/x11/xfce4/xfce4-appfinder/Makefile index cadfda0c4f5..060f408981f 100644 --- a/x11/xfce4/xfce4-appfinder/Makefile +++ b/x11/xfce4/xfce4-appfinder/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 2005/11/10 22:57:38 jolan Exp $ +# $OpenBSD: Makefile,v 1.4 2005/11/16 11:45:00 wilfried Exp $ COMMENT= "xfce4 application finder" V= 4.2.3 DISTNAME= xfce4-appfinder-${V} +PKGNAME= ${DISTNAME}p0 MASTER_SITES= http://www.xfce.org/archive/xfce-${V}/src/ HOMEPAGE= http://www.xfce.org/ @@ -17,11 +18,11 @@ MODULES= devel/gettext BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig LIB_DEPENDS= xfcegui4.3.4::x11/xfce4/libxfcegui4 RUN_DEPENDS= :xfdesktop-*:x11/xfce4/xfdesktop -WANTLIB= ICE SM X11 Xcursor Xext Xft Xinerama Xrender c fontconfig \ - freetype m \ +WANTLIB= ICE SM X11 Xext Xrender c fontconfig \ + freetype m z \ atk-1.0.0.0 gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 glib-2.0.0.0 \ gmodule-2.0.0.0 gobject-2.0.0.0 gtk-x11-2.0.0.0 pango-1.0.0.0 \ - pangoft2-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 \ + pangocairo-1.0.0.0 pangoft2-1.0.0.0 cairo glitz png \ startup-notification-1.0.0 xfce4util.1 diff --git a/x11/xfce4/xfce4-session/Makefile b/x11/xfce4/xfce4-session/Makefile index b93b086c96d..7804f3ecea1 100644 --- a/x11/xfce4/xfce4-session/Makefile +++ b/x11/xfce4/xfce4-session/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.4 2005/11/10 22:57:40 jolan Exp $ +# $OpenBSD: Makefile,v 1.5 2005/11/16 11:50:03 wilfried Exp $ COMMENT= "xfce4 session manager" V= 4.2.3 DISTNAME= xfce4-session-${V} +PKGNAME= ${DISTNAME}p0 MASTER_SITES= http://www.xfce.org/archive/xfce-${V}/src/ HOMEPAGE= http://www.xfce.org/ @@ -21,11 +22,11 @@ BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig \ LIB_DEPENDS= xfcegui4.3.4::x11/xfce4/libxfcegui4 \ xfce4mcs-client.2.3::x11/xfce4/libxfce4mcs RUN_DEPENDS= :xfce-mcs-manager-*:x11/xfce4/xfce-mcs-manager -WANTLIB= ICE SM X11 Xcursor Xext Xft Xinerama Xrender c fontconfig \ - freetype m \ +WANTLIB= ICE SM X11 Xext Xrender c fontconfig \ + freetype m z \ atk-1.0.0.0 gdk-x11-2.0.0.0 gdk_pixbuf-2.0.0.0 glib-2.0.0.0 \ gmodule-2.0.0.0 gobject-2.0.0.0 gtk-x11-2.0.0.0 pango-1.0.0.0 \ - pangoft2-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 \ + pangocairo-1.0.0.0 pangoft2-1.0.0.0 cairo glitz png \ startup-notification-1.0.0 xfce4util.1 .include