diff options
| author | wiz <wiz@pkgsrc.org> | 2011-02-26 07:06:23 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2011-02-26 07:06:23 +0000 |
| commit | f2c3e740992e9dc72b1581df45a6793eb0a60b0b (patch) | |
| tree | 3666097d45955bc15cd7bd0659c4fdd13f2bec49 /emulators/mame/patches/patch-makefile | |
| parent | 284203c8cdbe97f258ff8c60d128919efd9d0b00 (diff) | |
| download | pkgsrc-f2c3e740992e9dc72b1581df45a6793eb0a60b0b.tar.gz | |
Revert CR-LF changes. They probably have fixed some cases,
but broke on e.g. NetBSD-current.
Diffstat (limited to 'emulators/mame/patches/patch-makefile')
| -rw-r--r-- | emulators/mame/patches/patch-makefile | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/emulators/mame/patches/patch-makefile b/emulators/mame/patches/patch-makefile index e7f2b4b351a..0b2c7195fcc 100644 --- a/emulators/mame/patches/patch-makefile +++ b/emulators/mame/patches/patch-makefile @@ -1,25 +1,25 @@ -$NetBSD: patch-makefile,v 1.3 2011/02/11 13:16:40 abs Exp $ +$NetBSD: patch-makefile,v 1.4 2011/02/26 07:06:24 wiz Exp $ First chunk accepted upstream, second pkgsrc-only. --- makefile.orig 2010-12-29 22:50:26.000000000 +0000 +++ makefile -@@ -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)
+@@ -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) |