pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc Move scrollkeeper/omf.mk to rarian/omf.mk.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/d29edf8929d1
branches:  trunk
changeset: 552473:d29edf8929d1
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Jan 04 18:00:58 2009 +0000

description:
Move scrollkeeper/omf.mk to rarian/omf.mk.
scrollkeeper is nowadays included in rarian, so the omf.mk file should
be there as well.
Adapt all references.

diffstat:

 audio/rhythmbox/Makefile                |   4 +-
 audio/sound-juicer/Makefile             |   4 +-
 audio/streamtuner/Makefile              |   4 +-
 audio/terminatorx/Makefile              |   4 +-
 chat/gnomeicu/Makefile                  |   4 +-
 chat/gossip/Makefile                    |   4 +-
 comms/gnome-pilot/Makefile              |   4 +-
 databases/gramps/Makefile               |   4 +-
 databases/libgnomedb/Makefile           |   4 +-
 databases/mergeant/Makefile             |   4 +-
 devel/diffuse/Makefile                  |   4 +-
 devel/glade/Makefile.common             |   4 +-
 devel/meld/Makefile                     |   4 +-
 devel/mico/Makefile                     |   4 +-
 doc/guide/files/fixes.xml               |   4 +-
 doc/pkgsrc.html                         |   2 +-
 doc/pkgsrc.txt                          |   2 +-
 editors/conglomerate/Makefile           |   4 +-
 editors/gtranslator/Makefile            |   4 +-
 editors/tomboy/Makefile                 |   4 +-
 finance/gnucash-docs/Makefile           |   4 +-
 games/gturing/Makefile                  |   4 +-
 games/pioneers/Makefile                 |   4 +-
 games/quarry/Makefile                   |   4 +-
 graphics/dia/Makefile.common            |   4 +-
 graphics/f-spot/Makefile                |   4 +-
 graphics/gtkam/Makefile                 |   4 +-
 ham/gmfsk/Makefile                      |   4 +-
 mail/balsa/Makefile                     |   4 +-
 mail/mail-notification/Makefile         |   4 +-
 math/genius/Makefile                    |   4 +-
 math/qalculate-gtk/Makefile             |   4 +-
 misc/gnome-utils/Makefile               |   4 +-
 misc/mousetweaks/Makefile               |   4 +-
 net/etherape/Makefile                   |   4 +-
 net/gnome-netstatus/Makefile            |   4 +-
 net/gnome-nettool/Makefile              |   4 +-
 print/lilypond/Makefile                 |   4 +-
 security/gnome-keyring-manager/Makefile |   4 +-
 textproc/Makefile                       |   3 +-
 textproc/gtk-doc/Makefile               |   4 +-
 textproc/rarian/omf.mk                  |  40 +++++++++++++++++++++++++++++++++
 textproc/scrollkeeper/omf.mk            |  40 ---------------------------------
 time/gnotime/Makefile                   |   4 +-
 time/planner/Makefile                   |   4 +-
 wm/e16menuedit2/Makefile                |   4 +-
 www/drivel/Makefile                     |   4 +-
 x11/fast-user-switch-applet/Makefile    |   4 +-
 x11/gnopernicus/Makefile                |   4 +-
 49 files changed, 131 insertions(+), 132 deletions(-)

diffs (truncated from 892 to 300 lines):

diff -r 6850454ce6df -r d29edf8929d1 audio/rhythmbox/Makefile
--- a/audio/rhythmbox/Makefile  Sun Jan 04 18:00:36 2009 +0000
+++ b/audio/rhythmbox/Makefile  Sun Jan 04 18:00:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2008/12/26 15:35:51 jmcneill Exp $
+# $NetBSD: Makefile,v 1.60 2009/01/04 18:00:58 wiz Exp $
 #
 
 DISTNAME=      rhythmbox-0.11.6
@@ -67,6 +67,6 @@
 .include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
 .include "../../sysutils/libnotify/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6850454ce6df -r d29edf8929d1 audio/sound-juicer/Makefile
--- a/audio/sound-juicer/Makefile       Sun Jan 04 18:00:36 2009 +0000
+++ b/audio/sound-juicer/Makefile       Sun Jan 04 18:00:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2008/12/04 00:27:08 jmcneill Exp $
+# $NetBSD: Makefile,v 1.19 2009/01/04 18:00:58 wiz Exp $
 #
 
 DISTNAME=              sound-juicer-2.24.0
@@ -45,7 +45,7 @@
 .include "../../sysutils/hal/buildlink3.mk"
 .include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
 .include "../../sysutils/dbus-glib/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 BUILDLINK_API_DEPENDS.gtk2+=   gtk2+>=2.12.0
 .include "../../x11/gtk2/buildlink3.mk"
diff -r 6850454ce6df -r d29edf8929d1 audio/streamtuner/Makefile
--- a/audio/streamtuner/Makefile        Sun Jan 04 18:00:36 2009 +0000
+++ b/audio/streamtuner/Makefile        Sun Jan 04 18:00:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2008/06/20 01:09:07 joerg Exp $
+# $NetBSD: Makefile,v 1.40 2009/01/04 18:00:58 wiz Exp $
 #
 
 DISTNAME=      streamtuner-0.99.99
@@ -27,7 +27,7 @@
 
 .include "options.mk"
 
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
 .include "../../www/curl/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff -r 6850454ce6df -r d29edf8929d1 audio/terminatorx/Makefile
--- a/audio/terminatorx/Makefile        Sun Jan 04 18:00:36 2009 +0000
+++ b/audio/terminatorx/Makefile        Sun Jan 04 18:00:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/11/18 10:23:23 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2009/01/04 18:00:58 wiz Exp $
 #
 
 DISTNAME=      terminatorX-3.82
@@ -35,7 +35,7 @@
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../audio/libmad/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXxf86dga/buildlink3.mk"
 
diff -r 6850454ce6df -r d29edf8929d1 chat/gnomeicu/Makefile
--- a/chat/gnomeicu/Makefile    Sun Jan 04 18:00:36 2009 +0000
+++ b/chat/gnomeicu/Makefile    Sun Jan 04 18:00:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2008/09/06 20:54:31 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2009/01/04 18:00:58 wiz Exp $
 
 DISTNAME=      gnomeicu-0.99.12
 PKGREVISION=   6
@@ -35,7 +35,7 @@
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../textproc/gtkspell/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 
diff -r 6850454ce6df -r d29edf8929d1 chat/gossip/Makefile
--- a/chat/gossip/Makefile      Sun Jan 04 18:00:36 2009 +0000
+++ b/chat/gossip/Makefile      Sun Jan 04 18:00:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2008/06/20 01:09:09 joerg Exp $
+# $NetBSD: Makefile,v 1.59 2009/01/04 18:00:58 wiz Exp $
 #
 
 DISTNAME=      gossip-0.10.2
@@ -42,7 +42,7 @@
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libXScrnSaver/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6850454ce6df -r d29edf8929d1 comms/gnome-pilot/Makefile
--- a/comms/gnome-pilot/Makefile        Sun Jan 04 18:00:36 2009 +0000
+++ b/comms/gnome-pilot/Makefile        Sun Jan 04 18:00:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2008/09/06 20:54:31 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2009/01/04 18:00:58 wiz Exp $
 #
 
 DISTNAME=              gnome-pilot-2.0.15
@@ -27,6 +27,6 @@
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6850454ce6df -r d29edf8929d1 databases/gramps/Makefile
--- a/databases/gramps/Makefile Sun Jan 04 18:00:36 2009 +0000
+++ b/databases/gramps/Makefile Sun Jan 04 18:00:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2008/11/19 03:39:57 hasso Exp $
+# $NetBSD: Makefile,v 1.37 2009/01/04 18:00:59 wiz Exp $
 #
 
 DISTNAME=              gramps-1.0.11
@@ -24,7 +24,7 @@
 MESSAGE_SUBST+=                PYPKGPREFIX=${PYPKGPREFIX}
 
 .include "../../sysutils/gnome-vfs/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
 .include "../../graphics/py-imaging/buildlink3.mk"
 .include "../../textproc/py-xml/buildlink3.mk"
 .include "../../x11/py-gtk2/buildlink3.mk"
diff -r 6850454ce6df -r d29edf8929d1 databases/libgnomedb/Makefile
--- a/databases/libgnomedb/Makefile     Sun Jan 04 18:00:36 2009 +0000
+++ b/databases/libgnomedb/Makefile     Sun Jan 04 18:00:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2008/09/29 12:56:50 obache Exp $
+# $NetBSD: Makefile,v 1.68 2009/01/04 18:00:59 wiz Exp $
 #
 
 DISTNAME=              libgnomedb-3.0.0
@@ -32,7 +32,7 @@
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gtksourceview/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6850454ce6df -r d29edf8929d1 databases/mergeant/Makefile
--- a/databases/mergeant/Makefile       Sun Jan 04 18:00:36 2009 +0000
+++ b/databases/mergeant/Makefile       Sun Jan 04 18:00:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2008/07/14 12:56:01 joerg Exp $
+# $NetBSD: Makefile,v 1.57 2009/01/04 18:00:59 wiz Exp $
 #
 
 DISTNAME=              mergeant-0.66
@@ -27,6 +27,6 @@
 .include "../../devel/libglade/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6850454ce6df -r d29edf8929d1 devel/diffuse/Makefile
--- a/devel/diffuse/Makefile    Sun Jan 04 18:00:36 2009 +0000
+++ b/devel/diffuse/Makefile    Sun Jan 04 18:00:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/12/09 14:23:31 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2009/01/04 18:00:59 wiz Exp $
 #
 
 DISTNAME=      diffuse-0.2.15
@@ -53,7 +53,7 @@
                ${DESTDIR}${PREFIX}/share/examples/diffuse
 
 .include "../../lang/python/application.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
 BUILDLINK_API_DEPENDS.pygtk2+= ${PYPKGPREFIX}-gtk2>=2.10
 .include "../../x11/py-gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6850454ce6df -r d29edf8929d1 devel/glade/Makefile.common
--- a/devel/glade/Makefile.common       Sun Jan 04 18:00:36 2009 +0000
+++ b/devel/glade/Makefile.common       Sun Jan 04 18:00:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2008/04/30 13:38:14 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.6 2009/01/04 18:00:59 wiz Exp $
 
 DISTNAME=      glade-2.12.2
 CATEGORIES=    devel
@@ -23,5 +23,5 @@
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff -r 6850454ce6df -r d29edf8929d1 devel/meld/Makefile
--- a/devel/meld/Makefile       Sun Jan 04 18:00:36 2009 +0000
+++ b/devel/meld/Makefile       Sun Jan 04 18:00:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/12/01 13:53:10 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2009/01/04 18:00:59 wiz Exp $
 #
 
 DISTNAME=              meld-1.2.1
@@ -36,5 +36,5 @@
        ${RMDIR} ${DESTDIR}${PREFIX}/share/doc/meld
 
 .include "../../lang/python/application.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6850454ce6df -r d29edf8929d1 devel/mico/Makefile
--- a/devel/mico/Makefile       Sun Jan 04 18:00:36 2009 +0000
+++ b/devel/mico/Makefile       Sun Jan 04 18:00:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/09/02 07:18:26 tonnerre Exp $
+# $NetBSD: Makefile,v 1.2 2009/01/04 18:00:59 wiz Exp $
 #
 
 DISTNAME=              mico-2.3.12
@@ -36,5 +36,5 @@
 SUBST_FILES.exampledir+=       demo/services/wireless/Makefile
 SUBST_SED.exampledir=          -e "s@(INSTDIR)/doc/mico/examples@(SHARED_INSTDIR)/examples/${PKGBASE}@g"
 
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 6850454ce6df -r d29edf8929d1 doc/guide/files/fixes.xml
--- a/doc/guide/files/fixes.xml Sun Jan 04 18:00:36 2009 +0000
+++ b/doc/guide/files/fixes.xml Sun Jan 04 18:00:58 2009 +0000
@@ -1,4 +1,4 @@
-<!-- $NetBSD: fixes.xml,v 1.94 2008/06/22 15:22:44 wiz Exp $ -->
+<!-- $NetBSD: fixes.xml,v 1.95 2009/01/04 18:00:59 wiz Exp $ -->
 
 <chapter id="fixes"> <?dbhtml filename="fixes.html"?>
 <title>Making your package work</title>
@@ -1590,7 +1590,7 @@
     <orderedlist>
       <listitem>
        <para>Include
-       <filename>../../textproc/scrollkeeper/omf.mk</filename>
+       <filename>../../textproc/rarian/omf.mk</filename>
        instead of its <filename>buildlink3.mk</filename> file.  This
        takes care of rebuilding the scrollkeeper database at
        installation and deinstallation time, and disallows any access
diff -r 6850454ce6df -r d29edf8929d1 doc/pkgsrc.html
--- a/doc/pkgsrc.html   Sun Jan 04 18:00:36 2009 +0000
+++ b/doc/pkgsrc.html   Sun Jan 04 18:00:58 2009 +0000
@@ -8959,7 +8959,7 @@
     get registered in the database:</p>
 <div class="orderedlist"><ol type="1">
 <li><p>Include
-       <code class="filename">../../textproc/scrollkeeper/omf.mk</code>
+       <code class="filename">../../textproc/rarian/omf.mk</code>
        instead of its <code class="filename">buildlink3.mk</code> file.  This
        takes care of rebuilding the scrollkeeper database at
        installation and deinstallation time, and disallows any access
diff -r 6850454ce6df -r d29edf8929d1 doc/pkgsrc.txt
--- a/doc/pkgsrc.txt    Sun Jan 04 18:00:36 2009 +0000
+++ b/doc/pkgsrc.txt    Sun Jan 04 18:00:58 2009 +0000
@@ -7506,7 +7506,7 @@
 If a package installs .omf files, used by scrollkeeper, you need to take some
 extra steps to make sure they get registered in the database:
 
- 1. Include ../../textproc/scrollkeeper/omf.mk instead of its buildlink3.mk
+ 1. Include ../../textproc/rarian/omf.mk instead of its buildlink3.mk
     file. This takes care of rebuilding the scrollkeeper database at
     installation and deinstallation time, and disallows any access to it
     directly from the package.
diff -r 6850454ce6df -r d29edf8929d1 editors/conglomerate/Makefile
--- a/editors/conglomerate/Makefile     Sun Jan 04 18:00:36 2009 +0000
+++ b/editors/conglomerate/Makefile     Sun Jan 04 18:00:58 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2008/06/12 02:14:29 joerg Exp $
+# $NetBSD: Makefile,v 1.54 2009/01/04 18:00:59 wiz Exp $
 #
 
 DISTNAME=      conglomerate-0.9.1
@@ -38,7 +38,7 @@
 .include "../../textproc/enchant/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
-.include "../../textproc/scrollkeeper/omf.mk"
+.include "../../textproc/rarian/omf.mk"



Home | Main Index | Thread Index | Old Index