pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/graphics/librsvg2 Replace patches with CONFIGURE_ARGS ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a6d3ee0a5d0d
branches:  trunk
changeset: 532769:a6d3ee0a5d0d
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Aug 30 15:57:10 2007 +0000

description:
Replace patches with CONFIGURE_ARGS argument and post-install target.
Remove unnecessary SUBST_* section.

diffstat:

 graphics/librsvg2/Makefile         |  12 +++++-------
 graphics/librsvg2/distinfo         |   4 +---
 graphics/librsvg2/patches/patch-aa |  12 ------------
 graphics/librsvg2/patches/patch-ac |  13 -------------
 4 files changed, 6 insertions(+), 35 deletions(-)

diffs (79 lines):

diff -r 8b78175c4c75 -r a6d3ee0a5d0d graphics/librsvg2/Makefile
--- a/graphics/librsvg2/Makefile        Thu Aug 30 15:47:57 2007 +0000
+++ b/graphics/librsvg2/Makefile        Thu Aug 30 15:57:10 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.61 2007/08/30 15:46:20 wiz Exp $
+# $NetBSD: Makefile,v 1.62 2007/08/30 15:57:10 wiz Exp $
 
 DISTNAME=      librsvg-2.18.2
 PKGNAME=       ${DISTNAME:S/-/2-/}
@@ -26,19 +26,17 @@
 
 CONFIGURE_ARGS+=       --with-gimp=no
 CONFIGURE_ARGS+=       --with-tags=
+CONFIGURE_ARGS+=       --disable-mozilla-plugin
 
 GTK2_LOADERS=          yes
 
-SUBST_CLASSES+=                tabs
-SUBST_STAGE.tabs=      post-patch
-SUBST_MESSAGE.tabs=    Removing tabs from librsvg.def
-SUBST_FILES.tabs=      librsvg.def
-SUBST_FILTER_CMD.tabs= ${TR} -d '\t'
-
 BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.2.0
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.11.0
 BUILDLINK_API_DEPENDS.gtk2+=   gtk2+>=2.6.0
 
+post-install:
+       -rmdir -p ${PREFIX}/lib/mozilla/plugins
+
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/libgsf/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
diff -r 8b78175c4c75 -r a6d3ee0a5d0d graphics/librsvg2/distinfo
--- a/graphics/librsvg2/distinfo        Thu Aug 30 15:47:57 2007 +0000
+++ b/graphics/librsvg2/distinfo        Thu Aug 30 15:57:10 2007 +0000
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.24 2007/08/30 15:46:20 wiz Exp $
+$NetBSD: distinfo,v 1.25 2007/08/30 15:57:10 wiz Exp $
 
 SHA1 (librsvg-2.18.2.tar.bz2) = 9e3017817708025737e53b60fe3bfa813e670e02
 RMD160 (librsvg-2.18.2.tar.bz2) = df154e6a3c74a406a5d6435a82611b3d204f147f
 Size (librsvg-2.18.2.tar.bz2) = 461122 bytes
-SHA1 (patch-aa) = 0a0b96d35f3896b3a4e31e374317de3c22945957
 SHA1 (patch-ab) = f1cbfcccd0a7d17801d2f5b60645c39e885d7c37
-SHA1 (patch-ac) = 3723d2c2fa6dc9bba0f143730a71d28166b9e04c
diff -r 8b78175c4c75 -r a6d3ee0a5d0d graphics/librsvg2/patches/patch-aa
--- a/graphics/librsvg2/patches/patch-aa        Thu Aug 30 15:47:57 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.10 2006/04/03 06:35:26 wiz Exp $
-
---- configure.orig     2006-04-01 16:31:25.000000000 +0000
-+++ configure
-@@ -23771,6 +23771,7 @@ echo "$as_me: WARNING: mozilla-config no
-       build_mozilla_plugin=yes
-    fi
- fi
-+build_mozilla_plugin=no
- 
- 
- 
diff -r 8b78175c4c75 -r a6d3ee0a5d0d graphics/librsvg2/patches/patch-ac
--- a/graphics/librsvg2/patches/patch-ac        Thu Aug 30 15:47:57 2007 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.11 2007/08/30 06:35:57 wiz Exp $
-
---- Makefile.in.orig   2007-08-20 19:11:13.000000000 +0000
-+++ Makefile.in
-@@ -313,7 +313,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- @HAVE_GTK_FALSE@target_rsvg_view = 
- @HAVE_GTK_TRUE@target_rsvg_view = rsvg-view
--SUBDIRS = . moz-plugin gdk-pixbuf-loader gtk-engine data tests doc
-+SUBDIRS = . gdk-pixbuf-loader gtk-engine data tests doc
- lib_LTLIBRARIES = librsvg-2.la
- man_MANS = rsvg.1
- @OS_WIN32_FALSE@libm = -lm



Home | Main Index | Thread Index | Old Index