From f2fbdf940e6095fb49af064a07fbff0f61f4b5a8 Mon Sep 17 00:00:00 2001 From: wiz Date: Fri, 17 Feb 2006 19:26:20 +0000 Subject: Fix font handling. Move options handling to options.mk. Fix pkglint warning. Bump PKGREVISION. --- emulators/vice/Makefile | 36 ++++++++---------------------------- emulators/vice/PLIST | 7 +++---- emulators/vice/distinfo | 3 ++- emulators/vice/options.mk | 23 +++++++++++++++++++++++ 4 files changed, 36 insertions(+), 33 deletions(-) create mode 100644 emulators/vice/options.mk (limited to 'emulators/vice') diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index 190ba79e572..b41fbb86443 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.61 2006/02/05 23:09:05 joerg Exp $ +# $NetBSD: Makefile,v 1.62 2006/02/17 19:26:20 wiz Exp $ # DISTNAME= vice-1.18 -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= emulators MASTER_SITES= ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/ \ http://www.nic.funet.fi/pub/cbm/crossplatform/emulators/VICE/ @@ -13,7 +13,7 @@ COMMENT= Emulator for C64, C128, CBM-II, PET, and VIC20 BUILD_USES_MSGFMT= YES -RESTRICTED= "ROM image copyright is questionable" +RESTRICTED= ROM image copyright is questionable. NO_BIN_ON_CDROM= ${RESTRICTED} NO_SRC_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} @@ -28,26 +28,18 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-fullscreen INFO_FILES= vice.info +FONTS_DIRS.x11= ${PREFIX}/share/vice/fonts +REQD_DIRS+= ${PREFIX}/share/vice/fonts +REQD_DIRS+= ${PREFIX}/share/vice -.include "../../mk/bsd.prefs.mk" - -PKG_OPTIONS_VAR= PKG_OPTIONS.vice -PKG_SUPPORTED_OPTIONS= esound ffmpeg lame gnome +.include "options.mk" -.include "../../mk/bsd.options.mk" +.include "../../mk/bsd.prefs.mk" .if (${OPSYS} == NetBSD) CONFIGURE_ARGS+= --without-oss .endif -.if !empty(PKG_OPTIONS:Mffmpeg) -CONFIGURE_ARGS+= --enable-ffmpeg -.endif - -.if !empty(PKG_OPTIONS:Mgnome) -CONFIGURE_ARGS+= --enable-gnomeui -.endif - # These changes are rather common, so sed instead of patch: post-patch: @for file in `${FIND} ${WRKSRC} -name Makefile.in -print` \ @@ -63,22 +55,10 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/html/vice ${MV} ${PREFIX}/share/doc/vice/*.html ${PREFIX}/share/doc/html/vice -.if !empty(PKG_OPTIONS:Mesound) -.include "../../audio/esound/buildlink3.mk" -.endif .include "../../devel/readline/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" .include "../../graphics/xpm/buildlink3.mk" -.if !empty(PKG_OPTIONS:Mffmpeg) -.include "../../multimedia/ffmpeg/buildlink3.mk" -. if !empty(PKG_OPTIONS:Mlame) -.include "../../audio/lame/buildlink3.mk" -. endif -.endif -.if !empty(PKG_OPTIONS:Mgnome) -.include "../../x11/gnome-libs/buildlink3.mk" -.endif .include "../../mk/bsd.pkg.mk" diff --git a/emulators/vice/PLIST b/emulators/vice/PLIST index 8347e42005a..a69d1037b41 100644 --- a/emulators/vice/PLIST +++ b/emulators/vice/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2005/12/11 22:46:50 dillo Exp $ +@comment $NetBSD: PLIST,v 1.15 2006/02/17 19:26:20 wiz Exp $ bin/c1541 bin/petcat bin/vsid @@ -228,9 +228,8 @@ share/vice/VIC20/win_pos.vkm share/vice/VIC20/win_sym.vkm share/vice/VIC20/x11_pos.vkm share/vice/VIC20/x11_sym.vkm -share/vice/fonts/fonts.dir share/vice/fonts/vice-cbm.pcf -@dirrm share/vice/fonts +@comment in REQ_DIRS: @dirrm share/vice/fonts @dirrm share/vice/VIC20 @dirrm share/vice/PRINTER @dirrm share/vice/PLUS4 @@ -239,6 +238,6 @@ share/vice/fonts/vice-cbm.pcf @dirrm share/vice/CBM-II @dirrm share/vice/C64 @dirrm share/vice/C128 -@dirrm share/vice +@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 6c42b6e2470..1040ae03501 100644 --- a/emulators/vice/distinfo +++ b/emulators/vice/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2005/12/11 22:46:50 dillo Exp $ +$NetBSD: distinfo,v 1.21 2006/02/17 19:26:20 wiz Exp $ SHA1 (vice-1.18.tar.gz) = f37015c28d226057ce8e48bfdbeb18f1d707e343 RMD160 (vice-1.18.tar.gz) = 58dbebb2e5942a94865cd24c22d2243be103d15c @@ -9,3 +9,4 @@ SHA1 (patch-ac) = 78b47925355731bd7ab9f99a56d7430204c7617f SHA1 (patch-ad) = 9f26a52a0f60658b147ad62a8cadc37ddd99fe04 SHA1 (patch-ae) = bfd6cea294951b01054f90aad0b5fd3225e845ff SHA1 (patch-af) = c7aef30587e36c6f83daab29f76528f49846aa22 +SHA1 (patch-ba) = 5489b0ec22980c2bda03de2e46b2a4a8c13c253f diff --git a/emulators/vice/options.mk b/emulators/vice/options.mk new file mode 100644 index 00000000000..131edac0548 --- /dev/null +++ b/emulators/vice/options.mk @@ -0,0 +1,23 @@ +# $NetBSD: options.mk,v 1.1 2006/02/17 19:26:20 wiz Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.vice +PKG_SUPPORTED_OPTIONS= esound ffmpeg lame gnome + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mesound) +.include "../../audio/esound/buildlink3.mk" +.endif + +.if !empty(PKG_OPTIONS:Mffmpeg) +CONFIGURE_ARGS+= --enable-ffmpeg +.include "../../multimedia/ffmpeg/buildlink3.mk" +. if !empty(PKG_OPTIONS:Mlame) +. include "../../audio/lame/buildlink3.mk" +. endif +.endif + +.if !empty(PKG_OPTIONS:Mgnome) +CONFIGURE_ARGS+= --enable-gnomeui +.include "../../x11/gnome-libs/buildlink3.mk" +.endif -- cgit v1.2.3