- use STAGEDIR

- use OPTIONS_DEFINE
- new option PLUSE

2 files changed, 78 insertions, 47 deletions

diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index c3df0b2dbc7c..ea2d46c81c98 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -17,44 +17,22 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \
 		mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \
 		mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
-		gif:${PORTSDIR}/graphics/giflib \
-		mp3lame:${PORTSDIR}/audio/lame
-.if defined(VICE_WITH_XAW3D)
-LIB_DEPENDS+=	Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
-.endif
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
+		libgif.so:${PORTSDIR}/graphics/giflib \
+		libmp3lame.so:${PORTSDIR}/audio/lame
 
 RESTRICTED=	ROMs are copyrighted by Commodore Business Machines
-NO_STAGE=	yes
 
-USES=		iconv:patch pkgconfig
+USES=		iconv:patch pkgconfig gmake
 USE_XORG=	xpm ice sm xext xv xt x11 xmu
 USE_XORG+=	xrender xinerama xi xrandr xcursor xcomposite xdamage xfixes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAKE_ENV+=	MAKEINFOFLAGS="--no-split"
-
-.if defined(VICE_WITH_XAW3D)
-GNOME_SUFFIX=	-xaw3d
-CONFIGURE_ARGS=	--with-xaw3d --disable-gnomeui
-CONFLICTS?=	vice-gnome-1.* vice-1.*
-.else
-.if !defined(VICE_WITHOUT_GNOME)
-GNOME_SUFFIX=	-gnome
-USE_GNOME=	gtk20 vte
-CONFIGURE_ARGS=	--enable-gnomeui
-CONFLICTS?=	vice-1.* vice-xaw3d-1.*
-.else
-CONFIGURE_ARGS=	--without-xaw3d --disable-gnomeui
-CONFLICTS?=	vice-xaw3d-1.* vice-gnome-1.*
-USE_XORG+=	xaw
-.endif
-.endif
-
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
-CONFIGURE_ARGS+=	--enable-fullscreen --enable-ipv6 --disable-dependency-tracking
+CONFIGURE_ARGS+=	--enable-fullscreen --enable-ipv6 \
+			--disable-dependency-tracking
 #CONFIGURE_ARGS+=	--enable-ethernet
 # libpcap or libnet
 #CONFIGURE_ARGS+=	--enable-sdlui
@@ -63,7 +41,6 @@ CONFIGURE_ARGS+=	--enable-fullscreen --enable-ipv6 --disable-dependency-tracking
 #CONFIGURE_ARGS+=	--enable-parsid
 #CONFIGURE_ARGS+=	--enable-memmap
 
-MAN1=		vice.1 c1541.1 petcat.1
 MLINKS=		vice.1 x64.1 \
 		vice.1 x128.1 \
 		vice.1 xvic.1 \
@@ -75,8 +52,10 @@ FIX_XAW=	src/arch/unix/x11/xaw/about.c \
 		src/arch/unix/x11/xaw/uicartridge.c \
 		src/arch/unix/x11/xaw/uiedisk.c \
 		src/arch/unix/x11/xaw/uimenu.c \
+		src/arch/unix/x11/xaw/uipalcontrol.c \
 		src/arch/unix/x11/xaw/uiscreenshot.c \
 		src/arch/unix/x11/xaw/uisnapshot.c \
+		src/arch/unix/x11/xaw/uivsidcontrol.c \
 		src/arch/unix/x11/xaw/x11ui.c \
 		src/arch/unix/x11/xaw/widgets/FileSel.c \
 		src/arch/unix/x11/xaw/widgets/FileSelP.h \
@@ -84,10 +63,54 @@ FIX_XAW=	src/arch/unix/x11/xaw/about.c \
 		src/arch/unix/x11/xaw/widgets/MultiListP.h \
 		src/arch/unix/x11/xaw/widgets/ScrList.c \
 
+OPTIONS_DEFINE=	SDL ASOUND PULSE
+OPTIONS_SINGLE= GUI
+OPTIONS_SINGLE_GUI=	GNOMEUI XAW3D XAW
+OPTIONS_DEFAULT?=	GNOMEUI SDL
+NO_OPTIONS_SORT=yes
+GNOMEUI_DESC=	use gnomeui toolkit
+XAW3D_DESC=	use Xaw3d library
+XAW_DESC=	use plain Xaw library
+SDL_DESC=	build with SDL sound system support
+ASOUND_DESC=	build with asound support
+PULSE_DESC=	build with pulseaudio support
+
+GNOMEUI_CONFIGURE_ENABLE=	gnomeui
+XAW3D_CONFIGURE_WITH=	xaw3d
+XAW3D_LIB_DEPENDS=	libXaw3d.so:${PORTSDIR}/x11-toolkits/Xaw3d
+SDL_USE=		SDL=sdl
+SDL_CONFIGURE_ON=	--with-sdlsound
+SDL_CPPFLAGS=		-I${LOCALBASE}/include/SDL
+ASOUND_CONFIGURE_OFF=	--without-alsa
+ASOUND_LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
+PULSE_CONFIGURE_OFF=	--without-pulse
+PULSE_LIB_DEPENDS=	libpulse.so:${PORTSDIR}/audio/pulseaudio
+
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MDOCS}
-INFO=		vice
+.if !defined(BUILDING_INDEX)
+__pmlinks1!= ${ECHO_CMD} '${MLINKS:S/    / /}' | ${AWK} \
+	'{ if (NF % 2 != 0) { print "broken"; exit; } \
+	for (i=1; i<=NF; i++) { \
+		if ( i % 2 == 0) { print " " $$i " ;"; } \
+		else { printf "${LN} -s " $$i " "; } \
+	} }'
+.endif
+
+.if ${PORT_OPTIONS:MXAW3D}
+GNOME_SUFFIX=   -xaw3d
+CONFLICTS?=     vice-gnome-1.* vice-1.*
+.endif
+
+.if ${PORT_OPTIONS:MGNOMEUI}
+GNOME_SUFFIX=   -gnome
+USE_GNOME=      gtk20 vte
+CONFLICTS?=     vice-1.* vice-xaw3d-1.*
+.endif
+
+.if ${PORT_OPTIONS:MXAW}
+CONFLICTS?=     vice-xaw3d-1.* vice-gnome-1.*
+USE_XORG+=      xaw
 .endif
 
 .if exists(${LOCALBASE}/bin/fc-cache)
@@ -100,7 +123,7 @@ PLIST_SUB+=		NOFCCACHE=""
 
 # will be picked up by configure
 .if exists(${LOCALBASE}/include/ffmpeg/avformat.h)
-LIB_DEPENDS+=		avcodec:${PORTSDIR}/multimedia/ffmpeg
+LIB_DEPENDS+=		libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
@@ -114,14 +137,12 @@ CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=		NLS="@comment "
 .endif
 
-.if !defined(WITHOUT_SDL)
-USE_SDL=		sdl
-CONFIGURE_ARGS+=	--with-sdlsound
-CPPFLAGS+=		-I${LOCALBASE}/include/SDL
+.if ${PORT_OPTIONS:MDOCS}
+INFO+=		vice
 .endif
 
-.if defined(VICE_WITH_ASOUND)
-LIB_DEPENDS+=	asound:${PORTSDIR}/audio/alsa-lib
+.if ${PORT_OPTIONS:MSDL}
+USE_SDL=	sdl
 .endif
 
 post-extract:
@@ -142,25 +163,26 @@ post-patch:
 .if ! ${PORT_OPTIONS:MDOCS}
 	${REINPLACE_CMD} -e 's| doc||' ${WRKSRC}/Makefile.in
 .endif
-.if ! ${PORT_OPTIONS:MDOCS}
-.if defined(VICE_WITH_XAW3D)
+.if ${PORT_OPTIONS:MXAW3D}
 .for i in ${FIX_XAW}
 	${REINPLACE_CMD} -e 's|X11/Xaw/|X11/Xaw3d/|' ${WRKSRC}/${i}
 .endfor
 .endif
-.endif
 
 pre-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/vice/fonts
+.if exists(${LOCALBASE}/bin/fc-cache)
+	${INSTALL_DATA} ${WRKSRC}/data/fonts/vice-cbm.bdf \
+		${STAGEDIR}${PREFIX}/lib/vice/fonts/
+.endif
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .endif
-	${MKDIR} ${PREFIX}/lib/vice/fonts
-	${INSTALL_DATA} ${WRKSRC}/data/fonts/vice-cbm.bdf \
-		${PREFIX}/lib/vice/fonts/
 
 post-install:
+	( cd ${STAGEDIR}${MANPREFIX}/man/man1 && ${__pmlinks1} )
 .if ${PORT_OPTIONS:MDOCS}
-	@${LN} -sf vice_toc.html ${DOCSDIR}/index.html
+	${LN} -sf vice_toc.html ${STAGEDIR}${DOCSDIR}/index.html
 .endif
 
 .include <bsd.port.mk>
diff --git a/emulators/vice/pkg-plist b/emulators/vice/pkg-plist
index 3746720d0a60..a8f69830788a 100644
--- a/emulators/vice/pkg-plist
+++ b/emulators/vice/pkg-plist
@@ -11,7 +11,7 @@ bin/xcbm5x0
 bin/xpet
 bin/xplus4
 bin/xvic
-info/vice.txt
+%%PORTDOCS%%info/vice.txt
 %%NLS%%share/locale/da/LC_MESSAGES/vice.mo
 %%NLS%%share/locale/de/LC_MESSAGES/vice.mo
 %%NLS%%share/locale/es/LC_MESSAGES/vice.mo
@@ -185,6 +185,15 @@ lib/vice/VIC20/kernal
 lib/vice/VIC20/x11_pos.vkm
 lib/vice/VIC20/x11_sym.vkm
 lib/vice/fonts/CBM.ttf
+man/man1/c1541.1.gz
+man/man1/petcat.1.gz
+man/man1/vice.1.gz
+man/man1/x128.1.gz
+man/man1/x64.1.gz
+man/man1/xcbm2.1.gz
+man/man1/xpet.1.gz
+man/man1/xplus4.1.gz
+man/man1/xvic.1.gz
 %%FCCACHE%%lib/vice/fonts/vice-cbm.bdf
 %%NOFCCACHE%%lib/vice/fonts/vice-cbm.pcf
 %%NOFCCACHE%%lib/vice/fonts/fonts.dir