diff options
| author | fhajny <fhajny@pkgsrc.org> | 2013-10-21 09:48:10 +0000 |
|---|---|---|
| committer | fhajny <fhajny@pkgsrc.org> | 2013-10-21 09:48:10 +0000 |
| commit | cbb2eeaad435971f50cd52fffe0c7b9ee0346a43 (patch) | |
| tree | fb74159efdee63f063963c51bdd4065f8bebe282 /emulators/dosbox | |
| parent | 0db78ba3ae8148c0d611f152de885565cac51fc9 (diff) | |
| download | pkgsrc-cbb2eeaad435971f50cd52fffe0c7b9ee0346a43.tar.gz | |
Fix build on SunOS. Patching partly Sebastian Wiedenroth.
Diffstat (limited to 'emulators/dosbox')
| -rw-r--r-- | emulators/dosbox/Makefile | 3 | ||||
| -rw-r--r-- | emulators/dosbox/distinfo | 3 | ||||
| -rw-r--r-- | emulators/dosbox/patches/patch-src_Makefile.in | 29 |
3 files changed, 33 insertions, 2 deletions
diff --git a/emulators/dosbox/Makefile b/emulators/dosbox/Makefile index 3801ffd90f7..4d5b234e7b6 100644 --- a/emulators/dosbox/Makefile +++ b/emulators/dosbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2013/02/16 11:21:03 wiz Exp $ +# $NetBSD: Makefile,v 1.36 2013/10/21 09:48:10 fhajny Exp $ DISTNAME= dosbox-0.74 PKGREVISION= 4 @@ -13,6 +13,7 @@ LICENSE= gnu-gpl-v2 USE_LANGUAGES= c c++ GNU_CONFIGURE= yes CPPFLAGS.SunOS+= -DDISABLE_JOYSTICK +LDFLAGS.SunOS+= -lsocket INSTALLATION_DIRS= share/doc/dosbox SUBST_CLASSES+= fixme diff --git a/emulators/dosbox/distinfo b/emulators/dosbox/distinfo index 282f5244d87..b03c2c057d4 100644 --- a/emulators/dosbox/distinfo +++ b/emulators/dosbox/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.18 2010/06/15 11:37:15 wiz Exp $ +$NetBSD: distinfo,v 1.19 2013/10/21 09:48:10 fhajny Exp $ SHA1 (dosbox-0.74.tar.gz) = 2d99f0013350efb29b769ff19ddc8e4d86f4e77e RMD160 (dosbox-0.74.tar.gz) = 4534d87206de8401cd0de471d8172726f2c6b788 Size (dosbox-0.74.tar.gz) = 1265711 bytes +SHA1 (patch-src_Makefile.in) = 6f811b5a1450ca88cb47d99d0381fb682d8b994d diff --git a/emulators/dosbox/patches/patch-src_Makefile.in b/emulators/dosbox/patches/patch-src_Makefile.in new file mode 100644 index 00000000000..c812aa2d931 --- /dev/null +++ b/emulators/dosbox/patches/patch-src_Makefile.in @@ -0,0 +1,29 @@ +$NetBSD: patch-src_Makefile.in,v 1.1 2013/10/21 09:48:10 fhajny Exp $ + +Remove unused archives, fixes build with Sun ld. +--- src/Makefile.in.orig 2010-05-12 09:57:43.000000000 +0000 ++++ src/Makefile.in +@@ -52,10 +52,10 @@ am__dosbox_SOURCES_DIST = dosbox.cpp win + @HAVE_WINDRES_TRUE@am__objects_1 = winres.$(OBJEXT) + am_dosbox_OBJECTS = dosbox.$(OBJEXT) $(am__objects_1) + dosbox_OBJECTS = $(am_dosbox_OBJECTS) +-dosbox_DEPENDENCIES = cpu/libcpu.a debug/libdebug.a dos/libdos.a \ ++dosbox_DEPENDENCIES = cpu/libcpu.a dos/libdos.a \ + fpu/libfpu.a hardware/libhardware.a gui/libgui.a \ + ints/libints.a misc/libmisc.a shell/libshell.a \ +- hardware/serialport/libserial.a libs/gui_tk/libgui_tk.a ++ hardware/serialport/libserial.a + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +@@ -217,8 +217,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/include + SUBDIRS = cpu debug dos fpu gui hardware libs ints misc shell platform + @HAVE_WINDRES_TRUE@ico_stuff = winres.rc + dosbox_SOURCES = dosbox.cpp $(ico_stuff) +-dosbox_LDADD = cpu/libcpu.a debug/libdebug.a dos/libdos.a fpu/libfpu.a hardware/libhardware.a gui/libgui.a \ +- ints/libints.a misc/libmisc.a shell/libshell.a hardware/serialport/libserial.a libs/gui_tk/libgui_tk.a ++dosbox_LDADD = cpu/libcpu.a dos/libdos.a fpu/libfpu.a hardware/libhardware.a gui/libgui.a \ ++ ints/libints.a misc/libmisc.a shell/libshell.a hardware/serialport/libserial.a + + EXTRA_DIST = winres.rc dosbox.ico + all: all-recursive |