CFLAGS/LDFLAGS are already defined as good enough, so use them.

4 files changed, 49 insertions, 3 deletions

diff --git a/emulators/xtrs/Makefile b/emulators/xtrs/Makefile
index c71c1b1845d..0e080d8fbfd 100644
--- a/emulators/xtrs/Makefile
+++ b/emulators/xtrs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2014/05/20 11:43:02 obache Exp $
+# $NetBSD: Makefile,v 1.24 2014/05/20 12:26:11 obache Exp $
 #
 
 DISTNAME=	xtrs-4.9d
@@ -21,7 +21,6 @@ SUBST_FILES.mf=		Makefile.local
 SUBST_SED.mf=		-e 's|/usr/local|${PREFIX}|g'
 SUBST_SED.mf+=		-e 's|/usr/X11/|${X11PREFIX}/|g'
 SUBST_SED.mf+=		-e 's|/usr/include/X11|${X11BASE}/include|g'
-SUBST_SED.mf+=		-e 's|^\(LDFLAGS = \)-L/usr/X11R6/lib|\1${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib|g'
 SUBST_SED.mf+=		-e 's|^\#EXTRALIBS.*|EXTRALIBS=${BUILDLINK_LDADD.oss}|'
 SUBST_SED.mf+=		-e 's|/share/man|/${PKGMANDIR}|g'
 
diff --git a/emulators/xtrs/distinfo b/emulators/xtrs/distinfo
index 4aecf253f64..5661dcb51cd 100644
--- a/emulators/xtrs/distinfo
+++ b/emulators/xtrs/distinfo
@@ -1,8 +1,10 @@
-$NetBSD: distinfo,v 1.7 2013/01/13 20:54:30 is Exp $
+$NetBSD: distinfo,v 1.8 2014/05/20 12:26:11 obache Exp $
 
 SHA1 (xtrs-4.9d.tar.gz) = 72b99ede6e8024b8ade4f8aa22eb073078576e74
 RMD160 (xtrs-4.9d.tar.gz) = 009786b70fe1006d552b1d89ac2b74247b17e03f
 Size (xtrs-4.9d.tar.gz) = 455355 bytes
+SHA1 (patch-Makefile) = 02a4dac76d575329459722fe843ced61c83aa7d7
+SHA1 (patch-Makefile.local) = da854213c3ba3af686ca646d0648cd3f7b873a7f
 SHA1 (patch-trs_cassette.c) = 1f129feecf54b2165d993f0fa2dbfac63bdb146f
 SHA1 (patch-trs_disk.c) = b43c7592db9a183b69bc2b17a7ddc4a1e32713e4
 SHA1 (patch-trs_xinterface.c) = e2190ea74f38d2cfc8fb7e8d17c5e889490aaa48
diff --git a/emulators/xtrs/patches/patch-Makefile b/emulators/xtrs/patches/patch-Makefile
new file mode 100644
index 00000000000..243a0486103
--- /dev/null
+++ b/emulators/xtrs/patches/patch-Makefile
@@ -0,0 +1,15 @@
+$NetBSD: patch-Makefile,v 1.3 2014/05/20 12:26:11 obache Exp $
+
+* Honor CFLAGS
+
+--- Makefile.orig	2009-06-15 23:35:20.000000000 +0000
++++ Makefile
+@@ -142,7 +142,7 @@ z80code: $(Z80CODE)
+ # Local customizations for make variables are done in Makefile.local:
+ include Makefile.local
+ 
+-CFLAGS = $(DEBUG) $(ENDIAN) $(DEFAULT_ROM) $(READLINE) $(DISKDIR) $(IFLAGS) \
++CFLAGS += $(DEBUG) $(ENDIAN) $(DEFAULT_ROM) $(READLINE) $(DISKDIR) $(IFLAGS) \
+        $(APPDEFAULTS) -DKBWAIT
+ LIBS = $(XLIB) $(READLINELIBS) $(EXTRALIBS)
+ 
diff --git a/emulators/xtrs/patches/patch-Makefile.local b/emulators/xtrs/patches/patch-Makefile.local
new file mode 100644
index 00000000000..bb29b4cf9c7
--- /dev/null
+++ b/emulators/xtrs/patches/patch-Makefile.local
@@ -0,0 +1,30 @@
+$NetBSD: patch-Makefile.local,v 1.1 2014/05/20 12:26:11 obache Exp $
+
+* Honor CFLAGS/LDFLAGS, already defined as good enough.
+
+--- Makefile.local.orig	2009-06-15 23:32:57.000000000 +0000
++++ Makefile.local
+@@ -54,7 +54,7 @@ READLINELIBS = -lreadline -lncurses
+ 
+ # Select debugging symbols (-g) and/or optimization (-O2, etc.)
+ 
+-DEBUG = -O2 -g -Wall
++#DEBUG = -O2 -g -Wall
+ #DEBUG = -g -DKBDEBUG -DXDEBUG
+ #DEBUG = -g
+ #DEBUG = -Wall
+@@ -65,12 +65,12 @@ DEBUG = -O2 -g -Wall
+ 
+ # If you need a different path for libraries:
+ 
+-LDFLAGS = -L/usr/X11R6/lib
++#LDFLAGS = -L/usr/X11R6/lib
+ #LDFLAGS = -non_shared -L/usr/X11/lib
+ 
+ # If you need a different path for include files:
+ 
+-IFLAGS = -I/usr/include/X11
++#IFLAGS = -I/usr/include/X11
+ 
+ # Re-define this if your X library is strangely named:
+