Fix libtool fragment in configure for DragonFly.

Conditionalize Sun audio plugin on NetBSD and SunOS.

4 files changed, 113 insertions, 4 deletions

diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 30ade1d317d..daccbaa5860 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/04/17 13:46:29 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2006/05/15 23:33:22 joerg Exp $
 
 DISTNAME=		quakeforge-0.5.5
 PKGREVISION=		5
@@ -13,6 +13,7 @@ CONFIGURE_ARGS+=	--with-cpp="${CPP} %d %i %o"
 CONFIGURE_ARGS+=	--disable-ogg
 CONFIGURE_ARGS+=	--disable-xmms
 GNU_CONFIGURE=		YES
+USE_LANGUAGES=		c c++
 USE_TOOLS+=		bison gmake
 USE_LIBTOOL=		YES
 
@@ -29,6 +30,12 @@ BUILD_DEFS+=		USE_INET6
 CONFIGURE_ARGS+=	--without-ipv6
 .endif
 
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
+PLIST_SUBST+=		COND_SUN=""
+.else
+PLIST_SUBST+=		COND_SUN="@comment "
+.endif
+
 pre-install:
 	${INSTALL_PROGRAM_DIR} ${PREFIX}/include/QF/plugin
 	${INSTALL_PROGRAM_DIR} ${PREFIX}/include/QF/ruamoko/gui
diff --git a/games/quakeforge/PLIST b/games/quakeforge/PLIST
index b46d62a86c9..4a8990af588 100644
--- a/games/quakeforge/PLIST
+++ b/games/quakeforge/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2004/09/22 08:09:31 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/05/15 23:33:22 joerg Exp $
 bin/bsp2img
 bin/hw-master
 bin/nq-glx
@@ -162,7 +162,7 @@ lib/quakeforge/console_server.la
 lib/quakeforge/snd_output_disk.la
 lib/quakeforge/snd_output_oss.la
 lib/quakeforge/snd_output_sdl.la
-lib/quakeforge/snd_output_sun.la
+${COND_SUN}lib/quakeforge/snd_output_sun.la
 lib/quakeforge/snd_render_default.la
 lib/ruamoko/libcsqc.a
 lib/ruamoko/libgui.a
diff --git a/games/quakeforge/distinfo b/games/quakeforge/distinfo
index a8a8d9db4af..5ea25845e1e 100644
--- a/games/quakeforge/distinfo
+++ b/games/quakeforge/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 23:12:02 agc Exp $
+$NetBSD: distinfo,v 1.5 2006/05/15 23:33:22 joerg Exp $
 
 SHA1 (quakeforge-0.5.5.tar.gz) = 3ceb229b3d777b6c5e0cb1530b4547b20737f402
 RMD160 (quakeforge-0.5.5.tar.gz) = d22b29498e950bfdf96169bafee6409fca1a8e11
@@ -9,3 +9,4 @@ SHA1 (patch-ac) = fd8daa6dc4a32418c1c31790f9b969db43746e8f
 SHA1 (patch-ad) = a6d824831a5444f92c7b3ab396ea31ef52503dea
 SHA1 (patch-ae) = aa0431df430f4fc08da32550f7fc5a156096bb43
 SHA1 (patch-af) = 15c725bc5c99f558518a1b7ebb219b8b20b19926
+SHA1 (patch-ag) = f1c14409d7cfeb33c75d9909eb78e0c501073433
diff --git a/games/quakeforge/patches/patch-ag b/games/quakeforge/patches/patch-ag
new file mode 100644
index 00000000000..fd7bc156a2b
--- /dev/null
+++ b/games/quakeforge/patches/patch-ag
@@ -0,0 +1,101 @@
+$NetBSD: patch-ag,v 1.1 2006/05/15 23:33:22 joerg Exp $
+
+--- configure.orig	2006-05-15 22:52:47.000000000 +0000
++++ configure
+@@ -4034,13 +4034,13 @@ darwin* | rhapsody*)
+   lt_cv_deplibs_check_method=pass_all
+   ;;
+ 
+-freebsd* | kfreebsd*-gnu)
++freebsd* | kfreebsd*-gnu | dragonfly*)
+   if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+     case $host_cpu in
+     i*86 )
+       # Not sure whether the presence of OpenBSD here was a mistake.
+       # Let's accept both of them until this is cleared up.
+-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
++      lt_cv_deplibs_check_method='file_magic (DragonFly|FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
+       lt_cv_file_magic_cmd=/usr/bin/file
+       lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+       ;;
+@@ -7704,7 +7704,7 @@ if test -z "$aix_libpath"; then aix_libp
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu)
++    freebsd* | kfreebsd*-gnu | dragonfly*)
+       archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       hardcode_libdir_flag_spec='-R$libdir'
+       hardcode_direct=yes
+@@ -8282,7 +8282,7 @@ kfreebsd*-gnu)
+   dynamic_linker='GNU ld.so'
+   ;;
+ 
+-freebsd*)
++freebsd* | dragonfly*)
+   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+   version_type=freebsd-$objformat
+   case $version_type in
+@@ -10653,7 +10653,7 @@ if test -z "$aix_libpath"; then aix_libp
+   freebsd-elf*)
+     archive_cmds_need_lc_CXX=no
+     ;;
+-  freebsd* | kfreebsd*-gnu)
++  freebsd* | kfreebsd*-gnu| dragonfly*)
+     # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+     # conventions
+     ld_shlibs_CXX=yes
+@@ -11360,7 +11360,7 @@ echo $ECHO_N "checking for $compiler opt
+ 	    ;;
+ 	esac
+ 	;;
+-      freebsd* | kfreebsd*-gnu)
++      freebsd* | kfreebsd*-gnu | dragonfly*)
+ 	# FreeBSD uses GNU C++
+ 	;;
+       hpux9* | hpux10* | hpux11*)
+@@ -11974,7 +11974,7 @@ kfreebsd*-gnu)
+   dynamic_linker='GNU ld.so'
+   ;;
+ 
+-freebsd*)
++freebsd* | dragonfly*)
+   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+   version_type=freebsd-$objformat
+   case $version_type in
+@@ -14537,7 +14537,7 @@ if test -z "$aix_libpath"; then aix_libp
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu)
++    freebsd* | kfreebsd*-gnu | dragonfly*)
+       archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       hardcode_libdir_flag_spec_F77='-R$libdir'
+       hardcode_direct_F77=yes
+@@ -15115,7 +15115,7 @@ kfreebsd*-gnu)
+   dynamic_linker='GNU ld.so'
+   ;;
+ 
+-freebsd*)
++freebsd* | dragonfly*)
+   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+   version_type=freebsd-$objformat
+   case $version_type in
+@@ -16883,7 +16883,7 @@ if test -z "$aix_libpath"; then aix_libp
+       ;;
+ 
+     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+-    freebsd* | kfreebsd*-gnu)
++    freebsd* | kfreebsd*-gnu | dragonfly*)
+       archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+       hardcode_libdir_flag_spec_GCJ='-R$libdir'
+       hardcode_direct_GCJ=yes
+@@ -17461,7 +17461,7 @@ kfreebsd*-gnu)
+   dynamic_linker='GNU ld.so'
+   ;;
+ 
+-freebsd*)
++freebsd* | dragonfly*)
+   objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
+   version_type=freebsd-$objformat
+   case $version_type in