[pkgsrc/pkgsrc-2008Q3]: pkgsrc/devel/libslang2 Pullup ticket #2604 - requeste...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6ec20a7fc55e
branches:  pkgsrc-2008Q3
changeset: 547928:6ec20a7fc55e
user:      tron <tron%pkgsrc.org@localhost>
date:      Thu Dec 04 10:14:05 2008 +0000

description:
Pullup ticket #2604 - requested by is
libslang2: build fix for Solaris

Revisions pulled up:
- devel/libslang2/Makefile                      1.2
- devel/libslang2/distinfo                      1.2
- devel/libslang2/patches/patch-ae              1.2
---
Module Name:    pkgsrc
Committed By:   is
Date:           Wed Dec  3 11:10:34 UTC 2008

Modified Files:
        pkgsrc/devel/libslang2: Makefile distinfo
        pkgsrc/devel/libslang2/patches: patch-ae

Log Message:
Don't even try to install the .a for the loadable modules.
Patch mostly suggested by bjs@.
This fixes a build problem on Solaris.

diffstat:

 devel/libslang2/Makefile         |   3 ++-
 devel/libslang2/distinfo         |   4 ++--
 devel/libslang2/patches/patch-ae |  16 +++++++++++-----
 3 files changed, 15 insertions(+), 8 deletions(-)

diffs (64 lines):

diff -r 9b6e7de6de71 -r 6ec20a7fc55e devel/libslang2/Makefile
--- a/devel/libslang2/Makefile  Mon Dec 01 07:53:53 2008 +0000
+++ b/devel/libslang2/Makefile  Thu Dec 04 10:14:05 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/08/09 21:22:11 bjs Exp $
+# $NetBSD: Makefile,v 1.1.1.1.4.1 2008/12/04 10:14:05 tron Exp $
 #
 
 DISTNAME=      slang-2.1.3
+PKGREVISION=   1
 PKGNAME=       lib${DISTNAME:slang%=slang2%}
 SVR4_PKGNAME=  lslan
 CATEGORIES=    devel
diff -r 9b6e7de6de71 -r 6ec20a7fc55e devel/libslang2/distinfo
--- a/devel/libslang2/distinfo  Mon Dec 01 07:53:53 2008 +0000
+++ b/devel/libslang2/distinfo  Thu Dec 04 10:14:05 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/08/09 21:22:11 bjs Exp $
+$NetBSD: distinfo,v 1.1.1.1.4.1 2008/12/04 10:14:05 tron Exp $
 
 SHA1 (slang-2.1.3.tar.bz2) = 31fc6162684f69d9dd0377372dfdc336f0c4343a
 RMD160 (slang-2.1.3.tar.bz2) = b59424972e52c361a15b23874d1a0539683608e5
@@ -7,5 +7,5 @@
 SHA1 (patch-ab) = eae92ea5fac608b1dd9e6106b452d67c79c19bcb
 SHA1 (patch-ac) = 1181b6ce5de5c7c149aa8692dbcded981bda688e
 SHA1 (patch-ad) = 03f839d82cd3f18f526293ff8015bfa1e029ede0
-SHA1 (patch-ae) = 9735e6211887bc6069e8efc6c471baac645d91f7
+SHA1 (patch-ae) = 85ed2a5053bb908ab9f55161ef626ee9705acd5f
 SHA1 (patch-af) = 335d14eef480ff49bd7fb2ffc7a434a77ac9a2ec
diff -r 9b6e7de6de71 -r 6ec20a7fc55e devel/libslang2/patches/patch-ae
--- a/devel/libslang2/patches/patch-ae  Mon Dec 01 07:53:53 2008 +0000
+++ b/devel/libslang2/patches/patch-ae  Thu Dec 04 10:14:05 2008 +0000
@@ -1,8 +1,14 @@
-$NetBSD: patch-ae,v 1.1.1.1 2008/08/09 21:22:11 bjs Exp $
+$NetBSD: patch-ae,v 1.1.1.1.4.1 2008/12/04 10:14:05 tron Exp $
 
---- modules/Makefile.in.orig   2007-09-07 22:47:29.000000000 -0400
+--- modules/Makefile.in.orig   2007-09-08 04:47:29.000000000 +0200
 +++ modules/Makefile.in
-@@ -69,9 +69,10 @@ DEST_HELPDIR        = $(DESTDIR)$(HELP_DIR)
+@@ -1,4 +1,5 @@
+ # -*- sh -*-
++MODULE_LIBTOOL_FLAGS=--tag=disable-static
+ MODULES = slsmg-module.so termios-module.so select-module.so fcntl-module.so \
+   varray-module.so socket-module.so @PCRE_MODULE@ @PNG_MODULE@ \
+   @ICONV_MODULE@ @ONIG_MODULE@
+@@ -69,9 +70,10 @@ DEST_HELPDIR        = $(DESTDIR)$(HELP_DIR)
  #---------------------------------------------------------------------------
  RPATH = @RPATH@
  
@@ -10,11 +16,11 @@
 +LIBS = $(LDFLAGS) -module -avoid-version -rpath $(PREFIX)/lib $(SLANG_LIB) $(DL_LIB) -lm
  #LIBS = $(RPATH) $(DL_LIB) -lm
  INCS = $(SLANG_INC)
-+CC_SHARED:=${LIBTOOL} --mode=link ${LIBTOOL_FLAGS} ${CC} 
++CC_SHARED:=${LIBTOOL} --mode=link ${MODULE_LIBTOOL_FLAGS} ${CC} 
  
  all: $(MODULES)
  
-@@ -79,35 +80,35 @@ config.h: ../src/config.h
+@@ -79,35 +81,35 @@ config.h: ../src/config.h
        cp ../src/config.h .
  
  slsmg-module.so: slsmg-module.c config.h