CVS commit: [pkgsrc-2017Q1] pkgsrc/devel/libslang2

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Mon May  1 08:28:25 UTC 2017

Modified Files:
        pkgsrc/devel/libslang2 [pkgsrc-2017Q1]: distinfo
        pkgsrc/devel/libslang2/patches [pkgsrc-2017Q1]: patch-aa

Log Message:
Pullup ticket #5332 - requested by sevan
devel/libslang2: build fix for SunOS

Revisions pulled up:
- devel/libslang2/distinfo                                      1.7
- devel/libslang2/patches/patch-aa                              1.4

---
   Module Name:    pkgsrc
   Committed By:   jperkin
   Date:           Thu Apr 20 10:46:10 UTC 2017

   Modified Files:
           pkgsrc/devel/libslang2: distinfo
           pkgsrc/devel/libslang2/patches: patch-aa

   Log Message:
   Fix bogus flags, now builds on SunOS.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.12.1 pkgsrc/devel/libslang2/distinfo
cvs rdiff -u -r1.3 -r1.3.44.1 pkgsrc/devel/libslang2/patches/patch-aa

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/libslang2/distinfo
diff -u pkgsrc/devel/libslang2/distinfo:1.6 pkgsrc/devel/libslang2/distinfo:1.6.12.1
--- pkgsrc/devel/libslang2/distinfo:1.6 Tue Nov  3 03:27:45 2015
+++ pkgsrc/devel/libslang2/distinfo     Mon May  1 08:28:25 2017
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2015/11/03 03:27:45 agc Exp $
+$NetBSD: distinfo,v 1.6.12.1 2017/05/01 08:28:25 bsiegert Exp $
 
 SHA1 (slang-2.2.4.tar.bz2) = 34e68a993888d0ae2ebc7bc31b40bc894813a7e2
 RMD160 (slang-2.2.4.tar.bz2) = fc023080f021201a99263d686ab4a8b87bbb575a
 SHA512 (slang-2.2.4.tar.bz2) = aaf0dcea5f1583487732098bd9dfe47f4fd968d81783955f58ed7bbffb852c217cde8999f2a515d77c22d44efc79047fc841eea6fecc48f18b402461ce6a848f
 Size (slang-2.2.4.tar.bz2) = 1427363 bytes
-SHA1 (patch-aa) = 3e962a751d1aeabef1a8216ed32509a71120f748
+SHA1 (patch-aa) = a323b479be021fe229a8f17684a6e3b9ba1323f9
 SHA1 (patch-ab) = 1f5743569c43bcfebb925b275d7032f853a34943
 SHA1 (patch-ac) = 1181b6ce5de5c7c149aa8692dbcded981bda688e
 SHA1 (patch-ad) = 9ab953b8d850832f49f8af9bdb397f474af209eb

Index: pkgsrc/devel/libslang2/patches/patch-aa
diff -u pkgsrc/devel/libslang2/patches/patch-aa:1.3 pkgsrc/devel/libslang2/patches/patch-aa:1.3.44.1
--- pkgsrc/devel/libslang2/patches/patch-aa:1.3 Wed Dec  7 19:49:01 2011
+++ pkgsrc/devel/libslang2/patches/patch-aa     Mon May  1 08:28:25 2017
@@ -1,16 +1,7 @@
-$NetBSD: patch-aa,v 1.3 2011/12/07 19:49:01 drochner Exp $
+$NetBSD: patch-aa,v 1.3.44.1 2017/05/01 08:28:25 bsiegert Exp $
 
 --- src/Makefile.in.orig       2011-04-11 02:37:07.000000000 +0000
 +++ src/Makefile.in
-@@ -4,7 +4,7 @@
- #---------------------------------------------------------------------------
- CC              = @CC@
- CFLAGS                = @CFLAGS@
--LDFLAGS               = @LDFLAGS@
-+LDFLAGS               = $(EXECLIBS)
- #-----------------------------------------------------------------------------
- # System library that contains functions for dynamic linking (-ldl)
- #-----------------------------------------------------------------------------
 @@ -22,7 +22,7 @@ ELF_DEP_LIBS = @ELF_DEP_LIBS@
  # Set these values to ABSOLUTE path names
  #---------------------------------------------------------------------------
@@ -25,7 +16,7 @@ $NetBSD: patch-aa,v 1.3 2011/12/07 19:49
  ALL_CFLAGS            = $(CFLAGS) -Dunix $(THIS_LIB_DEFINES)
  ALL_ELF_CFLAGS                = $(ELF_CFLAGS) -Dunix $(THIS_LIB_DEFINES)
 -COMPILE_CMD           = $(CC) -c $(ALL_CFLAGS)
-+COMPILE_CMD           = $(LIBTOOL) --mode=compile --tag=CC $(LIBTOOL_FLAGS) $(CC) -c $(ALL_CFLAGS) $(LIBTOOL_CFLAGS)
++COMPILE_CMD           = $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(ALL_CFLAGS)
  ELFCOMPILE_CMD                = $(ELF_CC) -c $(ALL_ELF_CFLAGS)
  ELF_LINK_CMD          = $(ELF_LINK)
  
@@ -48,9 +39,9 @@ $NetBSD: patch-aa,v 1.3 2011/12/07 19:49
 -      -$(RM) $(OBJDIR_NORMAL_LIB)
 -      cd $(OBJDIR) && $(AR_CR) $(NORMAL_LIB) $(OFILES)
 -      $(RANLIB) $(OBJDIR_NORMAL_LIB)
-+      cd $(OBJDIR); $(LIBTOOL) --mode=link $(LIBTOOL_FLAGS) \
++      cd $(OBJDIR); $(LIBTOOL) --mode=link \
 +          $(CC) -o $(NORMAL_LIB) $(OFILES:.o=.lo) \
-+          $(LIBTOOL_LDFLAGS) -rpath $(PREFIX)/lib \
++          $(LDFLAGS) -rpath $(PREFIX)/lib \
 +          $(DL_LIB) -lm -ltermcap -version-info 2:1
        @echo ""
        @echo $(NORMAL_LIB) created in $(OBJDIR)