Depend on gnome1-dirs to handle shared directories (and adjust PLISTs to not

remove them).  Bump PKGREVISION.
This commit is contained in:
jmmv 2003-01-30 11:14:42 +00:00
parent 4eda96652b
commit cdc72f53c1
4 changed files with 30 additions and 27 deletions

View file

@ -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 DISTNAME= gnome-core-1.4.2
PKGREVISION= 1 PKGREVISION= 2
CATEGORIES= x11 gnome CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-core/1.4/} MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-core/1.4/}
EXTRACT_SUFX= .tar.bz2 EXTRACT_SUFX= .tar.bz2
@ -48,6 +48,7 @@ post-install:
.include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk" .include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk"
.include "../../graphics/gnome-pixmaps/buildlink2.mk" .include "../../graphics/gnome-pixmaps/buildlink2.mk"
.include "../../lang/perl5/buildlink2.mk" .include "../../lang/perl5/buildlink2.mk"
.include "../../misc/gnome1-dirs/buildlink2.mk"
.include "../../textproc/libxml/buildlink2.mk" .include "../../textproc/libxml/buildlink2.mk"
.include "../../www/gtkhtml/buildlink2.mk" .include "../../www/gtkhtml/buildlink2.mk"
.include "../../www/libghttp/buildlink2.mk" .include "../../www/libghttp/buildlink2.mk"

View file

@ -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/deskguide_applet
bin/gmenu bin/gmenu
bin/gnome-about bin/gnome-about
@ -1149,8 +1149,8 @@ share/pixmaps/splash/gnome-splash.png
@dirrm share/gnome/help/mailcheck_applet @dirrm share/gnome/help/mailcheck_applet
@exec ${MKDIR} %D/share/gnome/help/lgpl/C/stylesheet-images @exec ${MKDIR} %D/share/gnome/help/lgpl/C/stylesheet-images
@dirrm share/gnome/help/lgpl/C/stylesheet-images @dirrm share/gnome/help/lgpl/C/stylesheet-images
@dirrm share/gnome/help/lgpl/C @comment in gnome1-dirs: @dirrm share/gnome/help/lgpl/C
@dirrm share/gnome/help/lgpl @comment in gnome1-dirs: @dirrm share/gnome/help/lgpl
@dirrm share/gnome/help/help-browser/wa @dirrm share/gnome/help/help-browser/wa
@dirrm share/gnome/help/help-browser/uk @dirrm share/gnome/help/help-browser/uk
@dirrm share/gnome/help/help-browser/no @dirrm share/gnome/help/help-browser/no
@ -1171,8 +1171,8 @@ share/pixmaps/splash/gnome-splash.png
@dirrm share/gnome/help/help-browser @dirrm share/gnome/help/help-browser
@exec ${MKDIR} %D/share/gnome/help/gpl/C/stylesheet-images @exec ${MKDIR} %D/share/gnome/help/gpl/C/stylesheet-images
@dirrm share/gnome/help/gpl/C/stylesheet-images @dirrm share/gnome/help/gpl/C/stylesheet-images
@dirrm share/gnome/help/gpl/C @comment in gnome1-dirs: @dirrm share/gnome/help/gpl/C
@dirrm share/gnome/help/gpl @comment in gnome1-dirs: @dirrm share/gnome/help/gpl
@exec ${MKDIR} %D/share/gnome/help/gnome-terminal/no/stylesheet-images @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/stylesheet-images
@dirrm share/gnome/help/gnome-terminal/no @dirrm share/gnome/help/gnome-terminal/no
@ -1233,8 +1233,8 @@ share/pixmaps/splash/gnome-splash.png
@dirrm share/gnome/help/fish_applet @dirrm share/gnome/help/fish_applet
@exec ${MKDIR} %D/share/gnome/help/fdl/C/stylesheet-images @exec ${MKDIR} %D/share/gnome/help/fdl/C/stylesheet-images
@dirrm share/gnome/help/fdl/C/stylesheet-images @dirrm share/gnome/help/fdl/C/stylesheet-images
@dirrm share/gnome/help/fdl/C @comment in gnome1-dirs: @dirrm share/gnome/help/fdl/C
@dirrm share/gnome/help/fdl @comment in gnome1-dirs: @dirrm share/gnome/help/fdl
@exec ${MKDIR} %D/share/gnome/help/desk-guide_applet/it/stylesheet-images @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/stylesheet-images
@dirrm share/gnome/help/desk-guide_applet/it/figures @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/figures
@dirrm share/gnome/help/clock_applet/C @dirrm share/gnome/help/clock_applet/C
@dirrm share/gnome/help/clock_applet @dirrm share/gnome/help/clock_applet
@unexec ${RMDIR} %D/share/gnome/apps/Utilities 2>/dev/null || ${TRUE} @comment in gnome1-dirs: @dirrm share/gnome/help
@unexec ${RMDIR} %D/share/gnome/apps/System 2>/dev/null || ${TRUE} @comment in gnome1-dirs: @dirrm share/gnome/apps/Utilities
@unexec ${RMDIR} %D/share/gnome/apps/Settings/Session 2>/dev/null || ${TRUE} @comment in gnome1-dirs: @dirrm share/gnome/apps/System
@unexec ${RMDIR} %D/share/gnome/apps/Settings/Desktop 2>/dev/null || ${TRUE} @comment in gnome1-dirs: @dirrm share/gnome/apps/Settings/Session
@unexec ${RMDIR} %D/share/gnome/apps/Settings 2>/dev/null || ${TRUE} @comment in gnome1-dirs: @dirrm share/gnome/apps/Settings/Desktop
@unexec ${RMDIR} %D/share/gnome/apps/Multimedia 2>/dev/null || ${TRUE} @comment in gnome1-dirs: @dirrm share/gnome/apps/Settings
@unexec ${RMDIR} %D/share/gnome/apps/Internet 2>/dev/null || ${TRUE} @comment in gnome1-dirs: @dirrm share/gnome/apps/Multimedia
@unexec ${RMDIR} %D/share/gnome/apps/Graphics 2>/dev/null || ${TRUE} @comment in gnome1-dirs: @dirrm share/gnome/apps/Internet
@unexec ${RMDIR} %D/share/gnome/apps/Games 2>/dev/null || ${TRUE} @comment in gnome1-dirs: @dirrm share/gnome/apps/Graphics
@unexec ${RMDIR} %D/share/gnome/apps/Development 2>/dev/null || ${TRUE} @comment in gnome1-dirs: @dirrm share/gnome/apps/Games
@unexec ${RMDIR} %D/share/gnome/apps/Applications 2>/dev/null || ${TRUE} @comment in gnome1-dirs: @dirrm share/gnome/apps/Development
@unexec ${RMDIR} %D/share/gnome/apps 2>/dev/null || ${TRUE} @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/glade 2>/dev/null || ${TRUE}
@unexec ${RMDIR} %D/share/gnome-terminal 2>/dev/null || ${TRUE} @unexec ${RMDIR} %D/share/gnome-terminal 2>/dev/null || ${TRUE}
@unexec ${RMDIR} %D/share/gnome-about 2>/dev/null || ${TRUE} @unexec ${RMDIR} %D/share/gnome-about 2>/dev/null || ${TRUE}

View file

@ -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 DISTNAME= gnome-libs-1.4.1.4
PKGREVISION= 2 PKGREVISION= 3
CATEGORIES= x11 gnome CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-libs/1.4/} MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-libs/1.4/}
@ -65,6 +65,7 @@ post-install:
.include "../../devel/gettext-lib/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk"
.include "../../graphics/imlib/buildlink2.mk" .include "../../graphics/imlib/buildlink2.mk"
.include "../../graphics/xpm/buildlink2.mk" .include "../../graphics/xpm/buildlink2.mk"
.include "../../misc/gnome1-dirs/buildlink2.mk"
.include "../../net/ORBit/buildlink2.mk" .include "../../net/ORBit/buildlink2.mk"
.include "../../x11/gtk/buildlink2.mk" .include "../../x11/gtk/buildlink2.mk"

View file

@ -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/dns-helper
bin/gconfigger bin/gconfigger
bin/gnome-bug bin/gnome-bug
@ -591,9 +591,9 @@ share/type-convert/type.convert
@dirrm share/gnome/html @dirrm share/gnome/html
@dirrm share/gnome/help/gnome-dev-info/C @dirrm share/gnome/help/gnome-dev-info/C
@dirrm share/gnome/help/gnome-dev-info @dirrm share/gnome/help/gnome-dev-info
@dirrm share/gnome/help @comment in gnome1-dirs: @dirrm share/gnome/help
@unexec ${RMDIR} %D/share/gnome/apps 2>/dev/null || ${TRUE} @comment in gnome1-dirs: @dirrm share/gnome/apps
@unexec ${RMDIR} %D/share/gnome 2>/dev/null || ${TRUE} @comment in gnome1-dirs: @dirrm share/gnome
@dirrm share/doc/html/libart @dirrm share/doc/html/libart
@dirrm share/doc/gnome-libs @dirrm share/doc/gnome-libs
@dirrm lib/gnome-libs/include @dirrm lib/gnome-libs/include