2 files changed, 64 insertions, 52 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 326dd1da842e..a4c9612aac3f 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -6,20 +6,21 @@
 
 PORTNAME=	vice
 PORTVERSION=	1.18
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \
 		ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/
 PKGNAMESUFFIX?=	${GNOME_SUFFIX}${PKGNAMESUFFIX2}
 
 MAINTAINER=	dinoex@FreeBSD.org
-COMMENT=	Emulator for Commodore's C64, C128, VIC20, PET, and CBM-II
+COMMENT=	Emulator for Commodore C64, C128, VIC20, PET, and CBM-II
 
 LIB_DEPENDS=	png:${PORTSDIR}/graphics/png
 .if !defined(VICE_WITH_GNOME)
 LIB_DEPENDS+=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 .endif
 
-RESTRICTED=	ROMs are copyrighted by Commodore Business Machines
+RESTRICTED=	"ROMs are copyrighted by Commodore Business Machines"
 
 USE_XPM=	yes
 USE_REINPLACE=	yes
@@ -41,7 +42,6 @@ CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ENV+=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
-INFO=		vice
 MAN1=		vice.1 c1541.1 petcat.1
 MLINKS=		vice.1 x64.1 \
 		vice.1 x128.1 \
@@ -50,6 +50,10 @@ MLINKS=		vice.1 x64.1 \
 		vice.1 xplus4.1 \
 		vice.1 xcbm2.1
 
+.if !defined(NOPORTDOCS)
+INFO=		vice
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/include/esd.h) && !defined(WITHOUT_ESOUND)
@@ -63,7 +67,7 @@ LIB_DEPENDS+=		avcodec.1:${PORTSDIR}/multimedia/ffmpeg
 
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=		yes
-LIBS+=			-lgettextlib
+LDFLAGS+=		-lgettextlib
 PLIST_SUB+=		NLS=""
 .else
 CONFIGURE_ARGS+=	--disable-nls
@@ -99,13 +103,21 @@ post-extract:
 post-patch:
 	${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" \
 		${WRKSRC}/man/vice.1
+.if defined(NOPORTDOCS)
+	${REINPLACE_CMD} -e 's| doc||' ${WRKSRC}/Makefile.in
+.endif
 
 pre-install:
-	${MKDIR} ${DOCSDIR} ${PREFIX}/lib/vice/fonts
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.endif
+	${MKDIR} ${PREFIX}/lib/vice/fonts
 	${INSTALL_DATA} ${WRKSRC}/data/fonts/vice-cbm.bdf \
 		${PREFIX}/lib/vice/fonts/
 
 post-install:
+.if !defined(NOPORTDOCS)
 	@${LN} -sf vice_toc.html ${DOCSDIR}/index.html
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist
index b708e915ff15..e2f3f5902a07 100644
--- a/emulators/vice/pkg-plist
+++ b/emulators/vice/pkg-plist
@@ -7,12 +7,12 @@ bin/xcbm2
 bin/xpet
 bin/xplus4
 bin/xvic
-%%NLS%%lib/locale/de/LC_MESSAGES/vice.mo
-%%NLS%%lib/locale/fr/LC_MESSAGES/vice.mo
-%%NLS%%lib/locale/it/LC_MESSAGES/vice.mo
-%%NLS%%lib/locale/nl/LC_MESSAGES/vice.mo
-%%NLS%%lib/locale/pl/LC_MESSAGES/vice.mo
-%%NLS%%lib/locale/sv/LC_MESSAGES/vice.mo
+%%NLS%%share/locale/de/LC_MESSAGES/vice.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/vice.mo
+%%NLS%%share/locale/it/LC_MESSAGES/vice.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/vice.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/vice.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/vice.mo
 lib/vice/C128/basic64
 lib/vice/C128/basichi
 lib/vice/C128/basiclo
@@ -186,47 +186,47 @@ lib/vice/VIC20/x11_pos.vkm
 lib/vice/VIC20/x11_sym.vkm
 lib/vice/fonts/fonts.dir
 lib/vice/fonts/vice-cbm.pcf
-%%DOCSDIR%%/64doc.txt
-%%DOCSDIR%%/BUGS
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/MSDOS-Ethernet-Howto.txt
-%%DOCSDIR%%/MSDOS-Howto.txt
-%%DOCSDIR%%/MinixVmd-Howto.txt
-%%DOCSDIR%%/NEWS
-%%DOCSDIR%%/NLS-Howto.txt
-%%DOCSDIR%%/PETdoc.txt
-%%DOCSDIR%%/Readme.beos
-%%DOCSDIR%%/Readme.dos
-%%DOCSDIR%%/ReadmeMacOSX.txt
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/Walkthrough-Howto.txt
-%%DOCSDIR%%/Win32-Howto.txt
-%%DOCSDIR%%/cbm_basic_tokens.txt
-%%DOCSDIR%%/drive_info.txt
-%%DOCSDIR%%/iec-bus.txt
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/mon.txt
-%%DOCSDIR%%/new.gif
-%%DOCSDIR%%/serial.txt
-%%DOCSDIR%%/vice_1.html
-%%DOCSDIR%%/vice_10.html
-%%DOCSDIR%%/vice_11.html
-%%DOCSDIR%%/vice_12.html
-%%DOCSDIR%%/vice_13.html
-%%DOCSDIR%%/vice_14.html
-%%DOCSDIR%%/vice_15.html
-%%DOCSDIR%%/vice_16.html
-%%DOCSDIR%%/vice_2.html
-%%DOCSDIR%%/vice_3.html
-%%DOCSDIR%%/vice_4.html
-%%DOCSDIR%%/vice_5.html
-%%DOCSDIR%%/vice_6.html
-%%DOCSDIR%%/vice_7.html
-%%DOCSDIR%%/vice_8.html
-%%DOCSDIR%%/vice_9.html
-%%DOCSDIR%%/vice_toc.html
-%%DOCSDIR%%/vice-logo.jpg
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/64doc.txt
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/MSDOS-Ethernet-Howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/MSDOS-Howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/MinixVmd-Howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/NEWS
+%%PORTDOCS%%%%DOCSDIR%%/NLS-Howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/PETdoc.txt
+%%PORTDOCS%%%%DOCSDIR%%/Readme.beos
+%%PORTDOCS%%%%DOCSDIR%%/Readme.dos
+%%PORTDOCS%%%%DOCSDIR%%/ReadmeMacOSX.txt
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/Walkthrough-Howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/Win32-Howto.txt
+%%PORTDOCS%%%%DOCSDIR%%/cbm_basic_tokens.txt
+%%PORTDOCS%%%%DOCSDIR%%/drive_info.txt
+%%PORTDOCS%%%%DOCSDIR%%/iec-bus.txt
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/mon.txt
+%%PORTDOCS%%%%DOCSDIR%%/new.gif
+%%PORTDOCS%%%%DOCSDIR%%/serial.txt
+%%PORTDOCS%%%%DOCSDIR%%/vice_1.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_10.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_11.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_12.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_13.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_14.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_15.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_16.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_2.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_3.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_4.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_5.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_6.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_7.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_8.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_9.html
+%%PORTDOCS%%%%DOCSDIR%%/vice_toc.html
+%%PORTDOCS%%%%DOCSDIR%%/vice-logo.jpg
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/vice/VIC20
 @dirrm lib/vice/PLUS4
 @dirrm lib/vice/PRINTER