diff options
author | jmmv <jmmv> | 2003-02-18 14:55:54 +0000 |
---|---|---|
committer | jmmv <jmmv> | 2003-02-18 14:55:54 +0000 |
commit | 89ed14603ef6f82dc5fe599763f54b41a7727e26 (patch) | |
tree | 26f00e45e25757159b4808978c93e8b672cac4c4 /x11 | |
parent | ac84fe1226d95f9ffa3d0916a0deaedefac45c4e (diff) | |
download | pkgsrc-89ed14603ef6f82dc5fe599763f54b41a7727e26.tar.gz |
Use the omf.mk file provided by the scrollkeeper package to automatically
rebuild the documentation database at install/deinstall time. This means
that:
- PLIST's do not need to call scrollkeeper-{update,rebuilddb} directly;
this is done by a bsd.pkg.install.mk template.
- The share/omf directory is only removed by scrollkeeper, which is the
last package in the dependancy tree.
- PKGREVISION is bumped.
Reviewed by wiz.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/controlcenter/Makefile | 5 | ||||
-rw-r--r-- | x11/controlcenter/PLIST | 3 | ||||
-rw-r--r-- | x11/gnome-applets/Makefile | 7 | ||||
-rw-r--r-- | x11/gnome-applets/PLIST | 5 | ||||
-rw-r--r-- | x11/gnome-core/Makefile | 5 | ||||
-rw-r--r-- | x11/gnome-core/PLIST | 3 | ||||
-rw-r--r-- | x11/gnome-panel/Makefile | 7 | ||||
-rw-r--r-- | x11/gnome-panel/PLIST | 3 | ||||
-rw-r--r-- | x11/gnome2-terminal/Makefile | 6 | ||||
-rw-r--r-- | x11/gnome2-terminal/PLIST | 3 | ||||
-rw-r--r-- | x11/multi-gnome-terminal/Makefile | 5 | ||||
-rw-r--r-- | x11/multi-gnome-terminal/PLIST | 3 |
12 files changed, 30 insertions, 25 deletions
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile index c58b533df08..c2da2ccafae 100644 --- a/x11/controlcenter/Makefile +++ b/x11/controlcenter/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.44 2002/10/19 10:55:00 rh Exp $ +# $NetBSD: Makefile,v 1.45 2003/02/18 14:56:03 jmmv Exp $ DISTNAME= control-center-1.4.0.4 +PKGREVISION= 1 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/control-center/1.4/} @@ -32,7 +33,7 @@ post-install: .include "../../devel/gettext-lib/buildlink2.mk" .include "../../graphics/gdk-pixbuf/buildlink2.mk" .include "../../sysutils/gnome-vfs/buildlink2.mk" -.include "../../textproc/scrollkeeper/buildlink2.mk" +.include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/gnome-libs/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/controlcenter/PLIST b/x11/controlcenter/PLIST index aed544ea56c..1e4ff552b61 100644 --- a/x11/controlcenter/PLIST +++ b/x11/controlcenter/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2003/02/15 10:59:03 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.10 2003/02/18 14:56:03 jmmv Exp $ bin/background-properties-capplet bin/file-types-capplet bin/gnome-edit-properties-capplet @@ -153,6 +153,7 @@ share/pixmaps/ccsplash.png share/pixmaps/control-center.png @exec ${MKDIR} -m 0755 %D/share/control-center/capplets @dirrm share/omf/control-center +@comment in scrollkeeper: @dirrm share/omf @dirrm share/gnome/wm-properties @dirrm share/gnome/help/control-center/C/stylesheet-images @dirrm share/gnome/help/control-center/C/figures diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index 51cfc449e1a..cdede499655 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.25 2003/01/10 07:58:08 cjep Exp $ +# $NetBSD: Makefile,v 1.26 2003/02/18 14:56:03 jmmv Exp $ # DISTNAME= gnome-applets-1.4.0.4 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-applets/1.4/} EXTRACT_SUFX= .tar.bz2 @@ -22,9 +22,8 @@ LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig BUILD_USES_MSGFMT= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --localstatedir=${SCROLLKEEPER_DATADIR} -.include "../../textproc/scrollkeeper/buildlink2.mk" +.include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/gnome-core/buildlink2.mk" .include "../../devel/libgtop/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome-applets/PLIST b/x11/gnome-applets/PLIST index 3d306478839..09086e7ca76 100644 --- a/x11/gnome-applets/PLIST +++ b/x11/gnome-applets/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2002/10/08 17:50:59 wiz Exp $ +@comment $NetBSD: PLIST,v 1.7 2003/02/18 14:56:03 jmmv Exp $ bin/another_clock_applet bin/asclock_applet bin/battery_applet @@ -1526,6 +1526,7 @@ share/xmodmap/xmodmap.yu @dirrm share/pixmaps/gweather @dirrm share/pixmaps/gkb @dirrm share/omf/gnome-applets +@comment in scrollkeeper: @dirrm share/omf @dirrm share/odometer/smplst @dirrm share/odometer/o @dirrm share/odometer/default @@ -1962,5 +1963,3 @@ share/xmodmap/xmodmap.yu @dirrm share/asclock/Newstone @dirrm share/asclock/Freeamp @dirrm share/asclock -@unexec scrollkeeper-rebuilddb -@exec scrollkeeper-rebuilddb diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile index 66f73217cd5..c846bf1b7a1 100644 --- a/x11/gnome-core/Makefile +++ b/x11/gnome-core/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.86 2003/02/07 15:33:39 jmmv Exp $ +# $NetBSD: Makefile,v 1.87 2003/02/18 14:56:03 jmmv Exp $ # DISTNAME= gnome-core-1.4.2 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-core/1.4/} EXTRACT_SUFX= .tar.bz2 @@ -50,6 +50,7 @@ post-install: .include "../../graphics/gnome-pixmaps/buildlink2.mk" .include "../../lang/perl5/buildlink2.mk" .include "../../textproc/libxml/buildlink2.mk" +.include "../../textproc/scrollkeeper/omf.mk" .include "../../www/gtkhtml/buildlink2.mk" .include "../../www/libghttp/buildlink2.mk" diff --git a/x11/gnome-core/PLIST b/x11/gnome-core/PLIST index 6bd09f86b3f..a273f907922 100644 --- a/x11/gnome-core/PLIST +++ b/x11/gnome-core/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2003/01/30 11:14:43 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.12 2003/02/18 14:56:04 jmmv Exp $ bin/deskguide_applet bin/gmenu bin/gnome-about @@ -1041,6 +1041,7 @@ share/pixmaps/splash/gnome-splash.png @dirrm share/pixmaps/mailcheck @dirrm share/pixmaps/fish @dirrm share/omf/gnome-core +@comment in scrollkeeper: @dirrm share/omf @unexec ${RMDIR} %D/share/mc/templates 2>/dev/null || ${TRUE} @unexec ${RMDIR} %D/share/mc 2>/dev/null || ${TRUE} @dirrm share/gnome/panel diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile index dce4aba0428..53c400c3a9f 100644 --- a/x11/gnome-panel/Makefile +++ b/x11/gnome-panel/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.5 2003/02/15 12:02:33 jmmv Exp $ +# $NetBSD: Makefile,v 1.6 2003/02/18 14:56:04 jmmv Exp $ # DISTNAME= gnome-panel-2.2.0.1 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-panel/2.2/} EXTRACT_SUFX= .tar.bz2 @@ -24,7 +24,6 @@ LIBTOOL_OVERRIDE= ${WRKSRC}/libtool CONFIGURE_ARGS+= --enable-gtk-doc=no CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html -CONFIGURE_ARGS+= --localstatedir=${SCROLLKEEPER_DATADIR} EGDIR= ${PREFIX}/share/examples/gnome-panel .if defined(PKG_SYSCONFDIR.libgnome) @@ -50,7 +49,7 @@ GCONF2_SCHEMAS+= tasklist.schemas .include "../../devel/libgnomeui/buildlink2.mk" .include "../../devel/gettext-lib/buildlink2.mk" .include "../../sysutils/gnome-vfs2/buildlink2.mk" -.include "../../textproc/scrollkeeper/buildlink2.mk" +.include "../../textproc/scrollkeeper/omf.mk" .include "../../x11/gnome-desktop/buildlink2.mk" .include "../../x11/gnome2-control-center/buildlink2.mk" diff --git a/x11/gnome-panel/PLIST b/x11/gnome-panel/PLIST index f06692ac0ae..6da1a33da93 100644 --- a/x11/gnome-panel/PLIST +++ b/x11/gnome-panel/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.4 2003/02/15 12:02:34 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.5 2003/02/18 14:56:04 jmmv Exp $ bin/gnome-desktop-item-edit bin/gnome-panel bin/gnome-panel-preferences @@ -150,6 +150,7 @@ share/pixmaps/mailcheck2/tux-anim.png @dirrm share/pixmaps/mailcheck2 @dirrm share/pixmaps/fish2 @dirrm share/omf/gnome-panel +@comment in scrollkeeper: @dirrm share/omf @dirrm share/idl/gnome-panel-2.0 @dirrm share/gnome/panel2 @dirrm share/gnome/help/workspace-switcher/C/figures diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile index 2c95a75c803..7eadd7a1496 100644 --- a/x11/gnome2-terminal/Makefile +++ b/x11/gnome2-terminal/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2003/02/14 21:13:35 jmmv Exp $ +# $NetBSD: Makefile,v 1.6 2003/02/18 14:56:04 jmmv Exp $ # DISTNAME= gnome-terminal-2.0.1 PKGNAME= ${DISTNAME:S/-/2-/} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-terminal/2.0/} EXTRACT_SUFX= .tar.bz2 @@ -31,5 +31,5 @@ GCONF2_SCHEMAS= gnome-terminal.schemas .include "../../devel/GConf2/schemas.mk" .include "../../devel/libglade2/buildlink2.mk" .include "../../devel/libgnomeui/buildlink2.mk" -.include "../../textproc/scrollkeeper/buildlink2.mk" +.include "../../textproc/scrollkeeper/omf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/gnome2-terminal/PLIST b/x11/gnome2-terminal/PLIST index 2fd53d8a661..22b25cc73dc 100644 --- a/x11/gnome2-terminal/PLIST +++ b/x11/gnome2-terminal/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2003/02/14 21:13:35 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.3 2003/02/18 14:56:04 jmmv Exp $ bin/gnome2-terminal lib/bonobo/servers/gnome-terminal.server share/applications/gnome-terminal.desktop @@ -42,6 +42,7 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo share/omf/gnome-terminal/gnome-terminal-C.omf share/pixmaps/gnome-terminal.png @dirrm share/omf/gnome-terminal +@comment in scrollkeeper: @dirrm share/omf @dirrm share/gnome/help/gnome-terminal/C/figures @dirrm share/gnome/help/gnome-terminal/C @dirrm share/gnome/help/gnome-terminal diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile index 091d251a4e4..2c02a5d6db8 100644 --- a/x11/multi-gnome-terminal/Makefile +++ b/x11/multi-gnome-terminal/Makefile @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.9 2003/01/10 12:41:12 jmmv Exp $ +# $NetBSD: Makefile,v 1.10 2003/02/18 14:56:05 jmmv Exp $ DISTNAME= multi-gnome-terminal-1.6.1 +PKGREVISION= 1 CATEGORIES= gnome x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=multignometerm/} @@ -21,6 +22,6 @@ CONFIGURE_ARGS+= --enable-gtk-doc=no .include "../../devel/libglade/buildlink2.mk" .include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk" -.include "../../textproc/scrollkeeper/buildlink2.mk" +.include "../../textproc/scrollkeeper/omf.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/multi-gnome-terminal/PLIST b/x11/multi-gnome-terminal/PLIST index f4cbfc12f28..b8795fee89b 100644 --- a/x11/multi-gnome-terminal/PLIST +++ b/x11/multi-gnome-terminal/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2003/01/10 12:41:12 jmmv Exp $ +@comment $NetBSD: PLIST,v 1.6 2003/02/18 14:56:05 jmmv Exp $ bin/mgt-helper bin/multi-gnome-terminal etc/CORBA/servers/multi-gnome-terminal.gnorba @@ -166,6 +166,7 @@ share/pixmaps/mgt/multignometerm.png share/pixmaps/mgt/panel-folder.png @dirrm share/pixmaps/mgt @dirrm share/omf/mgt +@comment in scrollkeeper: @dirrm share/omf @dirrm share/mgt/glade @dirrm share/mgt @dirrm share/gnome/help/multi-gnome-terminal/no/stylesheet-images |