Thu Apr 20 10:46:10 2017 UTC ()
Fix bogus flags, now builds on SunOS.


(jperkin)
diff -r1.6 -r1.7 pkgsrc/devel/libslang2/distinfo
diff -r1.3 -r1.4 pkgsrc/devel/libslang2/patches/patch-aa
cvs diff -r1.6 -r1.7 pkgsrc/devel/libslang2/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/libslang2/distinfo 2015/11/03 03:27:45 1.6
+++ pkgsrc/devel/libslang2/distinfo 2017/04/20 10:46:09 1.7
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.6 2015/11/03 03:27:45 agc Exp $ 1$NetBSD: distinfo,v 1.7 2017/04/20 10:46:09 jperkin Exp $
2 2
3SHA1 (slang-2.2.4.tar.bz2) = 34e68a993888d0ae2ebc7bc31b40bc894813a7e2 3SHA1 (slang-2.2.4.tar.bz2) = 34e68a993888d0ae2ebc7bc31b40bc894813a7e2
4RMD160 (slang-2.2.4.tar.bz2) = fc023080f021201a99263d686ab4a8b87bbb575a 4RMD160 (slang-2.2.4.tar.bz2) = fc023080f021201a99263d686ab4a8b87bbb575a
5SHA512 (slang-2.2.4.tar.bz2) = aaf0dcea5f1583487732098bd9dfe47f4fd968d81783955f58ed7bbffb852c217cde8999f2a515d77c22d44efc79047fc841eea6fecc48f18b402461ce6a848f 5SHA512 (slang-2.2.4.tar.bz2) = aaf0dcea5f1583487732098bd9dfe47f4fd968d81783955f58ed7bbffb852c217cde8999f2a515d77c22d44efc79047fc841eea6fecc48f18b402461ce6a848f
6Size (slang-2.2.4.tar.bz2) = 1427363 bytes 6Size (slang-2.2.4.tar.bz2) = 1427363 bytes
7SHA1 (patch-aa) = 3e962a751d1aeabef1a8216ed32509a71120f748 7SHA1 (patch-aa) = a323b479be021fe229a8f17684a6e3b9ba1323f9
8SHA1 (patch-ab) = 1f5743569c43bcfebb925b275d7032f853a34943 8SHA1 (patch-ab) = 1f5743569c43bcfebb925b275d7032f853a34943
9SHA1 (patch-ac) = 1181b6ce5de5c7c149aa8692dbcded981bda688e 9SHA1 (patch-ac) = 1181b6ce5de5c7c149aa8692dbcded981bda688e
10SHA1 (patch-ad) = 9ab953b8d850832f49f8af9bdb397f474af209eb 10SHA1 (patch-ad) = 9ab953b8d850832f49f8af9bdb397f474af209eb
11SHA1 (patch-ae) = 85cc759196617a81cee65460e5aabb3a966a6a77 11SHA1 (patch-ae) = 85cc759196617a81cee65460e5aabb3a966a6a77
12SHA1 (patch-af) = 15ae3f27d727492c3bebcbfbca005a78455b8774 12SHA1 (patch-af) = 15ae3f27d727492c3bebcbfbca005a78455b8774
13SHA1 (patch-ag) = 25be7b526b2adb90d7b83645cc93fa67743fe86f 13SHA1 (patch-ag) = 25be7b526b2adb90d7b83645cc93fa67743fe86f
cvs diff -r1.3 -r1.4 pkgsrc/devel/libslang2/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/libslang2/patches/patch-aa 2011/12/07 19:49:01 1.3
+++ pkgsrc/devel/libslang2/patches/patch-aa 2017/04/20 10:46:10 1.4
@@ -1,66 +1,57 @@ @@ -1,66 +1,57 @@
1$NetBSD: patch-aa,v 1.3 2011/12/07 19:49:01 drochner Exp $ 1$NetBSD: patch-aa,v 1.4 2017/04/20 10:46:10 jperkin Exp $
2 2
3--- src/Makefile.in.orig 2011-04-11 02:37:07.000000000 +0000 3--- src/Makefile.in.orig 2011-04-11 02:37:07.000000000 +0000
4+++ src/Makefile.in 4+++ src/Makefile.in
5@@ -4,7 +4,7 @@ 
6 #--------------------------------------------------------------------------- 
7 CC = @CC@ 
8 CFLAGS = @CFLAGS@ 
9-LDFLAGS = @LDFLAGS@ 
10+LDFLAGS = $(EXECLIBS) 
11 #----------------------------------------------------------------------------- 
12 # System library that contains functions for dynamic linking (-ldl) 
13 #----------------------------------------------------------------------------- 
14@@ -22,7 +22,7 @@ ELF_DEP_LIBS = @ELF_DEP_LIBS@ 5@@ -22,7 +22,7 @@ ELF_DEP_LIBS = @ELF_DEP_LIBS@
15 # Set these values to ABSOLUTE path names 6 # Set these values to ABSOLUTE path names
16 #--------------------------------------------------------------------------- 7 #---------------------------------------------------------------------------
17 SRCDIR = @SRCDIR@# Location of sources 8 SRCDIR = @SRCDIR@# Location of sources
18-OBJDIR = @OBJDIR@# Location of objects 9-OBJDIR = @OBJDIR@# Location of objects
19+OBJDIR = .# Location of objects 10+OBJDIR = .# Location of objects
20 ELFDIR = @ELFDIR@# Location of elf objects 11 ELFDIR = @ELFDIR@# Location of elf objects
21 VERSION_SCRIPT = $(SRCDIR)/slang.ver 12 VERSION_SCRIPT = $(SRCDIR)/slang.ver
22  13
23@@ -87,11 +87,11 @@ CONFIG_H = config.h 14@@ -87,11 +87,11 @@ CONFIG_H = config.h
24 TERMINFO_INC = terminfo/@TERMINFO_LAYOUT@.inc 15 TERMINFO_INC = terminfo/@TERMINFO_LAYOUT@.inc
25 ALL_CFLAGS = $(CFLAGS) -Dunix $(THIS_LIB_DEFINES) 16 ALL_CFLAGS = $(CFLAGS) -Dunix $(THIS_LIB_DEFINES)
26 ALL_ELF_CFLAGS = $(ELF_CFLAGS) -Dunix $(THIS_LIB_DEFINES) 17 ALL_ELF_CFLAGS = $(ELF_CFLAGS) -Dunix $(THIS_LIB_DEFINES)
27-COMPILE_CMD = $(CC) -c $(ALL_CFLAGS) 18-COMPILE_CMD = $(CC) -c $(ALL_CFLAGS)
28+COMPILE_CMD = $(LIBTOOL) --mode=compile --tag=CC $(LIBTOOL_FLAGS) $(CC) -c $(ALL_CFLAGS) $(LIBTOOL_CFLAGS) 19+COMPILE_CMD = $(LIBTOOL) --mode=compile --tag=CC $(CC) -c $(ALL_CFLAGS)
29 ELFCOMPILE_CMD = $(ELF_CC) -c $(ALL_ELF_CFLAGS) 20 ELFCOMPILE_CMD = $(ELF_CC) -c $(ALL_ELF_CFLAGS)
30 ELF_LINK_CMD = $(ELF_LINK) 21 ELF_LINK_CMD = $(ELF_LINK)
31  22
32-NORMAL_LIB = lib$(THIS_LIB).a 23-NORMAL_LIB = lib$(THIS_LIB).a
33+NORMAL_LIB = lib$(THIS_LIB)2.la 24+NORMAL_LIB = lib$(THIS_LIB)2.la
34 OBJDIR_NORMAL_LIB = $(OBJDIR)/$(NORMAL_LIB) 25 OBJDIR_NORMAL_LIB = $(OBJDIR)/$(NORMAL_LIB)
35  26
36 # On most systems, these variables have values of the form: 27 # On most systems, these variables have values of the form:
37@@ -138,14 +138,14 @@ UPDATE_VERSION_SCRIPT = $(HOME)/bin/upda 28@@ -138,14 +138,14 @@ UPDATE_VERSION_SCRIPT = $(HOME)/bin/upda
38 #--------------------------------------------------------------------------- 29 #---------------------------------------------------------------------------
39 # Rules 30 # Rules
40 #--------------------------------------------------------------------------- 31 #---------------------------------------------------------------------------
41-all: static elf 32-all: static elf
42-static: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF) 33-static: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) $(OTHERSTUFF)
43-elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB) 34-elf: $(ELFDIR) $(CONFIG_H) $(ELFDIR_ELF_LIB)
44+all: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB) 35+all: $(OBJDIR) $(CONFIG_H) $(OBJDIR_NORMAL_LIB)
45+elf: all 36+elf: all
46  37
47 $(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS) 38 $(OBJDIR_NORMAL_LIB): $(OBJDIR) $(CONFIG_H) $(OBJS)
48- -$(RM) $(OBJDIR_NORMAL_LIB) 39- -$(RM) $(OBJDIR_NORMAL_LIB)
49- cd $(OBJDIR) && $(AR_CR) $(NORMAL_LIB) $(OFILES) 40- cd $(OBJDIR) && $(AR_CR) $(NORMAL_LIB) $(OFILES)
50- $(RANLIB) $(OBJDIR_NORMAL_LIB) 41- $(RANLIB) $(OBJDIR_NORMAL_LIB)
51+ cd $(OBJDIR); $(LIBTOOL) --mode=link $(LIBTOOL_FLAGS) \ 42+ cd $(OBJDIR); $(LIBTOOL) --mode=link \
52+ $(CC) -o $(NORMAL_LIB) $(OFILES:.o=.lo) \ 43+ $(CC) -o $(NORMAL_LIB) $(OFILES:.o=.lo) \
53+ $(LIBTOOL_LDFLAGS) -rpath $(PREFIX)/lib \ 44+ $(LDFLAGS) -rpath $(PREFIX)/lib \
54+ $(DL_LIB) -lm -ltermcap -version-info 2:1 45+ $(DL_LIB) -lm -ltermcap -version-info 2:1
55 @echo "" 46 @echo ""
56 @echo $(NORMAL_LIB) created in $(OBJDIR) 47 @echo $(NORMAL_LIB) created in $(OBJDIR)
57  48
58@@ -187,10 +187,9 @@ install-docs: $(DEST_DOCDIR) 49@@ -187,10 +187,9 @@ install-docs: $(DEST_DOCDIR)
59 echo $(INSTALL_DATA) $$i $(DEST_DOCDIR)/; \ 50 echo $(INSTALL_DATA) $$i $(DEST_DOCDIR)/; \
60 $(INSTALL_DATA) $$i $(DEST_DOCDIR)/; \ 51 $(INSTALL_DATA) $$i $(DEST_DOCDIR)/; \
61 done 52 done
62-install-static: static install-headers install-docs $(DEST_LIBDIR) 53-install-static: static install-headers install-docs $(DEST_LIBDIR)
63+install-static: all install-headers install-docs $(DEST_LIBDIR) 54+install-static: all install-headers install-docs $(DEST_LIBDIR)
64 @echo installing $(OBJDIR_NORMAL_LIB) in $(DEST_LIBDIR)/ 55 @echo installing $(OBJDIR_NORMAL_LIB) in $(DEST_LIBDIR)/
65- $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(DEST_LIBDIR)/ 56- $(INSTALL_DATA) $(OBJDIR_NORMAL_LIB) $(DEST_LIBDIR)/
66- $(RANLIB) $(DEST_LIBDIR)/$(NORMAL_LIB) 57- $(RANLIB) $(DEST_LIBDIR)/$(NORMAL_LIB)