Strongly-buildlink emulators/vice and mark as USE_BUILDLINK_ONLY. Make

this package work with XF4.  Based on work by Thomas Klausner (wiz) sent
in private e-mail.

5 files changed, 76 insertions, 98 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 2316b666088..c5e6c72bac7 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2001/08/01 22:16:46 kristerw Exp $
+# $NetBSD: Makefile,v 1.18 2001/10/02 20:04:33 jlam Exp $
+#
 
 DISTNAME=		vice-1.7
 CATEGORIES=		emulators
 MASTER_SITES=		ftp://ftp.funet.fi/pub/cbm/firmware/computers/c64/ \
-			ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/
+			ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/ \
+			http://www.nic.funet.fi/pub/cbm/crossplatform/emulators/VICE/
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 			64gs.390852-01.bin \
 			kernal.4064.901246-01.bin \
@@ -13,8 +15,6 @@ MAINTAINER=		kristerw@netbsd.org
 HOMEPAGE=		http://www.cs.cmu.edu/~dsladic/vice/vice.html
 COMMENT=		Emulator for C64, C128, CBM-II, PET, and VIC20
 
-DEPENDS+=		esound>=0.2.18:../../audio/esound
-
 RESTRICTED=		"ROM image copyright is questionable"
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
@@ -23,41 +23,55 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 
-GNU_CONFIGURE=		yes
-USE_X11=		yes
-USE_GTEXINFO=		yes
+GNU_CONFIGURE=		YES
+USE_GTEXINFO=		YES
+USE_BUILDLINK_ONLY=	YES
 
 # These changes are rather common, so sed instead of patch:
 post-patch:
-	@for file in `${FIND} ${WRKSRC} -name Makefile.in -print` \
-			${WRKSRC}/src/arch/unix/archdep.h; do \
-		${MV} -f $$file $$file.orig && \
-		${SED}  -e s,/lib/vice/doc,/share/doc/vice, \
-			-e s,/lib/vice,/share/vice, \
-			-e '/^pkglibdir/s,(libdir),(datadir),' $$file.orig >$$file; \
+	@for file in `${FIND} ${WRKSRC} -name Makefile.in -print`	\
+			${WRKSRC}/src/arch/unix/archdep.h; do		\
+		${MV} -f $$file $$file.orig &&				\
+		${SED}  -e "s|/lib/vice/doc|/share/doc/vice|g"		\
+			-e "s|/lib/vice|/share/vice|g"			\
+			-e "/^pkglibdir/s|(libdir)|(datadir)|g"		\
+			$$file.orig >$$file;				\
 	done
 
 post-build:
-	@dd if=${_DISTDIR}/64gs.390852-01.bin of=${WRKDIR}/basic.64gs bs=8k count=1 2>/dev/null
-	@dd if=${_DISTDIR}/64gs.390852-01.bin of=${WRKDIR}/kernal.64gs bs=8k skip=1 2>/dev/null
-	@${SED} -e 's,kernal,kernal.64gs,' -e 's,basic,basic.64gs,' \
-		${WRKSRC}/data/C64/default.vrs >${WRKDIR}/64gs.vrs
-	@${SED} -e 's,kernal,kernal.4064,' \
-		${WRKSRC}/data/C64/default.vrs >${WRKDIR}/4064.vrs
-	@${SED} -e 's,kernal,kernal.sx64,' \
-		${WRKSRC}/data/C64/default.vrs >${WRKDIR}/sx64.vrs
+	dd if=${_DISTDIR}/64gs.390852-01.bin of=${WRKDIR}/basic.64gs	\
+		bs=8k count=1 2>/dev/null
+	dd if=${_DISTDIR}/64gs.390852-01.bin of=${WRKDIR}/kernal.64gs	\
+		bs=8k skip=1 2>/dev/null
+	${SED}	-e "s|kernal|kernal.64gs|g" -e "s|basic|basic.64gs|g"	\
+		${WRKSRC}/data/C64/default.vrs > ${WRKDIR}/64gs.vrs
+	${SED}	-e "s|kernal|kernal.4064|g"				\
+		${WRKSRC}/data/C64/default.vrs > ${WRKDIR}/4064.vrs
+	${SED}	-e "s|kernal|kernal.sx64|g"				\
+		${WRKSRC}/data/C64/default.vrs > ${WRKDIR}/sx64.vrs
 
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/basic.64gs ${PREFIX}/share/vice/C64/
 	${INSTALL_DATA} ${WRKDIR}/kernal.64gs ${PREFIX}/share/vice/C64/
-	${INSTALL_DATA} ${_DISTDIR}/kernal.4064.901246-01.bin ${PREFIX}/share/vice/C64/kernal.4064
-	${INSTALL_DATA} ${_DISTDIR}/kernal.sx.251104-04.bin ${PREFIX}/share/vice/C64/kernal.sx64
-	cd ${WRKDIR} && ${INSTALL_DATA} 64gs.vrs 4064.vrs sx64.vrs \
+	${INSTALL_DATA} ${_DISTDIR}/kernal.4064.901246-01.bin		\
+		${PREFIX}/share/vice/C64/kernal.4064
+	${INSTALL_DATA} ${_DISTDIR}/kernal.sx.251104-04.bin		\
+		${PREFIX}/share/vice/C64/kernal.sx64
+	cd ${WRKDIR} && ${INSTALL_DATA} 64gs.vrs 4064.vrs sx64.vrs	\
 		${PREFIX}/share/vice/C64/
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/vice
 	${MV} ${PREFIX}/share/doc/vice/*.html ${PREFIX}/share/doc/html/vice
 
+.include "../../audio/esound/buildlink.mk"
+.include "../../devel/readline/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink.mk"
+.include "../../devel/zlib/buildlink.mk"
+#.include "../../graphics/png/buildlink.mk"
+.include "../../graphics/xpm/buildlink.mk"
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
 
-# this is the emulator's recommended setting
-CFLAGS:=		-O5 -finline-functions
+# This is the emulator's recommended setting.  We place it last so that it
+# overrides other CFLAGS settings.
+#
+CFLAGS+=		-O5 -finline-functions
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index a2f24bfc277..c25f60056b5 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/08/01 22:16:46 kristerw Exp $
+$NetBSD: distinfo,v 1.4 2001/10/02 20:04:33 jlam Exp $
 
 SHA1 (vice-1.7.tar.gz) = 75d4b7d349c13b965368014e6dbd8df7410e1db4
 Size (vice-1.7.tar.gz) = 2728101 bytes
@@ -9,5 +9,6 @@ Size (kernal.4064.901246-01.bin) = 8192 bytes
 SHA1 (kernal.sx.251104-04.bin) = aa136e91ecf3c5ac64f696b3dbcbfc5ba0871c98
 Size (kernal.sx.251104-04.bin) = 8192 bytes
 SHA1 (patch-ab) = 0be2ec8b98a50e5c879095b1d0327c802b7740e2
-SHA1 (patch-ac) = c15c93874527f3dd855e8b495e9cda35a2bc9170
-SHA1 (patch-ad) = f05127f36b2b52d41089044f36617217a3523edd
+SHA1 (patch-ac) = 0ffe94ad3501363a6606f1e9c3ef6f1f0985ac2e
+SHA1 (patch-ad) = ea9f6ebb3696591d1f0c4d496bff41fe1c8a8a73
+SHA1 (patch-ae) = 8e595b5b304fe2f3b6084fb30d569d0186d3d0c7
diff --git a/emulators/vice/patches/patch-ac b/emulators/vice/patches/patch-ac
index 95afffa7b13..6e19238e0d4 100644
--- a/emulators/vice/patches/patch-ac
+++ b/emulators/vice/patches/patch-ac
@@ -1,82 +1,22 @@
-$NetBSD: patch-ac,v 1.9 2001/08/01 22:16:46 kristerw Exp $
---- configure.orig	Mon Jul 23 20:08:13 2001
-+++ configure	Wed Aug  1 23:24:36 2001
-@@ -4714,6 +4714,8 @@
- 	SOUND_DRIVERS="$SOUND_DRIVERS soundsdl.o"
- fi
- 
-+# we don't want to find OSS emulation, let's use NetBSD's own interface
-+if false; then
- for ac_hdr in linux/soundcard.h machine/soundcard.h
- do
- ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-@@ -4753,6 +4755,7 @@
-   echo "$ac_t""no" 1>&6
- fi
- done
-+fi
- 
- for ac_hdr in dmedia/audio.h
- do
-@@ -5300,7 +5303,7 @@
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lesd $SOUND_LIBS $LIBS"
-+LIBS="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lesd $SOUND_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 5306 "configure"
- #include "confdefs.h"
-@@ -5334,7 +5337,7 @@
- #define $ac_tr_lib 1
- EOF
- 
--  LIBS="-lesd $LIBS"
-+  LIBS="-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lesd $LIBS"
- 
- else
-   echo "$ac_t""no" 1>&6
-@@ -5834,7 +5837,7 @@
+$NetBSD: patch-ac,v 1.10 2001/10/02 20:04:33 jlam Exp $
+
+--- configure.orig	Mon Jul 23 14:08:13 2001
++++ configure
+@@ -5834,7 +5834,7 @@
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    ac_save_LIBS="$LIBS"
 -LIBS="-lreadline  $LIBS"
-+LIBS="-ledit -ltermcap $LIBS"
++LIBS="-lreadline -ltermcap $LIBS"
  cat > conftest.$ac_ext <<EOF
  #line 5840 "configure"
  #include "confdefs.h"
-@@ -5862,7 +5865,7 @@
+@@ -5862,7 +5862,7 @@
  fi
  if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
    echo "$ac_t""yes" 1>&6
 -   READLINE="" LIBS="-lreadline $LIBS"
-+   READLINE="" LIBS="-ledit -ltermcap $LIBS"
++   READLINE="" LIBS="-lreadline -ltermcap $LIBS"
  else
    echo "$ac_t""no" 1>&6
   
-@@ -6449,7 +6452,7 @@
-     # For Solaris; some versions of Sun CC require a space after -R and
-     # others require no space.  Words are not sufficient . . . .
-     case "`(uname -sr) 2>/dev/null`" in
--    "SunOS 5"*)
-+    "SunOS 5"*|"NetBSD "*)
-       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
- echo "configure:6455: checking whether -R must be followed by a space" >&5
-       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
-@@ -7501,7 +7504,7 @@
- 
-   fi
- 
--
-+if false; then
-   echo $ac_n "checking for XpmCreatePixmapFromData in -lXpm""... $ac_c" 1>&6
- echo "configure:7507: checking for XpmCreatePixmapFromData in -lXpm" >&5
- ac_lib_var=`echo Xpm'_'XpmCreatePixmapFromData | sed 'y%./+-%__p_%'`
-@@ -7545,6 +7548,7 @@
-  
- else
-   echo "$ac_t""no" 1>&6
-+fi
- fi
- 
- 
diff --git a/emulators/vice/patches/patch-ad b/emulators/vice/patches/patch-ad
index 409b9a2b0d4..445261914f4 100644
--- a/emulators/vice/patches/patch-ad
+++ b/emulators/vice/patches/patch-ad
@@ -1,4 +1,5 @@
-$NetBSD: patch-ad,v 1.5 2001/08/01 22:16:46 kristerw Exp $
+$NetBSD: patch-ad,v 1.6 2001/10/02 20:04:33 jlam Exp $
+
 --- src/arch/unix/c64ui.c.orig	Sat Jun 16 16:03:42 2001
 +++ src/arch/unix/c64ui.c	Wed Aug  1 23:02:01 2001
 @@ -460,6 +460,15 @@
diff --git a/emulators/vice/patches/patch-ae b/emulators/vice/patches/patch-ae
new file mode 100644
index 00000000000..b99f6c9baee
--- /dev/null
+++ b/emulators/vice/patches/patch-ae
@@ -0,0 +1,22 @@
+$NetBSD: patch-ae,v 1.3 2001/10/02 20:04:34 jlam Exp $
+
+--- src/Makefile.in.orig	Mon Jul 23 14:09:00 2001
++++ src/Makefile.in
+@@ -38,7 +38,7 @@
+ DESTDIR =
+ 
+ pkgdatadir = $(datadir)/@PACKAGE@
+-pkglibdir = $(libdir)/@PACKAGE@
++pkglibdir = $(datadir)/@PACKAGE@
+ pkgincludedir = $(includedir)/@PACKAGE@
+ 
+ top_builddir = ..
+@@ -125,7 +125,7 @@
+ cxx = @cxx@
+ sdl_config = @sdl_config@
+ 
+-LINK = @LINKCC@ $(CFLAGS) $(INCLUDES) $(CPPFLAGS) -o $@
++LINK = @LINKCC@ $(CFLAGS) $(INCLUDES) $(CPPFLAGS) $(LDFLAGS) -o $@
+ @HAVE_RS232_TRUE@rs232_ldadd = rsuser.o
+ @HAVE_RS232_FALSE@rs232_ldadd = 
+