Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_151197436417610"
MIME-Version: 1.0
Date: Wed, 29 Nov 2017 16:52:44 +0000
From: "Andreas Gustafsson" <gson@netbsd.org>
Subject: CVS commit: pkgsrc/devel/st
To: pkgsrc-changes@NetBSD.org
Reply-To: gson@netbsd.org
Message-Id: <20171129165244.AEDA1FB40@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_151197436417610
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	gson
Date:		Wed Nov 29 16:52:44 UTC 2017

Modified Files:
	pkgsrc/devel/st: distinfo
	pkgsrc/devel/st/patches: patch-aa patch-ab

Log Message:
Make devel/st build on Linux (tested on Debian 9).


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/devel/st/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/st/patches/patch-aa
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/st/patches/patch-ab

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


--_----------=_151197436417610
Content-Disposition: inline
Content-Length: 3914
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/st/distinfo
diff -u pkgsrc/devel/st/distinfo:1.10 pkgsrc/devel/st/distinfo:1.11
--- pkgsrc/devel/st/distinfo:1.10	Thu Apr 28 13:49:04 2016
+++ pkgsrc/devel/st/distinfo	Wed Nov 29 16:52:44 2017
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2016/04/28 13:49:04 gson Exp $
+$NetBSD: distinfo,v 1.11 2017/11/29 16:52:44 gson Exp $
 
 SHA1 (st-1.9.tar.gz) = 316597c082743f0e32391ac84d435c428b76bf8b
 RMD160 (st-1.9.tar.gz) = 5daaa5a81f5cdc96465115e8093f702a2154844a
 SHA512 (st-1.9.tar.gz) = 66a63076993b36f52cad472dd39cfb0ed256c75153ac06573b062ff8453d2c630f8738e434b4da907dfeddfaf38291b5710904deb67962d5072f33238ffb8b84
 Size (st-1.9.tar.gz) = 108756 bytes
-SHA1 (patch-aa) = 07e9ae26981f6db25ac30a78cfe154008a5a7e5a
-SHA1 (patch-ab) = b1967d6ee1dcdd549f3f90f53f51aa253be2dc5c
+SHA1 (patch-aa) = 106df4696363fcdc26a43b305fffe8c68dd6bbeb
+SHA1 (patch-ab) = 2bcc3365b0a74b5254c74febebd58ce95ee4cbc0
 SHA1 (patch-md_h) = 954e32e14277d6875c0fe60d51d8c374c88c6c50

Index: pkgsrc/devel/st/patches/patch-aa
diff -u pkgsrc/devel/st/patches/patch-aa:1.6 pkgsrc/devel/st/patches/patch-aa:1.7
--- pkgsrc/devel/st/patches/patch-aa:1.6	Thu Apr 28 13:49:04 2016
+++ pkgsrc/devel/st/patches/patch-aa	Wed Nov 29 16:52:44 2017
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2016/04/28 13:49:04 gson Exp $
+$NetBSD: patch-aa,v 1.7 2017/11/29 16:52:44 gson Exp $
 
 - honor pkgsrc CC, AR, LD, RANLIB (CC matters for libtool, the others less so)
 - use libtool
@@ -21,7 +21,16 @@ $NetBSD: patch-aa,v 1.6 2016/04/28 13:49
  LN          = ln
  
  SHELL       = /bin/sh
-@@ -196,6 +196,13 @@ LDFLAGS     = -shared -soname=$(SONAME) 
+@@ -181,7 +181,7 @@ OTHER_FLAGS = -fullwarn
+ endif
+ 
+ ifeq ($(OS), LINUX)
+-EXTRA_OBJS  = $(TARGETDIR)/md.o
++EXTRA_OBJS  = $(TARGETDIR)/md.lo
+ SFLAGS      = -fPIC
+ LDFLAGS     = -shared -soname=$(SONAME) -lc
+ OTHER_FLAGS = -Wall
+@@ -196,6 +196,13 @@ LDFLAGS     = -shared -soname=$(SONAME)
  OTHER_FLAGS = -Wall
  endif
  
@@ -58,7 +67,7 @@ $NetBSD: patch-aa,v 1.6 2016/04/28 13:49
  DLIBRARY    = $(TARGETDIR)/libst.$(DSO_SUFFIX).$(VERSION)
  EXAMPLES    = examples
  
-@@ -344,8 +351,7 @@ $(TARGETDIR):
+@@ -344,12 +351,11 @@ $(TARGETDIR):
  	if [ ! -d $(TARGETDIR) ]; then mkdir $(TARGETDIR); fi
  
  $(SLIBRARY): $(OBJS)
@@ -68,6 +77,11 @@ $NetBSD: patch-aa,v 1.6 2016/04/28 13:49
  	rm -f obj; $(LN) $(LNFLAGS) $(TARGETDIR) obj
  
  $(DLIBRARY): $(OBJS:%.o=%-pic.o)
+-	$(LD) $(LDFLAGS) $^ -o $@
++	${LIBTOOL} --mode=link --tag=CC $(LD) $(LDFLAGS) $^ -o $@
+ 	if test "$(LINKNAME)"; then                             \
+ 		cd $(TARGETDIR);				\
+ 		rm -f $(SONAME) $(LINKNAME);			\
 @@ -361,11 +367,11 @@ $(HEADER): public.h
  	rm -f $@
  	cp public.h $@

Index: pkgsrc/devel/st/patches/patch-ab
diff -u pkgsrc/devel/st/patches/patch-ab:1.3 pkgsrc/devel/st/patches/patch-ab:1.4
--- pkgsrc/devel/st/patches/patch-ab:1.3	Tue Mar 10 11:13:09 2009
+++ pkgsrc/devel/st/patches/patch-ab	Wed Nov 29 16:52:44 2017
@@ -1,20 +1,16 @@
-$NetBSD: patch-ab,v 1.3 2009/03/10 11:13:09 gson Exp $
+$NetBSD: patch-ab,v 1.4 2017/11/29 16:52:44 gson Exp $
 
---- examples/Makefile.orig	2004-01-11 02:15:17.000000000 +0200
+--- examples/Makefile.orig	2009-10-01 18:35:55.000000000 +0000
 +++ examples/Makefile
-@@ -60,9 +60,9 @@ CFLAGS      =
- OTHER_FLAGS =
+@@ -61,7 +61,7 @@ OTHER_FLAGS =
  
  OBJDIR      = $(DEPTH)/$(TARGETDIR)
--INCDIR      = $(DEPTH)/$(TARGETDIR)
+ INCDIR      = $(DEPTH)/$(TARGETDIR)
 -LIBST       = $(OBJDIR)/libst.a
--HEADER      = $(INCDIR)/st.h
-+INCDIR      = $(DEPTH)
-+LIBST       = $(DEPTH)/libst.la
-+HEADER      = $(DEPTH)/st.h
++LIBST       = $(OBJDIR)/libst.la
+ HEADER      = $(INCDIR)/st.h
  
  LIBRESOLV   =
- EXTRALIBS   =
 @@ -70,7 +70,7 @@ EXTRALIBS   =
  ifeq ($(OS),)
  EXAMPLES    = unknown
@@ -24,7 +20,7 @@ $NetBSD: patch-ab,v 1.3 2009/03/10 11:13
  endif
  
  
-@@ -94,17 +94,17 @@ endif
+@@ -98,17 +98,17 @@ endif
  
  all: $(EXAMPLES)
  

--_----------=_151197436417610--