[pkgsrc/trunk]: pkgsrc/security Don't patch configure, but configure.in and t...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bfb2905e42ab
branches:  trunk
changeset: 522305:bfb2905e42ab
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Dec 06 19:51:52 2006 +0000

description:
Don't patch configure, but configure.in and teach it about newer gedit
versions. The diff is 500k without manual editing and I don't want to
push that into pkgsrc.

diffstat:

 security/seahorse-gedit/Makefile    |   7 +++++--
 security/seahorse-nautilus/Makefile |   7 +++++--
 security/seahorse/Makefile          |   7 +++++--
 security/seahorse/distinfo          |   4 ++--
 security/seahorse/patches/patch-ab  |  16 ----------------
 security/seahorse/patches/patch-ag  |  36 ++++++++++++++++++++++++++++++++++++
 6 files changed, 53 insertions(+), 24 deletions(-)

diffs (161 lines):

diff -r 8923d021b391 -r bfb2905e42ab security/seahorse-gedit/Makefile
--- a/security/seahorse-gedit/Makefile  Wed Dec 06 19:44:46 2006 +0000
+++ b/security/seahorse-gedit/Makefile  Wed Dec 06 19:51:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/09/16 12:20:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2006/12/06 19:51:52 joerg Exp $
 
 DISTNAME=      seahorse-0.8.1
 PKGNAME=       seahorse-gedit-0.8.1
@@ -16,7 +16,7 @@
 
 GNU_CONFIGURE=         yes
 USE_DIRS+=             gnome2-1.5
-USE_TOOLS+=            gmake intltool msgfmt pkg-config
+USE_TOOLS+=            gmake intltool msgfmt pkg-config autoconf
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
 
@@ -29,6 +29,9 @@
 BUILD_DIRS=    plugins/gedit
 INSTALL_DIRS=  plugins/gedit
 
+pre-configure:
+       cd ${WRKSRC} && autoconf
+
 .include "../../databases/gnome-mime-data/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/GConf2/schemas.mk"
diff -r 8923d021b391 -r bfb2905e42ab security/seahorse-nautilus/Makefile
--- a/security/seahorse-nautilus/Makefile       Wed Dec 06 19:44:46 2006 +0000
+++ b/security/seahorse-nautilus/Makefile       Wed Dec 06 19:51:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/09/16 12:20:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2006/12/06 19:51:52 joerg Exp $
 
 DISTNAME=      seahorse-0.8.1
 PKGNAME=       seahorse-nautilus-0.8.1
@@ -16,7 +16,7 @@
 
 GNU_CONFIGURE=         yes
 USE_DIRS+=             gnome2-1.5
-USE_TOOLS+=            gmake intltool msgfmt pkg-config
+USE_TOOLS+=            gmake intltool msgfmt pkg-config autoconf
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
 
@@ -27,6 +27,9 @@
 BUILD_DIRS=    plugins/nautilus-ext
 INSTALL_DIRS=  plugins/nautilus-ext
 
+pre-configure:
+       cd ${WRKSRC} && autoconf
+
 .include "../../databases/gnome-mime-data/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/libglade2/buildlink3.mk"
diff -r 8923d021b391 -r bfb2905e42ab security/seahorse/Makefile
--- a/security/seahorse/Makefile        Wed Dec 06 19:44:46 2006 +0000
+++ b/security/seahorse/Makefile        Wed Dec 06 19:51:52 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2006/09/16 12:20:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.58 2006/12/06 19:51:52 joerg Exp $
 
 DISTNAME=      seahorse-0.8.1
 PKGREVISION=   3
@@ -14,7 +14,7 @@
 
 GNU_CONFIGURE=         yes
 USE_DIRS+=             gnome2-1.5
-USE_TOOLS+=            gmake intltool msgfmt pkg-config
+USE_TOOLS+=            gmake intltool msgfmt pkg-config autoconf
 USE_LIBTOOL=           yes
 USE_PKGLOCALEDIR=      yes
 
@@ -25,6 +25,9 @@
 
 BUILDLINK_API_DEPENDS.gpgme+=  gpgme>=1.0.1nb2
 
+pre-configure:
+       cd ${WRKSRC} && autoconf
+
 .include "../../databases/gnome-mime-data/buildlink3.mk"
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../devel/GConf2/schemas.mk"
diff -r 8923d021b391 -r bfb2905e42ab security/seahorse/distinfo
--- a/security/seahorse/distinfo        Wed Dec 06 19:44:46 2006 +0000
+++ b/security/seahorse/distinfo        Wed Dec 06 19:51:52 2006 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.16 2006/03/14 15:00:57 drochner Exp $
+$NetBSD: distinfo,v 1.17 2006/12/06 19:51:52 joerg Exp $
 
 SHA1 (seahorse-0.8.1.tar.bz2) = 43b91153c708e536e00ef38aa12f33eff524b0f7
 RMD160 (seahorse-0.8.1.tar.bz2) = 1442bf55617a08e7357d1b40e64f4d3d3c777bdc
 Size (seahorse-0.8.1.tar.bz2) = 971378 bytes
 SHA1 (patch-aa) = b7dbb53b1a012345b13426f50f76a523ff839536
-SHA1 (patch-ab) = 6312a6d2ee767f2432d9a8e91d800649124b7bce
 SHA1 (patch-ac) = a17c31e312b10d7ba781289b70060ed34a1c006b
 SHA1 (patch-ad) = a7abc7a29a422ec229545f626f37ae173ba56db7
 SHA1 (patch-ae) = cb7e6555d94adc9d2d6a4e0250bd7717c8207f87
 SHA1 (patch-af) = 33876b96f74591ff85e3244ee2070ee12b88a502
+SHA1 (patch-ag) = 15bc9780b30326216e0897700594446b8d459411
diff -r 8923d021b391 -r bfb2905e42ab security/seahorse/patches/patch-ab
--- a/security/seahorse/patches/patch-ab        Wed Dec 06 19:44:46 2006 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2006/03/14 15:00:57 drochner Exp $
-
---- configure.orig     2006-02-25 23:22:46.000000000 +0100
-+++ configure
-@@ -19762,7 +19762,10 @@ echo $ECHO_N "checking for GPGME - versi
-                sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
- 
-       if test "$major" -eq "$req_major"; then
--         if test "$minor" -ge "$req_minor"; then
-+         if test "$minor" -gt "$req_minor"; then
-+             ok="yes"
-+         fi
-+         if test "$minor" -eq "$req_minor"; then
-            if test "$micro" -ge "$req_micro"; then
-              ok="yes"
-            fi
diff -r 8923d021b391 -r bfb2905e42ab security/seahorse/patches/patch-ag
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/seahorse/patches/patch-ag        Wed Dec 06 19:51:52 2006 +0000
@@ -0,0 +1,36 @@
+$NetBSD: patch-ag,v 1.1 2006/12/06 19:51:52 joerg Exp $
+
+--- configure.in.orig  2006-01-26 12:26:52.000000000 +0000
++++ configure.in
+@@ -125,7 +125,10 @@ if test $GPGME_CONFIG != "failed" ; then
+                sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
+ 
+       if test "$major" -eq "$req_major"; then
+-         if test "$minor" -ge "$req_minor"; then
++         if test "$minor" -gt "$req_minor"; then
++             ok="yes"
++         fi
++         if test "$minor" -eq "$req_minor"; then
+            if test "$micro" -ge "$req_micro"; then
+              ok="yes"
+            fi
+@@ -284,12 +287,13 @@ else
+       # - Bonobo plugins <= 2.12. 
+       # - Glib type plugins > 2.13
+       
+-      PKG_CHECK_MODULES(GEDIT, gedit-2.14 >= 2.13.0, [with_gedit_plugin=yes],
+-              [PKG_CHECK_MODULES(GEDIT, gedit-2.12 >= 2.12.0, [with_gedit_bonobo=yes],
+-                      [PKG_CHECK_MODULES(GEDIT, gedit-2.10 >= 2.9.0, [with_gedit_bonobo=yes], 
+-                              [PKG_CHECK_MODULES(GEDIT, gedit-2.8 >= 2.8.0, [with_gedit_bonobo=yes], 
+-                                      [PKG_CHECK_MODULES(GEDIT, gedit-2.6 >= 2.6.0, [with_gedit_bonobo=yes],
+-                                                      [enable_gedit=no])])])])])
++      PKG_CHECK_MODULES(GEDIT, gedit-2.16 >= 2.13.0, [with_gedit_plugin=yes],
++              [PKG_CHECK_MODULES(GEDIT, gedit-2.14 >= 2.13.0, [with_gedit_plugin=yes],
++                      [PKG_CHECK_MODULES(GEDIT, gedit-2.12 >= 2.12.0, [with_gedit_bonobo=yes],
++                              [PKG_CHECK_MODULES(GEDIT, gedit-2.10 >= 2.9.0, [with_gedit_bonobo=yes], 
++                                      [PKG_CHECK_MODULES(GEDIT, gedit-2.8 >= 2.8.0, [with_gedit_bonobo=yes], 
++                                              [PKG_CHECK_MODULES(GEDIT, gedit-2.6 >= 2.6.0, [with_gedit_bonobo=yes],
++                                                              [enable_gedit=no])])])])])])
+       
+       if test "$enable_gedit" = "yes"; then
+               echo "enabling gedit plugin..."