* Welcome to the brave new world of gettext-0.14.5 -- if a source file

  includes <libintl.h>, then we must ensure that the resulting object
  is linked against -lintl.  This ensures that the correct *printf()
  functions are used across all platforms.

* List the info files directly in the PLIST.

* Leave the HTML documentation where it is originally installed so that
  it references image files correctly.

Bump the PKGREVISION to 3.

4 files changed, 48 insertions, 41 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 42c1152f562..9c4c8236d20 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.63 2006/03/13 20:55:42 wiz Exp $
+# $NetBSD: Makefile,v 1.64 2006/03/31 16:47:44 jlam Exp $
 #
 
 DISTNAME=		vice-1.18
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		emulators
 MASTER_SITES=		ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/ \
 			http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/
@@ -27,7 +27,7 @@ USE_LANGUAGES+=		c c++
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-fullscreen
 
-INFO_FILES=		vice.info
+INFO_FILES=		# PLIST
 FONTS_DIRS.x11=		${PREFIX}/share/vice/fonts
 REQD_DIRS+=		${PREFIX}/share/vice/fonts
 REQD_DIRS+=		${PREFIX}/share/vice
@@ -44,17 +44,17 @@ CONFIGURE_ARGS+=	--without-oss
 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|g"		\
 			-e "s|/lib/vice|/share/vice|g"			\
 			-e "/^pkglibdir/s|(libdir)|(datadir)|g"		\
-			$$file.orig >$$file;				\
+			$$file > $$file.new;				\
+		if cmp -s $$file $$file.new; then			\
+			rm -f $$file.new;				\
+		else							\
+			mv -f $$file.new $$file;			\
+		fi;							\
 	done
 
-post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/vice
-	${MV} ${PREFIX}/share/doc/vice/*.html ${PREFIX}/share/doc/html/vice
-
 .include "../../devel/readline/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/emulators/vice/PLIST b/emulators/vice/PLIST
index a69d1037b41..c486540d3c0 100644
--- a/emulators/vice/PLIST
+++ b/emulators/vice/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2006/02/17 19:26:20 wiz Exp $
+@comment $NetBSD: PLIST,v 1.16 2006/03/31 16:47:44 jlam Exp $
 bin/c1541
 bin/petcat
 bin/vsid
@@ -8,27 +8,10 @@ bin/xcbm2
 bin/xpet
 bin/xplus4
 bin/xvic
+info/vice.info
 man/man1/c1541.1
 man/man1/petcat.1
 man/man1/vice.1
-share/doc/html/vice/index.html
-share/doc/html/vice/vice_1.html
-share/doc/html/vice/vice_10.html
-share/doc/html/vice/vice_11.html
-share/doc/html/vice/vice_12.html
-share/doc/html/vice/vice_13.html
-share/doc/html/vice/vice_14.html
-share/doc/html/vice/vice_15.html
-share/doc/html/vice/vice_16.html
-share/doc/html/vice/vice_2.html
-share/doc/html/vice/vice_3.html
-share/doc/html/vice/vice_4.html
-share/doc/html/vice/vice_5.html
-share/doc/html/vice/vice_6.html
-share/doc/html/vice/vice_7.html
-share/doc/html/vice/vice_8.html
-share/doc/html/vice/vice_9.html
-share/doc/html/vice/vice_toc.html
 share/doc/vice/64doc.txt
 share/doc/vice/BUGS
 share/doc/vice/COPYING
@@ -47,10 +30,28 @@ share/doc/vice/Win32-Howto.txt
 share/doc/vice/cbm_basic_tokens.txt
 share/doc/vice/drive_info.txt
 share/doc/vice/iec-bus.txt
+share/doc/vice/index.html
 share/doc/vice/mon.txt
 share/doc/vice/new.gif
 share/doc/vice/serial.txt
 share/doc/vice/vice-logo.jpg
+share/doc/vice/vice_1.html
+share/doc/vice/vice_10.html
+share/doc/vice/vice_11.html
+share/doc/vice/vice_12.html
+share/doc/vice/vice_13.html
+share/doc/vice/vice_14.html
+share/doc/vice/vice_15.html
+share/doc/vice/vice_16.html
+share/doc/vice/vice_2.html
+share/doc/vice/vice_3.html
+share/doc/vice/vice_4.html
+share/doc/vice/vice_5.html
+share/doc/vice/vice_6.html
+share/doc/vice/vice_7.html
+share/doc/vice/vice_8.html
+share/doc/vice/vice_9.html
+share/doc/vice/vice_toc.html
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/vice.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/vice.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/vice.mo
@@ -240,4 +241,3 @@ share/vice/fonts/vice-cbm.pcf
 @dirrm share/vice/C128
 @comment in REQ_DIRS: @dirrm share/vice
 @dirrm share/doc/vice
-@dirrm share/doc/html/vice
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index a76ee5189df..418cc3bbaa8 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2006/02/17 19:26:54 wiz Exp $
+$NetBSD: distinfo,v 1.23 2006/03/31 16:47:44 jlam Exp $
 
 SHA1 (vice-1.18.tar.gz) = f37015c28d226057ce8e48bfdbeb18f1d707e343
 RMD160 (vice-1.18.tar.gz) = 58dbebb2e5942a94865cd24c22d2243be103d15c
@@ -7,5 +7,5 @@ SHA1 (patch-aa) = fa152c1d14aad31c0b50fe96c83b4e5cfa06de5f
 SHA1 (patch-ab) = e9cebe89629f2dacb500695e4205cc33fab18bfe
 SHA1 (patch-ac) = 78b47925355731bd7ab9f99a56d7430204c7617f
 SHA1 (patch-ad) = 9f26a52a0f60658b147ad62a8cadc37ddd99fe04
-SHA1 (patch-ae) = bfd6cea294951b01054f90aad0b5fd3225e845ff
+SHA1 (patch-ae) = 9528bc0da7af5a0c74f5f0d2a8bf30b71802850c
 SHA1 (patch-af) = c7aef30587e36c6f83daab29f76528f49846aa22
diff --git a/emulators/vice/patches/patch-ae b/emulators/vice/patches/patch-ae
index 15065105741..f664d227eaf 100644
--- a/emulators/vice/patches/patch-ae
+++ b/emulators/vice/patches/patch-ae
@@ -1,13 +1,20 @@
-$NetBSD: patch-ae,v 1.6 2005/12/11 22:46:50 dillo Exp $
+$NetBSD: patch-ae,v 1.7 2006/03/31 16:47:45 jlam Exp $
 
---- src/Makefile.in.orig	2005-11-20 20:43:07.000000000 +0100
+--- src/Makefile.in.orig	2005-11-20 14:43:07.000000000 -0500
 +++ src/Makefile.in
-@@ -18,7 +18,7 @@ srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- pkgdatadir = $(datadir)/@PACKAGE@
--pkglibdir = $(libdir)/@PACKAGE@
-+pkglibdir = $(datadir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ..
+@@ -715,6 +715,7 @@ c1541_LDADD = \
+ 	$(diskimage_lib) \
+ 	$(tape_lib) \
+ 	$(serial_lib) \
++	@INTLLIBS@ \
+ 	@READLINE@ \
+ 	@VICE_ZLIB@
  
+@@ -737,6 +738,7 @@ petcat_SOURCES = \
+ petcat_LDADD = \
+ 	@ARCH_DIR@/archdep.o \
+ 	$(fileio_lib) \
++	@INTLLIBS@
+ 	@VICE_ZLIB@
+ 
+ subdir = src