[pkgsrc/trunk]: pkgsrc/graphics/imlib2 - Add SUBST fragment to deal with hard...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a850bfacecf1
branches:  trunk
changeset: 531604:a850bfacecf1
user:      tnn <tnn%pkgsrc.org@localhost>
date:      Thu Aug 02 21:35:14 2007 +0000

description:
- Add SUBST fragment to deal with hardcoded .so library suffix in image.c.
- While here, remove hunk "Avoid regenerating within pkgsrc" from patch-af.
  (caught by pkglint)
- Bump revision

diffstat:

 graphics/imlib2/Makefile         |  18 +++++++++++++++++-
 graphics/imlib2/distinfo         |   4 ++--
 graphics/imlib2/patches/patch-af |  11 +----------
 3 files changed, 20 insertions(+), 13 deletions(-)

diffs (78 lines):

diff -r 509d2a543f3a -r a850bfacecf1 graphics/imlib2/Makefile
--- a/graphics/imlib2/Makefile  Thu Aug 02 18:19:31 2007 +0000
+++ b/graphics/imlib2/Makefile  Thu Aug 02 21:35:14 2007 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2006/11/24 12:46:12 drochner Exp $
+# $NetBSD: Makefile,v 1.42 2007/08/02 21:35:14 tnn Exp $
 
 DISTNAME=      imlib2-1.3.0
+PKGREVISION=   1
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=enlightenment/}
 
@@ -18,10 +19,25 @@
 
 LIBS.SunOS+=           -lm
 
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OBJECT_FMT} == "SOM"
+SHLIB_SUFFIX=          sl
+.else
+SHLIB_SUFFIX=          so
+.endif
+
+SUBST_CLASSES+=                shlib
+SUBST_STAGE.shlib=     post-patch
+SUBST_MESSAGE.shlib=   Replacing shared library suffix
+SUBST_FILES.shlib+=    src/lib/image.c
+SUBST_SED.shlib+=      -e 's,"\.so",".${SHLIB_SUFFIX}",'
+
 .include "options.mk"
 
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/libungif/buildlink3.mk"
diff -r 509d2a543f3a -r a850bfacecf1 graphics/imlib2/distinfo
--- a/graphics/imlib2/distinfo  Thu Aug 02 18:19:31 2007 +0000
+++ b/graphics/imlib2/distinfo  Thu Aug 02 21:35:14 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2007/03/14 16:10:43 yyamano Exp $
+$NetBSD: distinfo,v 1.19 2007/08/02 21:35:14 tnn Exp $
 
 SHA1 (imlib2-1.3.0.tar.gz) = ad9c673a94d4e5e610704cefd06855f900151e25
 RMD160 (imlib2-1.3.0.tar.gz) = 272fc0a62699e0f0f690f4cc8418ac5c8e0ee615
@@ -8,7 +8,7 @@
 SHA1 (patch-ac) = da65ecd50753c37e267c2fd3de7f1dcef8dab1f1
 SHA1 (patch-ad) = adf301fe0179aa1ab05fc54bb7ab706ee97ab7a7
 SHA1 (patch-ae) = 6503e4cbc9bbb93f971ab2ae9fd7d50ddee9e0e8
-SHA1 (patch-af) = 5f8bbf61c0f275623da48f32a079995f24aa86aa
+SHA1 (patch-af) = 5ef016d8c0916280a72d03fac4ed41e670e004e4
 SHA1 (patch-ca) = c2150a4c1ad3ccccaf37961e2f301cd7f2ba2044
 SHA1 (patch-cb) = da837b92a1a4cfd139fe2d9ed319d1cd6e0fb703
 SHA1 (patch-cc) = 6a9d1b59e0574d8bb9cc7493a314feb1c90cc57f
diff -r 509d2a543f3a -r a850bfacecf1 graphics/imlib2/patches/patch-af
--- a/graphics/imlib2/patches/patch-af  Thu Aug 02 18:19:31 2007 +0000
+++ b/graphics/imlib2/patches/patch-af  Thu Aug 02 21:35:14 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1 2007/03/14 16:10:43 yyamano Exp $
+$NetBSD: patch-af,v 1.2 2007/08/02 21:35:14 tnn Exp $
 
 --- configure.orig     2006-09-29 03:02:33.000000000 +0900
 +++ configure
@@ -10,12 +10,3 @@
  esac
  
  # Check whether --enable-mmx was given.
-@@ -25410,6 +25411,8 @@ do
-   case $ac_option in
-   # Handling of the options.
-   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-+      : Avoid regenerating within pkgsrc
-+      exit 0
-     ac_cs_recheck=: ;;
-   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
-     echo "$ac_cs_version"; exit ;;