diff options
author | jmmv <jmmv@pkgsrc.org> | 2003-01-30 11:14:42 +0000 |
---|---|---|
committer | jmmv <jmmv@pkgsrc.org> | 2003-01-30 11:14:42 +0000 |
commit | cdc72f53c19198e786a9924678c1b886b6f7aab0 (patch) | |
tree | 1976cf1c978add0e5a1c9b4e012db1abe20837a2 /x11 | |
parent | 4eda96652bb5935ee2fd3e78055b3d4463cb61a6 (diff) | |
download | pkgsrc-cdc72f53c19198e786a9924678c1b886b6f7aab0.tar.gz |
Depend on gnome1-dirs to handle shared directories (and adjust PLISTs to not
remove them). Bump PKGREVISION.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/gnome-core/Makefile | 5 | ||||
-rw-r--r-- | x11/gnome-core/PLIST | 39 | ||||
-rw-r--r-- | x11/gnome-libs/Makefile | 5 | ||||
-rw-r--r-- | x11/gnome-libs/PLIST | 8 |
4 files changed, 30 insertions, 27 deletions
diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile index 7a316f660a5..1a1ffca1bab 100644 --- a/x11/gnome-core/Makefile +++ b/x11/gnome-core/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.83 2003/01/10 07:58:27 cjep Exp $ +# $NetBSD: Makefile,v 1.84 2003/01/30 11:14:43 jmmv Exp $ # DISTNAME= gnome-core-1.4.2 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-core/1.4/} EXTRACT_SUFX= .tar.bz2 @@ -48,6 +48,7 @@ post-install: .include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk" .include "../../graphics/gnome-pixmaps/buildlink2.mk" .include "../../lang/perl5/buildlink2.mk" +.include "../../misc/gnome1-dirs/buildlink2.mk" .include "../../textproc/libxml/buildlink2.mk" .include "../../www/gtkhtml/buildlink2.mk" .include "../../www/libghttp/buildlink2.mk" diff --git a/x11/gnome-core/PLIST b/x11/gnome-core/PLIST index 32fab929bfb..6bd09f86b3f 100644 --- a/x11/gnome-core/PLIST +++ b/x11/gnome-core/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2002/09/14 02:46:56 rh Exp $ +@comment $NetBSD: PLIST,v 1.11 2003/01/30 11:14:43 jmmv Exp $ bin/deskguide_applet bin/gmenu bin/gnome-about @@ -1149,8 +1149,8 @@ share/pixmaps/splash/gnome-splash.png @dirrm share/gnome/help/mailcheck_applet @exec ${MKDIR} %D/share/gnome/help/lgpl/C/stylesheet-images @dirrm share/gnome/help/lgpl/C/stylesheet-images -@dirrm share/gnome/help/lgpl/C -@dirrm share/gnome/help/lgpl +@comment in gnome1-dirs: @dirrm share/gnome/help/lgpl/C +@comment in gnome1-dirs: @dirrm share/gnome/help/lgpl @dirrm share/gnome/help/help-browser/wa @dirrm share/gnome/help/help-browser/uk @dirrm share/gnome/help/help-browser/no @@ -1171,8 +1171,8 @@ share/pixmaps/splash/gnome-splash.png @dirrm share/gnome/help/help-browser @exec ${MKDIR} %D/share/gnome/help/gpl/C/stylesheet-images @dirrm share/gnome/help/gpl/C/stylesheet-images -@dirrm share/gnome/help/gpl/C -@dirrm share/gnome/help/gpl +@comment in gnome1-dirs: @dirrm share/gnome/help/gpl/C +@comment in gnome1-dirs: @dirrm share/gnome/help/gpl @exec ${MKDIR} %D/share/gnome/help/gnome-terminal/no/stylesheet-images @dirrm share/gnome/help/gnome-terminal/no/stylesheet-images @dirrm share/gnome/help/gnome-terminal/no @@ -1233,8 +1233,8 @@ share/pixmaps/splash/gnome-splash.png @dirrm share/gnome/help/fish_applet @exec ${MKDIR} %D/share/gnome/help/fdl/C/stylesheet-images @dirrm share/gnome/help/fdl/C/stylesheet-images -@dirrm share/gnome/help/fdl/C -@dirrm share/gnome/help/fdl +@comment in gnome1-dirs: @dirrm share/gnome/help/fdl/C +@comment in gnome1-dirs: @dirrm share/gnome/help/fdl @exec ${MKDIR} %D/share/gnome/help/desk-guide_applet/it/stylesheet-images @dirrm share/gnome/help/desk-guide_applet/it/stylesheet-images @dirrm share/gnome/help/desk-guide_applet/it/figures @@ -1277,18 +1277,19 @@ share/pixmaps/splash/gnome-splash.png @dirrm share/gnome/help/clock_applet/C/figures @dirrm share/gnome/help/clock_applet/C @dirrm share/gnome/help/clock_applet -@unexec ${RMDIR} %D/share/gnome/apps/Utilities 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/gnome/apps/System 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/gnome/apps/Settings/Session 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/gnome/apps/Settings/Desktop 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/gnome/apps/Settings 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/gnome/apps/Multimedia 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/gnome/apps/Internet 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/gnome/apps/Graphics 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/gnome/apps/Games 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/gnome/apps/Development 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/gnome/apps/Applications 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/gnome/apps 2>/dev/null || ${TRUE} +@comment in gnome1-dirs: @dirrm share/gnome/help +@comment in gnome1-dirs: @dirrm share/gnome/apps/Utilities +@comment in gnome1-dirs: @dirrm share/gnome/apps/System +@comment in gnome1-dirs: @dirrm share/gnome/apps/Settings/Session +@comment in gnome1-dirs: @dirrm share/gnome/apps/Settings/Desktop +@comment in gnome1-dirs: @dirrm share/gnome/apps/Settings +@comment in gnome1-dirs: @dirrm share/gnome/apps/Multimedia +@comment in gnome1-dirs: @dirrm share/gnome/apps/Internet +@comment in gnome1-dirs: @dirrm share/gnome/apps/Graphics +@comment in gnome1-dirs: @dirrm share/gnome/apps/Games +@comment in gnome1-dirs: @dirrm share/gnome/apps/Development +@comment in gnome1-dirs: @dirrm share/gnome/apps/Applications +@comment in gnome1-dirs: @dirrm share/gnome/apps @unexec ${RMDIR} %D/share/gnome-terminal/glade 2>/dev/null || ${TRUE} @unexec ${RMDIR} %D/share/gnome-terminal 2>/dev/null || ${TRUE} @unexec ${RMDIR} %D/share/gnome-about 2>/dev/null || ${TRUE} diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 2678fb8871b..84e78de0c1f 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.82 2003/01/14 21:41:07 jmmv Exp $ +# $NetBSD: Makefile,v 1.83 2003/01/30 11:14:42 jmmv Exp $ DISTNAME= gnome-libs-1.4.1.4 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-libs/1.4/} @@ -65,6 +65,7 @@ post-install: .include "../../devel/gettext-lib/buildlink2.mk" .include "../../graphics/imlib/buildlink2.mk" .include "../../graphics/xpm/buildlink2.mk" +.include "../../misc/gnome1-dirs/buildlink2.mk" .include "../../net/ORBit/buildlink2.mk" .include "../../x11/gtk/buildlink2.mk" diff --git a/x11/gnome-libs/PLIST b/x11/gnome-libs/PLIST index 47a4dcda79b..643dbbe70ec 100644 --- a/x11/gnome-libs/PLIST +++ b/x11/gnome-libs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2003/01/14 21:41:07 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.11 2003/01/30 11:14:43 jmmv Exp $ bin/dns-helper bin/gconfigger bin/gnome-bug @@ -591,9 +591,9 @@ share/type-convert/type.convert @dirrm share/gnome/html @dirrm share/gnome/help/gnome-dev-info/C @dirrm share/gnome/help/gnome-dev-info -@dirrm share/gnome/help -@unexec ${RMDIR} %D/share/gnome/apps 2>/dev/null || ${TRUE} -@unexec ${RMDIR} %D/share/gnome 2>/dev/null || ${TRUE} +@comment in gnome1-dirs: @dirrm share/gnome/help +@comment in gnome1-dirs: @dirrm share/gnome/apps +@comment in gnome1-dirs: @dirrm share/gnome @dirrm share/doc/html/libart @dirrm share/doc/gnome-libs @dirrm lib/gnome-libs/include |