Received: by mail.netbsd.org (Postfix, from userid 605) id 3F6C684D92; Thu, 30 Nov 2017 10:58:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BE51784D63 for ; Thu, 30 Nov 2017 10:58:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id d5S7r5QMxPfz for ; Thu, 30 Nov 2017 10:58:15 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2600384D24 for ; Thu, 30 Nov 2017 10:58:15 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 20DE8FB40; Thu, 30 Nov 2017 10:58:15 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1512039495101280" MIME-Version: 1.0 Date: Thu, 30 Nov 2017 10:58:15 +0000 From: "Andreas Gustafsson" Subject: CVS commit: pkgsrc/devel/st To: pkgsrc-changes@NetBSD.org Reply-To: gson@netbsd.org X-Mailer: log_accum Message-Id: <20171130105815.20DE8FB40@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1512039495101280 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: gson Date: Thu Nov 30 10:58:15 UTC 2017 Modified Files: pkgsrc/devel/st: Makefile distinfo pkgsrc/devel/st/patches: patch-aa Log Message: devel/st: make it not only build on Linux, but also install. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/st/Makefile cvs rdiff -u -r1.12 -r1.13 pkgsrc/devel/st/distinfo cvs rdiff -u -r1.7 -r1.8 pkgsrc/devel/st/patches/patch-aa Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1512039495101280 Content-Disposition: inline Content-Length: 5251 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/st/Makefile diff -u pkgsrc/devel/st/Makefile:1.18 pkgsrc/devel/st/Makefile:1.19 --- pkgsrc/devel/st/Makefile:1.18 Thu Apr 28 13:49:04 2016 +++ pkgsrc/devel/st/Makefile Thu Nov 30 10:58:14 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2016/04/28 13:49:04 gson Exp $ +# $NetBSD: Makefile,v 1.19 2017/11/30 10:58:14 gson Exp $ # DISTNAME= st-1.9 @@ -25,7 +25,7 @@ post-extract: do-install: ${LIBTOOL} --mode=install ${INSTALL_LIB} \ - ${WRKSRC}/libst.la ${DESTDIR}${PREFIX}/lib + ${WRKSRC}/target/libst.la ${DESTDIR}${PREFIX}/lib ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \ ${WRKSRC}/examples/lookupdns ${DESTDIR}${PREFIX}/bin/st-lookupdns ${LIBTOOL} --mode=install ${INSTALL_PROGRAM} \ Index: pkgsrc/devel/st/distinfo diff -u pkgsrc/devel/st/distinfo:1.12 pkgsrc/devel/st/distinfo:1.13 --- pkgsrc/devel/st/distinfo:1.12 Thu Nov 30 10:05:34 2017 +++ pkgsrc/devel/st/distinfo Thu Nov 30 10:58:14 2017 @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.12 2017/11/30 10:05:34 gson Exp $ +$NetBSD: distinfo,v 1.13 2017/11/30 10:58:14 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) = 106df4696363fcdc26a43b305fffe8c68dd6bbeb +SHA1 (patch-aa) = 46fc7c716e940878efb6d30b27341d847c0fee07 SHA1 (patch-ab) = 2bcc3365b0a74b5254c74febebd58ce95ee4cbc0 SHA1 (patch-examples_res.c) = 963192e7ee762c4eee21a23c65bd7a1e90523ff5 SHA1 (patch-md_h) = 954e32e14277d6875c0fe60d51d8c374c88c6c50 Index: pkgsrc/devel/st/patches/patch-aa diff -u pkgsrc/devel/st/patches/patch-aa:1.7 pkgsrc/devel/st/patches/patch-aa:1.8 --- pkgsrc/devel/st/patches/patch-aa:1.7 Wed Nov 29 16:52:44 2017 +++ pkgsrc/devel/st/patches/patch-aa Thu Nov 30 10:58:14 2017 @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.7 2017/11/29 16:52:44 gson Exp $ +$NetBSD: patch-aa,v 1.8 2017/11/30 10:58:14 gson Exp $ - honor pkgsrc CC, AR, LD, RANLIB (CC matters for libtool, the others less so) - use libtool @@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.7 2017/11/29 16:52 --- Makefile.orig 2009-10-01 22:55:03.000000000 +0000 +++ Makefile -@@ -57,10 +57,10 @@ VERSION = 1.9 +@@ -57,17 +57,19 @@ VERSION = 1.9 # possible compilation options. ########################## @@ -21,7 +21,35 @@ $NetBSD: patch-aa,v 1.7 2017/11/29 16:52 LN = ln SHELL = /bin/sh -@@ -181,7 +181,7 @@ OTHER_FLAGS = -fullwarn + ECHO = /bin/echo + + BUILD = DBG +-TARGETDIR = $(OS)_$(shell uname -r)_$(BUILD) ++# Use a fixed target directory so the pkgsrc top-level Makefile ++# can find the files at the install stage ++TARGETDIR = target + + DEFINES = -D$(OS) + CFLAGS = +@@ -104,7 +106,7 @@ TARGETS = aix-debug aix-optimized + + ifeq ($(OS), AIX) + AIX_VERSION = $(shell uname -v).$(shell uname -r) +-TARGETDIR = $(OS)_$(AIX_VERSION)_$(BUILD) ++#TARGETDIR = $(OS)_$(AIX_VERSION)_$(BUILD) + CC = xlC + STATIC_ONLY = yes + ifeq ($(BUILD), OPT) +@@ -116,7 +118,7 @@ endif + endif + + ifeq ($(OS), CYGWIN) +-TARGETDIR = $(OS)_$(BUILD) ++#TARGETDIR = $(OS)_$(BUILD) + CC = gcc + LD = gcc + DSO_SUFFIX = dll +@@ -181,7 +183,7 @@ OTHER_FLAGS = -fullwarn endif ifeq ($(OS), LINUX) @@ -30,21 +58,33 @@ $NetBSD: patch-aa,v 1.7 2017/11/29 16:52 SFLAGS = -fPIC LDFLAGS = -shared -soname=$(SONAME) -lc OTHER_FLAGS = -Wall -@@ -196,6 +196,13 @@ LDFLAGS = -shared -soname=$(SONAME) +@@ -194,6 +196,8 @@ ifeq ($(OS), NETBSD) + SFLAGS = -fPIC + LDFLAGS = -shared -soname=$(SONAME) -lc OTHER_FLAGS = -Wall - endif - -+ifeq ($(OS), NETBSD) -+OTHER_FLAGS = -Wall -+TARGETDIR = . +# The following is a lie; we do build dynamic libraries +STATIC_ONLY = yes -+endif -+ + endif + ifeq ($(OS), OPENBSD) - SFLAGS = -fPIC - LDFLAGS = -shared -soname=$(SONAME) -lc -@@ -285,15 +292,15 @@ endif +@@ -211,7 +215,7 @@ LDFLAGS = -shared -all -expect_unres + endif + + ifeq (SOLARIS, $(findstring SOLARIS, $(OS))) +-TARGETDIR = $(OS)_$(shell uname -r | sed 's/^5/2/')_$(BUILD) ++#TARGETDIR = $(OS)_$(shell uname -r | sed 's/^5/2/')_$(BUILD) + CC = gcc + LD = gcc + RANLIB = true +@@ -228,7 +232,6 @@ endif + # End of platform section. + ########################## + +- + ifeq ($(BUILD), OPT) + OTHER_FLAGS += -O + else +@@ -285,15 +288,15 @@ endif CFLAGS += $(DEFINES) $(OTHER_FLAGS) $(EXTRA_CFLAGS) @@ -67,7 +107,7 @@ $NetBSD: patch-aa,v 1.7 2017/11/29 16:52 DLIBRARY = $(TARGETDIR)/libst.$(DSO_SUFFIX).$(VERSION) EXAMPLES = examples -@@ -344,12 +351,11 @@ $(TARGETDIR): +@@ -344,12 +347,11 @@ $(TARGETDIR): if [ ! -d $(TARGETDIR) ]; then mkdir $(TARGETDIR); fi $(SLIBRARY): $(OBJS) @@ -82,7 +122,7 @@ $NetBSD: patch-aa,v 1.7 2017/11/29 16:52 if test "$(LINKNAME)"; then \ cd $(TARGETDIR); \ rm -f $(SONAME) $(LINKNAME); \ -@@ -361,11 +367,11 @@ $(HEADER): public.h +@@ -361,11 +363,11 @@ $(HEADER): public.h rm -f $@ cp public.h $@ --_----------=_1512039495101280--