From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Dec 17 02:30:48 2005 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E9D6216A41F for ; Sat, 17 Dec 2005 02:30:48 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 47B9E43D98 for ; Sat, 17 Dec 2005 02:30:06 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id jBH2U3Vm008151 for ; Sat, 17 Dec 2005 02:30:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id jBH2U315008150; Sat, 17 Dec 2005 02:30:03 GMT (envelope-from gnats) Resent-Date: Sat, 17 Dec 2005 02:30:03 GMT Resent-Message-Id: <200512170230.jBH2U315008150@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Yen-Ming Lee Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2880516A41F; Sat, 17 Dec 2005 02:21:55 +0000 (GMT) (envelope-from leeym@utopia.leeym.com) Received: from msr44.hinet.net (msr44.hinet.net [168.95.4.144]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5D9A843D62; Sat, 17 Dec 2005 02:21:54 +0000 (GMT) (envelope-from leeym@utopia.leeym.com) Received: from utopia.leeym.com (utopia.leeym.com [211.21.137.52]) by msr44.hinet.net (8.9.3/8.9.3) with ESMTP id KAA11259; Sat, 17 Dec 2005 10:21:50 +0800 (CST) Received: from localhost (localhost [127.0.0.1]) by utopia.leeym.com (Postfix) with ESMTP id 89098B29CF9; Sat, 17 Dec 2005 10:21:48 +0800 (CST) Received: from utopia.leeym.com ([127.0.0.1]) by localhost (utopia.leeym.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 13309-04; Sat, 17 Dec 2005 10:21:43 +0800 (CST) Received: by utopia.leeym.com (Postfix, from userid 1000) id 516F1B29CB4; Sat, 17 Dec 2005 10:21:43 +0800 (CST) Message-Id: <20051217022143.516F1B29CB4@utopia.leeym.com> Date: Sat, 17 Dec 2005 10:21:43 +0800 (CST) From: Yen-Ming Lee To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: dinoex@FreeBSD.org Subject: ports/90525: [PATCH] emulators/vice: fix plist X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 Dec 2005 02:30:49 -0000 >Number: 90525 >Category: ports >Synopsis: [PATCH] emulators/vice: fix plist >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Dec 17 02:30:02 GMT 2005 >Closed-Date: >Last-Modified: >Originator: Yen-Ming Lee >Release: FreeBSD 6.0-STABLE i386 >Organization: FreeBSD Taiwan >Environment: System: FreeBSD utopia.leeym.com 6.0-STABLE FreeBSD 6.0-STABLE #0: Thu Nov 17 09:15:19 CST 2005 >Description: - fix plist by letting this port detect GNU gettext correctly - support NOPORTDOCS - quote COMMENT/RESTRICTED to make portlint/vim happier Port maintainer (dinoex@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: http://pointyhat.freebsd.org/errorlogs/i386-errorlogs/e.5.2005111508/vice-1.18.log >Fix: --- vice-1.18.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/emulators/vice/Makefile,v retrieving revision 1.41 diff -u -u -r1.41 Makefile --- Makefile 11 Dec 2005 10:06:01 -0000 1.41 +++ Makefile 17 Dec 2005 02:19:06 -0000 @@ -12,14 +12,14 @@ PKGNAMESUFFIX?= ${GNOME_SUFFIX}${PKGNAMESUFFIX2} MAINTAINER= dinoex@FreeBSD.org -COMMENT= Emulator for Commodore's C64, C128, VIC20, PET, and CBM-II +COMMENT= "Emulator for Commodore's 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 +41,6 @@ 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 +49,10 @@ vice.1 xplus4.1 \ vice.1 xcbm2.1 +.if !defined(NOPORTDOCS) +INFO= vice +.endif + .include .if exists(${LOCALBASE}/include/esd.h) && !defined(WITHOUT_ESOUND) @@ -63,7 +66,7 @@ .if !defined(WITHOUT_NLS) USE_GETTEXT= yes -LIBS+= -lgettextlib +LDFLAGS+= -lgettextlib PLIST_SUB+= NLS="" .else CONFIGURE_ARGS+= --disable-nls @@ -99,13 +102,21 @@ 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 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/emulators/vice/pkg-plist,v retrieving revision 1.18 diff -u -u -r1.18 pkg-plist --- pkg-plist 11 Dec 2005 10:06:01 -0000 1.18 +++ pkg-plist 17 Dec 2005 02:19:07 -0000 @@ -7,12 +7,12 @@ 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_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 --- vice-1.18.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: