Received: by mail.netbsd.org (Postfix, from userid 605) id E577F84D8D; Tue, 6 Mar 2018 15:29:15 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DA65684D76 for ; Tue, 6 Mar 2018 15:29:14 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 2IpWQF2Pyy4D for ; Tue, 6 Mar 2018 15:29:13 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 8039884C77 for ; Tue, 6 Mar 2018 15:29:13 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 70563FB40; Tue, 6 Mar 2018 15:29:13 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1520350153253180" MIME-Version: 1.0 Date: Tue, 6 Mar 2018 15:29:13 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/emulators/kegs To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20180306152913.70563FB40@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. --_----------=_1520350153253180 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: wiz Date: Tue Mar 6 15:29:13 UTC 2018 Modified Files: pkgsrc/emulators/kegs: Makefile distinfo pkgsrc/emulators/kegs/patches: patch-aa patch-ab patch-ac patch-ad patch-af patch-ag patch-ah Log Message: kegs: do not overwrite LDFLAGS. Fixes RELRO build. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 pkgsrc/emulators/kegs/Makefile cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/kegs/distinfo cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/emulators/kegs/patches/patch-aa \ pkgsrc/emulators/kegs/patches/patch-ab \ pkgsrc/emulators/kegs/patches/patch-ac \ pkgsrc/emulators/kegs/patches/patch-ad \ pkgsrc/emulators/kegs/patches/patch-af \ pkgsrc/emulators/kegs/patches/patch-ag \ pkgsrc/emulators/kegs/patches/patch-ah Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1520350153253180 Content-Disposition: inline Content-Length: 9099 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/emulators/kegs/Makefile diff -u pkgsrc/emulators/kegs/Makefile:1.12 pkgsrc/emulators/kegs/Makefile:1.13 --- pkgsrc/emulators/kegs/Makefile:1.12 Sat Jul 9 06:38:15 2016 +++ pkgsrc/emulators/kegs/Makefile Tue Mar 6 15:29:13 2018 @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2016/07/09 06:38:15 wiz Exp $ -# +# $NetBSD: Makefile,v 1.13 2018/03/06 15:29:13 wiz Exp $ DISTNAME= kegs.0.91 PKGNAME= kegs-0.91 -PKGREVISION= 5 +PKGREVISION= 6 CATEGORIES= emulators MASTER_SITES= http://kegs.sourceforge.net/ Index: pkgsrc/emulators/kegs/distinfo diff -u pkgsrc/emulators/kegs/distinfo:1.2 pkgsrc/emulators/kegs/distinfo:1.3 --- pkgsrc/emulators/kegs/distinfo:1.2 Tue Nov 3 20:30:59 2015 +++ pkgsrc/emulators/kegs/distinfo Tue Mar 6 15:29:13 2018 @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.2 2015/11/03 20:30:59 agc Exp $ +$NetBSD: distinfo,v 1.3 2018/03/06 15:29:13 wiz Exp $ SHA1 (kegs.0.91.tar.gz) = 7af9f75b07f9346c8179ec929ddb66dbac90567a RMD160 (kegs.0.91.tar.gz) = fe9f730e0397ce64cd510c90b07277e3a79dceb1 SHA512 (kegs.0.91.tar.gz) = 6976f352b66958fae6a659dda3e54f8324571a4671e4ffd5ab94b831da77da6ccbe099175d25b8a230e3fdc1fc80d1536cdc3e06deae09eed085baed663ba085 Size (kegs.0.91.tar.gz) = 805431 bytes -SHA1 (patch-aa) = c84dad2b3c4f165391090cafb217904bfc089cea -SHA1 (patch-ab) = b8f4f183935b8b8a10e3b300fc2d6f107512616d -SHA1 (patch-ac) = 29e407adc69c987b4fd5cb6a045158dfe23e5182 -SHA1 (patch-ad) = 7611606133c7293506e15098f18f000c8f8f13db +SHA1 (patch-aa) = ff5efd1c4ed92157127935434c3b2dc8105c5ba4 +SHA1 (patch-ab) = 932c8b137cddea6f94a98e23c979de67187dc8c8 +SHA1 (patch-ac) = 1678e998ab60771f08eb20e5ca95bed663f216e5 +SHA1 (patch-ad) = 73e34df5c219356b4997df9109f3e252d13d6370 SHA1 (patch-ae) = ea631b8202a7ed627fa6140f815b2b899054a621 -SHA1 (patch-af) = 965b0162d3a57a6621ed4a5133785ae51ac63615 -SHA1 (patch-ag) = b242c0d9c817a26fcbbc2e482a6f6a15f6b43adc -SHA1 (patch-ah) = a46251824fae140615965a63f770dcab08947371 +SHA1 (patch-af) = e1ffb50b59f234d30380880befce3ad52045bd66 +SHA1 (patch-ag) = 29a703295917891eefb327ecc8f1a0d090479317 +SHA1 (patch-ah) = 3058dc2fa33bd89747ceedecafbf3f288f396a1c Index: pkgsrc/emulators/kegs/patches/patch-aa diff -u pkgsrc/emulators/kegs/patches/patch-aa:1.1.1.1 pkgsrc/emulators/kegs/patches/patch-aa:1.2 --- pkgsrc/emulators/kegs/patches/patch-aa:1.1.1.1 Tue Nov 10 16:19:57 2009 +++ pkgsrc/emulators/kegs/patches/patch-aa Tue Mar 6 15:29:13 2018 @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2009/11/10 16:19:57 wiz Exp $ ---- src/Makefile.orig Mon Dec 6 18:42:47 2004 -+++ src/Makefile Mon May 4 11:37:22 2009 -@@ -11,7 +11,7 @@ +$NetBSD: patch-aa,v 1.2 2018/03/06 15:29:13 wiz Exp $ +--- src/Makefile.orig 2004-12-07 00:42:47.000000000 +0000 ++++ src/Makefile +@@ -11,7 +11,7 @@ include vars AS = $(CC) @@ -10,3 +10,12 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/11/10 1 PERL = perl all: $(TARGET) +@@ -40,7 +40,7 @@ kegsmac: $(OBJECTS) compile_time.o + + # Linux for X builds: + xkegs: $(OBJECTS) compile_time.o +- $(CC) $(CCOPTS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(XLIBS) $(EXTRA_LIBS) -lX11 ++ $(CC) $(CCOPTS) $(LDFLAGS) $(LDOPTS) $(OBJECTS) compile_time.o $(LDFLAGS) -o $(NAME)$(SUFFIX) $(XLIBS) $(EXTRA_LIBS) -lX11 + mv xkegs .. + + # Cygwin for X builds: Index: pkgsrc/emulators/kegs/patches/patch-ab diff -u pkgsrc/emulators/kegs/patches/patch-ab:1.1.1.1 pkgsrc/emulators/kegs/patches/patch-ab:1.2 --- pkgsrc/emulators/kegs/patches/patch-ab:1.1.1.1 Tue Nov 10 16:19:57 2009 +++ pkgsrc/emulators/kegs/patches/patch-ab Tue Mar 6 15:29:13 2018 @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.1.1.1 2009/11/10 16:19:57 wiz Exp $ ---- src/vars_c.orig 2004-12-06 18:42:47.000000000 -0600 -+++ src/vars_c 2009-11-05 10:30:06.000000000 -0600 -@@ -2,7 +2,7 @@ +$NetBSD: patch-ab,v 1.2 2018/03/06 15:29:13 wiz Exp $ +--- src/vars_c.orig 2004-12-07 00:42:47.000000000 +0000 ++++ src/vars_c +@@ -2,11 +2,10 @@ TARGET = xkegs OBJECTS = $(OBJECTS1) xdriver.o CC = gcc @@ -10,3 +10,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2009/11/10 1 OPTS = -DNDEBUG SUFFIX = NAME = xkegs +-LDFLAGS = + LDOPTS = -z + LD = $(CC) + EXTRA_LIBS = -lXext -lX11 -lcl -lc Index: pkgsrc/emulators/kegs/patches/patch-ac diff -u pkgsrc/emulators/kegs/patches/patch-ac:1.1.1.1 pkgsrc/emulators/kegs/patches/patch-ac:1.2 --- pkgsrc/emulators/kegs/patches/patch-ac:1.1.1.1 Tue Nov 10 16:19:57 2009 +++ pkgsrc/emulators/kegs/patches/patch-ac Tue Mar 6 15:29:13 2018 @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.1.1.1 2009/11/10 16:19:57 wiz Exp $ ---- src/vars_hp.orig 2004-12-06 18:42:47.000000000 -0600 -+++ src/vars_hp 2009-11-05 10:30:18.000000000 -0600 -@@ -2,7 +2,7 @@ +$NetBSD: patch-ac,v 1.2 2018/03/06 15:29:13 wiz Exp $ +--- src/vars_hp.orig 2004-12-07 00:42:47.000000000 +0000 ++++ src/vars_hp +@@ -2,11 +2,10 @@ TARGET = xkegs OBJECTS = engine_s.o $(OBJECTS1) sound_driver.o xdriver.o CC = cc -Ae +DA1.1 @@ -10,3 +10,7 @@ $NetBSD: patch-ac,v 1.1.1.1 2009/11/10 1 OPTS = -DNDEBUG SUFFIX = NAME = xkegs +-LDFLAGS = + LDOPTS = -z + LD = $(CC) + EXTRA_LIBS = -lXext -lX11 -lcl -lc Index: pkgsrc/emulators/kegs/patches/patch-ad diff -u pkgsrc/emulators/kegs/patches/patch-ad:1.1.1.1 pkgsrc/emulators/kegs/patches/patch-ad:1.2 --- pkgsrc/emulators/kegs/patches/patch-ad:1.1.1.1 Tue Nov 10 16:19:57 2009 +++ pkgsrc/emulators/kegs/patches/patch-ad Tue Mar 6 15:29:13 2018 @@ -1,7 +1,7 @@ -$NetBSD: patch-ad,v 1.1.1.1 2009/11/10 16:19:57 wiz Exp $ ---- src/vars_linuxppc.orig 2004-12-06 18:42:47.000000000 -0600 -+++ src/vars_linuxppc 2009-11-05 10:30:39.000000000 -0600 -@@ -2,7 +2,7 @@ +$NetBSD: patch-ad,v 1.2 2018/03/06 15:29:13 wiz Exp $ +--- src/vars_linuxppc.orig 2004-12-07 00:42:47.000000000 +0000 ++++ src/vars_linuxppc +@@ -2,11 +2,10 @@ TARGET = xkegs OBJECTS = $(OBJECTS1) xdriver.o CC = cc @@ -10,7 +10,11 @@ $NetBSD: patch-ad,v 1.1.1.1 2009/11/10 1 OPTS = -DNDEBUG SUFFIX = NAME = xkegs -@@ -15,6 +15,6 @@ +-LDFLAGS = + LDOPTS = + LD = $(CC) + EXTRA_LIBS = -lXext -lX11 -lc +@@ -15,6 +14,6 @@ EXTRA_SPECIALS = AS = cc PERL = perl Index: pkgsrc/emulators/kegs/patches/patch-af diff -u pkgsrc/emulators/kegs/patches/patch-af:1.1.1.1 pkgsrc/emulators/kegs/patches/patch-af:1.2 --- pkgsrc/emulators/kegs/patches/patch-af:1.1.1.1 Tue Nov 10 16:19:57 2009 +++ pkgsrc/emulators/kegs/patches/patch-af Tue Mar 6 15:29:13 2018 @@ -1,7 +1,7 @@ -$NetBSD: patch-af,v 1.1.1.1 2009/11/10 16:19:57 wiz Exp $ ---- src/vars_solaris.orig 2004-12-06 18:42:47.000000000 -0600 -+++ src/vars_solaris 2009-11-05 10:31:04.000000000 -0600 -@@ -2,7 +2,7 @@ +$NetBSD: patch-af,v 1.2 2018/03/06 15:29:13 wiz Exp $ +--- src/vars_solaris.orig 2004-12-07 00:42:47.000000000 +0000 ++++ src/vars_solaris +@@ -2,11 +2,10 @@ TARGET = xkegs OBJECTS = $(OBJECTS1) xdriver.o CC = cc @@ -10,7 +10,11 @@ $NetBSD: patch-af,v 1.1.1.1 2009/11/10 1 OPTS = -DNDEBUG -DSOLARIS SUFFIX = NAME = xkegs -@@ -15,6 +15,6 @@ +-LDFLAGS = + LDOPTS = + LD = $(CC) + EXTRA_LIBS = -lXext -lX11 -lsocket -lnsl +@@ -15,6 +14,6 @@ EXTRA_SPECIALS = AS = cc PERL = perl Index: pkgsrc/emulators/kegs/patches/patch-ag diff -u pkgsrc/emulators/kegs/patches/patch-ag:1.1.1.1 pkgsrc/emulators/kegs/patches/patch-ag:1.2 --- pkgsrc/emulators/kegs/patches/patch-ag:1.1.1.1 Tue Nov 10 16:19:57 2009 +++ pkgsrc/emulators/kegs/patches/patch-ag Tue Mar 6 15:29:13 2018 @@ -1,7 +1,7 @@ -$NetBSD: patch-ag,v 1.1.1.1 2009/11/10 16:19:57 wiz Exp $ ---- src/vars_x86linux.orig 2004-12-06 18:42:47.000000000 -0600 -+++ src/vars_x86linux 2009-11-05 10:31:37.000000000 -0600 -@@ -2,7 +2,7 @@ +$NetBSD: patch-ag,v 1.2 2018/03/06 15:29:13 wiz Exp $ +--- src/vars_x86linux.orig 2004-12-07 00:42:47.000000000 +0000 ++++ src/vars_x86linux +@@ -2,11 +2,10 @@ TARGET = xkegs OBJECTS = $(OBJECTS1) xdriver.o CC = cc @@ -10,7 +10,11 @@ $NetBSD: patch-ag,v 1.1.1.1 2009/11/10 1 OPTS = -DKEGS_LITTLE_ENDIAN SUFFIX = NAME = xkegs -@@ -15,5 +15,5 @@ +-LDFLAGS = + LDOPTS = + LD = $(CC) + EXTRA_LIBS = -lXext +@@ -15,5 +14,5 @@ EXTRA_SPECIALS = AS = cc PERL = perl Index: pkgsrc/emulators/kegs/patches/patch-ah diff -u pkgsrc/emulators/kegs/patches/patch-ah:1.1.1.1 pkgsrc/emulators/kegs/patches/patch-ah:1.2 --- pkgsrc/emulators/kegs/patches/patch-ah:1.1.1.1 Tue Nov 10 16:19:57 2009 +++ pkgsrc/emulators/kegs/patches/patch-ah Tue Mar 6 15:29:13 2018 @@ -1,7 +1,7 @@ -$NetBSD: patch-ah,v 1.1.1.1 2009/11/10 16:19:57 wiz Exp $ ---- src/vars_x86solaris.orig 2004-12-06 18:42:47.000000000 -0600 -+++ src/vars_x86solaris 2009-11-05 10:31:54.000000000 -0600 -@@ -2,7 +2,7 @@ +$NetBSD: patch-ah,v 1.2 2018/03/06 15:29:13 wiz Exp $ +--- src/vars_x86solaris.orig 2004-12-07 00:42:47.000000000 +0000 ++++ src/vars_x86solaris +@@ -2,11 +2,10 @@ TARGET = xkegs OBJECTS = $(OBJECTS1) xdriver.o CC = gcc @@ -10,7 +10,11 @@ $NetBSD: patch-ah,v 1.1.1.1 2009/11/10 1 OPTS = -DNDEBUG -DSOLARIS -DKEGS_LITTLE_ENDIAN -DSOLARISSOUND SUFFIX = NAME = xkegs -@@ -15,6 +15,6 @@ +-LDFLAGS = + LDOPTS = + LD = $(CC) + EXTRA_LIBS = -lXext -lX11 -lsocket -lnsl +@@ -15,6 +14,6 @@ EXTRA_SPECIALS = AS = cc PERL = perl --_----------=_1520350153253180--