summaryrefslogtreecommitdiff
path: root/emulators/mame/patches/patch-makefile
diff options
context:
space:
mode:
authorabs <abs@pkgsrc.org>2011-02-11 12:49:33 +0000
committerabs <abs@pkgsrc.org>2011-02-11 12:49:33 +0000
commit67479cbffa369b26dca02bd6d31426a5bfacd921 (patch)
treebf3bd15edefe5b0c1439a191d1be2ccfcaf178f4 /emulators/mame/patches/patch-makefile
parent6a17d35f1d73e41b7d1d4882893db59fceb3910d (diff)
downloadpkgsrc-67479cbffa369b26dca02bd6d31426a5bfacd921.tar.gz
All source files in mame.zip have CR-LF but are marked as binary, so
unzip -a does not help. Hence all patches must have CR-LF
Diffstat (limited to 'emulators/mame/patches/patch-makefile')
-rw-r--r--emulators/mame/patches/patch-makefile42
1 files changed, 20 insertions, 22 deletions
diff --git a/emulators/mame/patches/patch-makefile b/emulators/mame/patches/patch-makefile
index 74f3e17f05d..e1ccbd3360c 100644
--- a/emulators/mame/patches/patch-makefile
+++ b/emulators/mame/patches/patch-makefile
@@ -1,25 +1,23 @@
-$NetBSD: patch-makefile,v 1.1.1.1 2011/02/03 22:22:36 wiz Exp $
-
-First chunk accepted upstream, second pkgsrc-only.
+$NetBSD: patch-makefile,v 1.2 2011/02/11 12:49:33 abs Exp $
--- makefile.orig 2010-12-29 22:50:26.000000000 +0000
+++ makefile
-@@ -86,6 +88,9 @@ endif
- ifeq ($(firstword $(filter GNU/kFreeBSD,$(UNAME))),GNU/kFreeBSD)
- TARGETOS = freebsd
- endif
-+ifeq ($(firstword $(filter NetBSD,$(UNAME))),NetBSD)
-+TARGETOS = netbsd
-+endif
- ifeq ($(firstword $(filter OpenBSD,$(UNAME))),OpenBSD)
- TARGETOS = openbsd
- endif
-@@ -344,7 +349,7 @@ NAME = $(TARGET)$(SUBTARGET)
- endif
-
- # fullname is prefix+name+suffix+suffix64+suffixdebug
--FULLNAME = $(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXPROFILE)
-+FULLNAME = $(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIXDEBUG)$(SUFFIXPROFILE)
-
- # add an EXE suffix to get the final emulator name
- EMULATOR = $(FULLNAME)$(EXE)
+@@ -86,6 +86,9 @@ endif
+ ifeq ($(firstword $(filter GNU/kFreeBSD,$(UNAME))),GNU/kFreeBSD)
+ TARGETOS = freebsd
+ endif
++ifeq ($(firstword $(filter NetBSD,$(UNAME))),NetBSD)
++TARGETOS = netbsd
++endif
+ ifeq ($(firstword $(filter OpenBSD,$(UNAME))),OpenBSD)
+ TARGETOS = openbsd
+ endif
+@@ -344,7 +347,7 @@ NAME = $(TARGET)$(SUBTARGET)
+ endif
+
+ # fullname is prefix+name+suffix+suffix64+suffixdebug
+-FULLNAME = $(PREFIX)$(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIX64)$(SUFFIXDEBUG)$(SUFFIXPROFILE)
++FULLNAME = $(PREFIXSDL)$(NAME)$(SUFFIX)$(SUFFIXDEBUG)$(SUFFIXPROFILE)
+
+ # add an EXE suffix to get the final emulator name
+ EMULATOR = $(FULLNAME)$(EXE)