[pkgsrc/trunk]: pkgsrc Backout my recent changes because Thomas Klausner and ...

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc Backout my recent changes because Thomas Klausner and ...
From: tron <tron%pkgsrc.org@localhost>
Date: Wed, 13 Oct 2021 23:44:46 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/ceb150a0fe12
branches:  trunk
changeset: 471053:ceb150a0fe12
user:      tron <tron%pkgsrc.org@localhost>
date:      Tue Mar 16 14:04:44 2004 +0000

description:
Backout my recent changes because Thomas Klausner and Grant Beattie
disapprove.

diffstat:

 doc/CHANGES                        |   5 +----
 print/gnome-print/Makefile         |   6 +++---
 print/gnome-print/buildlink2.mk    |   3 +--
 sysutils/gnome-vfs/Makefile        |   5 ++---
 sysutils/gnome-vfs/buildlink2.mk   |   3 +--
 sysutils/gnome-vfs/buildlink3.mk   |   3 +--
 www/glibwww/Makefile               |   6 +++---
 www/glibwww/buildlink2.mk          |   3 +--
 x11/controlcenter/Makefile         |   4 ++--
 x11/controlcenter/distinfo         |   3 +--
 x11/controlcenter/patches/patch-ad |  13 -------------
 11 files changed, 16 insertions(+), 38 deletions(-)

diffs (195 lines):

diff -r 7e9a2584328f -r ceb150a0fe12 doc/CHANGES
--- a/doc/CHANGES       Tue Mar 16 13:55:51 2004 +0000
+++ b/doc/CHANGES       Tue Mar 16 14:04:44 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.5265 2004/03/16 11:23:58 tron Exp $
+$NetBSD: CHANGES,v 1.5266 2004/03/16 14:04:44 tron Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -1472,8 +1472,5 @@
        Updated jwhois to 3.2.2nb3 [kleink 2004-03-15]
        Updated MesaDemos to 6.0nb1 [jlam 2004-03-15]
        Updated nsd to 2.0.1 [itojun 2004-03-16]
-       Updated gnome-print to 0.36nb5 [tron 2004-03-16]
-       Updated gnome-vfs to 1.0.5nb6 [tron 2004-03-16]
        Updated newsx to 1.6nb1 [cube 2004-03-16]
-       Updated glibwww to 0.2nb6 [tron 2004-03-16]
        Updated pilot-link to 0.11.7nb2 [tron 2004-03-16]
diff -r 7e9a2584328f -r ceb150a0fe12 print/gnome-print/Makefile
--- a/print/gnome-print/Makefile        Tue Mar 16 13:55:51 2004 +0000
+++ b/print/gnome-print/Makefile        Tue Mar 16 14:04:44 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.61 2004/03/16 08:39:29 tron Exp $
+# $NetBSD: Makefile,v 1.62 2004/03/16 14:04:44 tron Exp $
+#
 
 DISTNAME=              gnome-print-0.36
-PKGREVISION=           5
+PKGREVISION=           4
 CATEGORIES=            print gnome
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-print/0.36/}
 
@@ -20,7 +21,6 @@
 # override HOME to avoid trying to install ${HOME}/.gnome
 MAKE_ENV+=             HOME=${WRKSRC}
 
-.include "../../databases/db4/buildlink2.mk"
 .include "../../graphics/freetype2/buildlink2.mk"
 .include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk"
 .include "../../textproc/libunicode/buildlink2.mk"
diff -r 7e9a2584328f -r ceb150a0fe12 print/gnome-print/buildlink2.mk
--- a/print/gnome-print/buildlink2.mk   Tue Mar 16 13:55:51 2004 +0000
+++ b/print/gnome-print/buildlink2.mk   Tue Mar 16 14:04:44 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.7 2004/03/16 08:57:59 tron Exp $
+# $NetBSD: buildlink2.mk,v 1.8 2004/03/16 14:04:44 tron Exp $
 
 .if !defined(GNOME_PRINT_BUILDLINK2_MK)
 GNOME_PRINT_BUILDLINK2_MK=     # defined
@@ -12,7 +12,6 @@
 BUILDLINK_FILES.gnome-print+=  include/gnome-1.0/libgnomeprint/*
 BUILDLINK_FILES.gnome-print+=  lib/libgnomeprint.*
 
-.include "../../databases/db4/buildlink2.mk"
 .include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk"
 .include "../../textproc/libxml/buildlink2.mk"
 
diff -r 7e9a2584328f -r ceb150a0fe12 sysutils/gnome-vfs/Makefile
--- a/sysutils/gnome-vfs/Makefile       Tue Mar 16 13:55:51 2004 +0000
+++ b/sysutils/gnome-vfs/Makefile       Tue Mar 16 14:04:44 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2004/03/16 08:50:38 tron Exp $
+# $NetBSD: Makefile,v 1.42 2004/03/16 14:04:44 tron Exp $
 
 DISTNAME=              gnome-vfs-1.0.5
-PKGREVISION=           6
+PKGREVISION=           5
 CATEGORIES=            sysutils gnome
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/gnome-vfs/1.0/}
 
@@ -26,7 +26,6 @@
 
 .include "../../archivers/bzip2/buildlink2.mk"
 .include "../../converters/libiconv/buildlink2.mk"
-.include "../../databases/db4/buildlink2.mk"
 .include "../../databases/gnome-mime-data/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
diff -r 7e9a2584328f -r ceb150a0fe12 sysutils/gnome-vfs/buildlink2.mk
--- a/sysutils/gnome-vfs/buildlink2.mk  Tue Mar 16 13:55:51 2004 +0000
+++ b/sysutils/gnome-vfs/buildlink2.mk  Tue Mar 16 14:04:44 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.9 2004/03/16 08:55:50 tron Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2004/03/16 14:04:44 tron Exp $
 
 .if !defined(GNOME_VFS_BUILDLINK2_MK)
 GNOME_VFS_BUILDLINK2_MK=       # defined
@@ -17,7 +17,6 @@
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../devel/GConf/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../databases/db4/buildlink2.mk"
 
 BUILDLINK_TARGETS+=    gnome-vfs-buildlink
 
diff -r 7e9a2584328f -r ceb150a0fe12 sysutils/gnome-vfs/buildlink3.mk
--- a/sysutils/gnome-vfs/buildlink3.mk  Tue Mar 16 13:55:51 2004 +0000
+++ b/sysutils/gnome-vfs/buildlink3.mk  Tue Mar 16 14:04:44 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/16 08:57:36 tron Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/03/16 14:04:44 tron Exp $
 
 BUILDLINK_DEPTH:=              ${BUILDLINK_DEPTH}+
 GNOME_VFS_BUILDLINK3_MK:=      ${GNOME_VFS_BUILDLINK3_MK}+
@@ -17,7 +17,6 @@
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../databases/gnome-mime-data/buildlink3.mk"
-.include "../../databases/db4/buildlink3.mk"
 .include "../../devel/GConf/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 
diff -r 7e9a2584328f -r ceb150a0fe12 www/glibwww/Makefile
--- a/www/glibwww/Makefile      Tue Mar 16 13:55:51 2004 +0000
+++ b/www/glibwww/Makefile      Tue Mar 16 14:04:44 2004 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2004/03/16 11:04:19 tron Exp $
+# $NetBSD: Makefile,v 1.17 2004/03/16 14:04:44 tron Exp $
+#
 
 DISTNAME=              glibwww-0.2
-PKGREVISION=           6
+PKGREVISION=           5
 CATEGORIES=            www gnome devel
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/glibwww/0.2/}
 
@@ -15,7 +16,6 @@
 USE_LIBTOOL=           YES
 LTCONFIG_OVERRIDE=     ${WRKSRC}/ltconfig
 
-.include "../../databases/db4/buildlink2.mk"
 .include "../../www/libwww/buildlink2.mk"
 .include "../../x11/gnome-libs/buildlink2.mk"
 
diff -r 7e9a2584328f -r ceb150a0fe12 www/glibwww/buildlink2.mk
--- a/www/glibwww/buildlink2.mk Tue Mar 16 13:55:51 2004 +0000
+++ b/www/glibwww/buildlink2.mk Tue Mar 16 14:04:44 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2004/03/16 11:04:19 tron Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2004/03/16 14:04:44 tron Exp $
 
 .if !defined(GLIBWWW_BUILDLINK2_MK)
 GLIBWWW_BUILDLINK2_MK= # defined
@@ -12,7 +12,6 @@
 BUILDLINK_FILES.glibwww=       include/glibwww/glibwww.h
 BUILDLINK_FILES.glibwww+=      lib/libglibwww.*
 
-.include "../../databases/db4/buildlink2.mk"
 .include "../../www/libwww/buildlink2.mk"
 .include "../../x11/gnome-libs/buildlink2.mk"
 
diff -r 7e9a2584328f -r ceb150a0fe12 x11/controlcenter/Makefile
--- a/x11/controlcenter/Makefile        Tue Mar 16 13:55:51 2004 +0000
+++ b/x11/controlcenter/Makefile        Tue Mar 16 14:04:44 2004 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.56 2004/03/16 09:48:22 tron Exp $
+# $NetBSD: Makefile,v 1.57 2004/03/16 14:04:44 tron Exp $
 
 DISTNAME=              control-center-1.4.0.4
-PKGREVISION=           7
+PKGREVISION=           6
 CATEGORIES=            x11 gnome
 MASTER_SITES=          ${MASTER_SITE_GNOME:=sources/control-center/1.4/}
 
diff -r 7e9a2584328f -r ceb150a0fe12 x11/controlcenter/distinfo
--- a/x11/controlcenter/distinfo        Tue Mar 16 13:55:51 2004 +0000
+++ b/x11/controlcenter/distinfo        Tue Mar 16 14:04:44 2004 +0000
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.8 2004/03/16 09:48:22 tron Exp $
+$NetBSD: distinfo,v 1.9 2004/03/16 14:04:44 tron Exp $
 
 SHA1 (control-center-1.4.0.4.tar.gz) = 7f18cbcdadcebfc967d4a9abac7804d513d4298f
 Size (control-center-1.4.0.4.tar.gz) = 3567130 bytes
 SHA1 (patch-aa) = 423ad6c931885f1975311b8cc90d9de636e9c808
 SHA1 (patch-ab) = 64b3fdd656ba029a092086d040c48c55679edfd9
 SHA1 (patch-ac) = 2fc67976315b8a203233e71d1f311f3e097aa499
-SHA1 (patch-ad) = 54d5f2e7b9a5d40312ab4fbe44abd1fbfb213c44
 SHA1 (patch-af) = fa276788e2ff16fd82674c7031b8ed806cc37ddf
diff -r 7e9a2584328f -r ceb150a0fe12 x11/controlcenter/patches/patch-ad
--- a/x11/controlcenter/patches/patch-ad        Tue Mar 16 13:55:51 2004 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.5 2004/03/16 09:48:45 tron Exp $
-
---- po/Makefile.in.in.orig     Sun Feb 10 22:36:46 2002
-+++ po/Makefile.in.in  Tue Mar 16 10:14:36 2004
-@@ -106,7 +106,7 @@
-       @catalogs='$(CATALOGS)'; \
-       for cat in $$catalogs; do \
-         cat=`basename $$cat`; \
--        lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-+        lang=`echo $$cat | sed -e 's/\.gmo$$//' -e 's/\.mo$$//'`; \
-         dir=$(localedir)/$$lang/LC_MESSAGES; \
-         $(mkinstalldirs) $(DESTDIR)$$dir; \
-         if test -r $$cat; then \
Prev by Date: [pkgsrc/trunk]: pkgsrc/www/firefox-bin-nightly simplify ONLY_FOR_PLATFORM pat...
Next by Date: [pkgsrc/trunk]: pkgsrc/www/firefox-bin-nightly add Solaris build which recent...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/www/firefox-bin-nightly simplify ONLY_FOR_PLATFORM pat...
Next by Thread: [pkgsrc/trunk]: pkgsrc/www/firefox-bin-nightly add Solaris build which recent...
Indexes:
Home | Main Index | Thread Index | Old Index