kegs: do not overwrite LDFLAGS.

Fixes RELRO build. Bump PKGREVISION.

9 files changed, 75 insertions, 43 deletions

diff --git a/emulators/kegs/Makefile b/emulators/kegs/Makefile
index fccda93a705..440ea528ed7 100644
--- a/emulators/kegs/Makefile
+++ b/emulators/kegs/Makefile
@@ -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/
 
diff --git a/emulators/kegs/distinfo b/emulators/kegs/distinfo
index 3132e0f4c01..03dcd2a7411 100644
--- a/emulators/kegs/distinfo
+++ b/emulators/kegs/distinfo
@@ -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
diff --git a/emulators/kegs/patches/patch-aa b/emulators/kegs/patches/patch-aa
index b77226e0c15..860a2ec52c6 100644
--- a/emulators/kegs/patches/patch-aa
+++ b/emulators/kegs/patches/patch-aa
@@ -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 16:19:57 wiz Exp $
  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:
diff --git a/emulators/kegs/patches/patch-ab b/emulators/kegs/patches/patch-ab
index 3088a560af3..c91fab214e4 100644
--- a/emulators/kegs/patches/patch-ab
+++ b/emulators/kegs/patches/patch-ab
@@ -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 16:19:57 wiz Exp $
  OPTS =  -DNDEBUG
  SUFFIX =
  NAME = xkegs
+-LDFLAGS =
+ LDOPTS = -z
+ LD = $(CC)
+ EXTRA_LIBS = -lXext -lX11 -lcl -lc
diff --git a/emulators/kegs/patches/patch-ac b/emulators/kegs/patches/patch-ac
index 14504c1ff4c..dd4f1e84d51 100644
--- a/emulators/kegs/patches/patch-ac
+++ b/emulators/kegs/patches/patch-ac
@@ -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 16:19:57 wiz Exp $
  OPTS =  -DNDEBUG
  SUFFIX =
  NAME = xkegs
+-LDFLAGS =
+ LDOPTS = -z
+ LD = $(CC)
+ EXTRA_LIBS = -lXext -lX11 -lcl -lc
diff --git a/emulators/kegs/patches/patch-ad b/emulators/kegs/patches/patch-ad
index e99e8c79fb5..86d0d5c9989 100644
--- a/emulators/kegs/patches/patch-ad
+++ b/emulators/kegs/patches/patch-ad
@@ -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 16:19:57 wiz Exp $
  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
  
diff --git a/emulators/kegs/patches/patch-af b/emulators/kegs/patches/patch-af
index 37af25e0a8c..7c1631448d2 100644
--- a/emulators/kegs/patches/patch-af
+++ b/emulators/kegs/patches/patch-af
@@ -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 16:19:57 wiz Exp $
  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
  
diff --git a/emulators/kegs/patches/patch-ag b/emulators/kegs/patches/patch-ag
index 18960d40b20..6ec4ff67d65 100644
--- a/emulators/kegs/patches/patch-ag
+++ b/emulators/kegs/patches/patch-ag
@@ -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 16:19:57 wiz Exp $
  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
  
diff --git a/emulators/kegs/patches/patch-ah b/emulators/kegs/patches/patch-ah
index f59bb98bc40..a3c5febbaac 100644
--- a/emulators/kegs/patches/patch-ah
+++ b/emulators/kegs/patches/patch-ah
@@ -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 16:19:57 wiz Exp $
  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