- Add stage support

- Squeeze MASTER_SITES/MASTER_SITE_SUBDIR
- Convert LIB_DEPENDS to new style
- Use options helpers
- Remove useless LATEST_LINK

4 files changed, 71 insertions, 152 deletions

diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile
index 9a465b927ddc..25a68a32ef5a 100644
--- a/sysutils/k3b-kde4/Makefile
+++ b/sysutils/k3b-kde4/Makefile
@@ -10,19 +10,17 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE CD/DVD writing suite
 
-LIB_DEPENDS=	cdda_paranoia:${PORTSDIR}/audio/cdparanoia \
-		samplerate:${PORTSDIR}/audio/libsamplerate
+LIB_DEPENDS=	libcdda_paranoia.so:${PORTSDIR}/audio/cdparanoia \
+		libsamplerate.so:${PORTSDIR}/audio/libsamplerate
 RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
 BUILD_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools
 
-LATEST_LINK=	${PORTNAME}-kde4
-
 USE_BZIP2=	yes
 USES=		cmake shared-mime-info
 CMAKE_ARGS=	-DK3B_BUILD_K3BSETUP:BOOL=OFF \
 		-DK3B_ENABLE_MUSICBRAINZ:BOOL=OFF
 USE_KDE4=	automoc4 kdeprefix kdelibs libkcddb
-USE_QT4=	gui dbus network phonon qt3support sql svg webkit xml \
+USE_QT4=	gui phonon qt3support webkit \
 		qmake_build moc_build rcc_build uic_build
 USE_LDCONFIG=	yes
 
@@ -32,141 +30,69 @@ OPTIONS_DEFINE=	CDRDAO DVDPLUSRW EMOVIX VCDIMAGER FFMPEG FLAC MAD \
 OPTIONS_DEFAULT=CDRDAO DVDPLUSRW FFMPEG FLAC MAD MUSEPACK SNDFILE \
 		VORBIS_DEC VORBIS_ENC LIBDVDREAD TAGLIB
 NO_OPTIONS_SORT=yes
-CDRDAO_DESC=	Burning: cdrdao
-DVDPLUSRW_DESC=	Burning: DVD+RW Tools (DVD+/-R(W))
-EMOVIX_DESC=	Burning: eMovix (bootable video CDs)
-VCDIMAGER_DESC=	Burning: VCDImager (video CDs)
-FFMPEG_DESC=	Decoder: various (multimedia/ffmpeg)
-FLAC_DESC=	Decoder: FLAC (audio/flac)
-MAD_DESC=	Decoder: MP3 (audio/libmad)
-MUSEPACK_DESC=	Decoder: Musepack (audio/musepack)
-SNDFILE_DESC=	Decoder: various (audio/libsndfile)
-VORBIS_DEC_DESC=Decoder: Ogg Vorbis
-LAME_DESC=	Encoder: MP3 (audio/lame)
-SOX_DESC=	Encoder: various (audio/sox)
-VORBIS_ENC_DESC=Encoder: Ogg Vorbis
-LIBDVDREAD_DESC=Misc: libdvdread (video DVD ripping)
-NORMALIZE_DESC=	Misc: normalize (adjust audio to a std. level)
-TAGLIB_DESC=	Misc: TagLib (reading/writing audio metadata)
-TRANSCODE_DESC=	Misc: Transcode (DVD ripping)
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MCDRDAO}
-RUN_DEPENDS+=	cdrdao:${PORTSDIR}/sysutils/cdrdao
-.endif
-
-.if ${PORT_OPTIONS:MDVDPLUSRW}
-RUN_DEPENDS+=	dvd+rw-format:${PORTSDIR}/sysutils/dvd+rw-tools
-.endif
-
-.if ${PORT_OPTIONS:MEMOVIX}
-RUN_DEPENDS+=	mkmovixiso:${PORTSDIR}/multimedia/emovix
-.endif
-
-.if ${PORT_OPTIONS:MVCDIMAGER}
-RUN_DEPENDS+=	vcdxrip:${PORTSDIR}/multimedia/vcdimager
-.endif
-
-.if ${PORT_OPTIONS:MFFMPEG}
-LIB_DEPENDS+=	avcodec:${PORTSDIR}/multimedia/ffmpeg
-PLIST_SUB+=	FFMPEG=""
-.else
-CMAKE_ARGS+=	-DK3B_BUILD_FFMPEG_DECODER_PLUGIN:BOOL=OFF
-PLIST_SUB+=	FFMPEG="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=	FLAC:${PORTSDIR}/audio/flac
-PLIST_SUB+=	FLAC=""
-.else
-CMAKE_ARGS+=	-DK3B_BUILD_FLAC_DECODER_PLUGIN:BOOL=OFF
-PLIST_SUB+=	FLAC="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMAD}
-LIB_DEPENDS+=	mad:${PORTSDIR}/audio/libmad
-PLIST_SUB+=	MAD=""
-.else
-CMAKE_ARGS+=	-DK3B_BUILD_MAD_DECODER_PLUGIN:BOOL=OFF
-PLIST_SUB+=	MAD="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MMUSEPACK}
-CMAKE_ARGS+=	-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
-LIB_DEPENDS+=	mpcdec:${PORTSDIR}/audio/musepack
-PLIST_SUB+=	MUSEPACK=""
-.else
-CMAKE_ARGS+=	-DK3B_BUILD_MUSE_DECODER_PLUGIN:BOOL=OFF
-PLIST_SUB+=	MUSEPACK="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSNDFILE}
-LIB_DEPENDS+=	sndfile:${PORTSDIR}/audio/libsndfile
-PLIST_SUB+=	SNDFILE=""
-.else
-CMAKE_ARGS+=	-DK3B_BUILD_SNDFILE_DECODER_PLUGIN:BOOL=OFF
-PLIST_SUB+=	SNDFILE="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MVORBIS_DEC}
-LIB_DEPENDS+=	ogg:${PORTSDIR}/audio/libogg
-PLIST_SUB+=	VORBIS_DEC=""
-.else
-CMAKE_ARGS+=	-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN:BOOL=OFF
-PLIST_SUB+=	VORBIS_DEC="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MLAME}
-LIB_DEPENDS+=	mp3lame:${PORTSDIR}/audio/lame
-PLIST_SUB+=	LAME=""
-.else
-CMAKE_ARGS+=	-DK3B_BUILD_LAME_ENCODER_PLUGIN:BOOL=OFF
-PLIST_SUB+=	LAME="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MSOX}
-RUN_DEPENDS+=	sox:${PORTSDIR}/audio/sox
-PLIST_SUB+=	SOX=""
-.else
-CMAKE_ARGS+=	-DK3B_BUILD_SOX_ENCODER_PLUGIN:BOOL=OFF
-PLIST_SUB+=	SOX="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MVORBIS_ENC}
-LIB_DEPENDS+=	ogg:${PORTSDIR}/audio/libogg
-PLIST_SUB+=	VORBIS_ENC=""
-.else
-CMAKE_ARGS+=	-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN:BOOL=OFF
-PLIST_SUB+=	VORBIS_ENC="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MLIBDVDREAD}
-LIB_DEPENDS+=	dvdread:${PORTSDIR}/multimedia/libdvdread
-PLIST_SUB+=	LIBDVDREAD=""
-.else
-CMAKE_ARGS+=	-DK3B_ENABLE_DVD_RIPPING:BOOL=OFF
-PLIST_SUB+=	LIBDVDREAD="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MNORMALIZE}
-RUN_DEPENDS+=	normalize:${PORTSDIR}/audio/normalize
-.endif
-
-.if ${PORT_OPTIONS:MTAGLIB}
-LIB_DEPENDS+=	tag:${PORTSDIR}/audio/taglib
-PLIST_SUB+=	TAGLIB=""
-.else
-CMAKE_ARGS+=	-DK3B_ENABLE_TAGLIB:BOOL=OFF
-PLIST_SUB+=	TAGLIB="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MTRANSCODE}
-RUN_DEPENDS+=	transcode:${PORTSDIR}/multimedia/transcode
-.endif
-
-post-install:
-	@${CAT} ${PKGMESSAGE}
+OPTIONS_SUB=	yes # FFMPEG FLAC MAD MUSEPACK SNDFILE VORBIS_ENC VORBIS_DEC LIBDVDREAD TAGLIB
+
+CDRDAO_DESC=		Burning: cdrdao
+CDRDAO_RUN_DEPENDS=	cdrdao:${PORTSDIR}/sysutils/cdrdao
+
+DVDPLUSRW_DESC=		Burning: DVD+RW Tools (DVD+/-R(W))
+DVDPLUSRW_RUN_DEPENDS=	dvd+rw-format:${PORTSDIR}/sysutils/dvd+rw-tools
+
+EMOVIX_DESC=		Burning: eMovix (bootable video CDs)
+EMOVIX_RUN_DEPENDS=	mkmovixiso:${PORTSDIR}/multimedia/emovix
+
+VCDIMAGER_DESC=		Burning: VCDImager (video CDs)
+VCDIMAGER_RUN_DEPENDS=	vcdxrip:${PORTSDIR}/multimedia/vcdimager
+
+FFMPEG_DESC=		Decoder: various (multimedia/ffmpeg)
+FFMPEG_LIB_DEPENDS=	libavcodec.so:${PORTSDIR}/multimedia/ffmpeg
+FFMPEG_CMAKE_OFF=	-DK3B_BUILD_FFMPEG_DECODER_PLUGIN:BOOL=OFF
+
+FLAC_DESC=		Decoder: FLAC (audio/flac)
+FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_CMAKE_OFF=		-DK3B_BUILD_FLAC_DECODER_PLUGIN:BOOL=OFF
+
+MAD_DESC=		Decoder: MP3 (audio/libmad)
+MAD_LIB_DEPENDS=	libmad.so:${PORTSDIR}/audio/libmad
+MAD_CMAKE_OFF=		-DK3B_BUILD_MAD_DECODER_PLUGIN:BOOL=OFF
+
+MUSEPACK_DESC=		Decoder: Musepack (audio/musepack)
+MUSEPACK_LIB_DEPENDS=	libmpcdec.so:${PORTSDIR}/audio/musepack
+MUSEPACK_CMAKE_ON=	-DCMAKE_REQUIRED_INCLUDES:STRING="${LOCALBASE}/include"
+MUSEPACK_CMAKE_OFF=	-DK3B_BUILD_MUSE_DECODER_PLUGIN:BOOL=OFF
+
+SNDFILE_DESC=		Decoder: various (audio/libsndfile)
+SNDFILE_LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile
+SNDFILE_CMAKE_ARGS=	-DK3B_BUILD_SNDFILE_DECODER_PLUGIN:BOOL=OFF
+
+VORBIS_DEC_DESC=	Decoder: Ogg Vorbis
+VORBIS_DEC_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+VORBIS_DEC_CMAKE_OFF=	-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN:BOOL=OFF
+
+LAME_DESC=		Encoder: MP3 (audio/lame)
+LAME_LIB_DEPENDS=	libmp3lame.so:${PORTSDIR}/audio/lame
+LAME_CMAKE_OFF=		-DK3B_BUILD_LAME_ENCODER_PLUGIN:BOOL=OFF
+
+SOX_DESC=		Encoder: various (audio/sox)
+SOX_RUN_DEPENDS=	sox:${PORTSDIR}/audio/sox
+SOX_CMAKE_OFF=		-DK3B_BUILD_SOX_ENCODER_PLUGIN:BOOL=OFF
+
+VORBIS_ENC_DESC=	Encoder: Ogg Vorbis
+VORBIS_ENC_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+VORBIS_ENC_CMAKE_OFF=	-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN:BOOL=OFF
+
+LIBDVDREAD_DESC=	Misc: libdvdread (video DVD ripping)
+LIBDVDREAD_LIB_DEPENDS=	libdvdread.so:${PORTSDIR}/multimedia/libdvdread
+LIBDVDREAD_CMAKE_OFF=	-DK3B_ENABLE_DVD_RIPPING:BOOL=OFF
+
+NORMALIZE_DESC=		Misc: normalize (adjust audio to a std. level)
+NORMALIZE_RUN_DEPENDS=	normalize:${PORTSDIR}/audio/normalize
+
+TAGLIB_DESC=		Misc: TagLib (reading/writing audio metadata)
+TAGLIB_LIB_DEPENDS=	libtag.so:${PORTSDIR}/audio/taglib
+TAGLIB_CMAKE_OFF=	-DK3B_ENABLE_TAGLIB:BOOL=OFF
+
+TRANSCODE_DESC=		Misc: Transcode (DVD ripping)
+TRANSCODE_RUN_DEPENDS=	transcode:${PORTSDIR}/multimedia/transcode
 
 .include <bsd.port.mk>
diff --git a/sysutils/kshutdown-kde4/Makefile b/sysutils/kshutdown-kde4/Makefile
index 3376c644923c..71a648a73a76 100644
--- a/sysutils/kshutdown-kde4/Makefile
+++ b/sysutils/kshutdown-kde4/Makefile
@@ -15,9 +15,6 @@ USES=		cmake
 USE_QT4=	moc_build qmake_build rcc_build uic_build
 USE_KDE4=	automoc4 kdehier kdeprefix workspace
 
-LATEST_LINK=	${PORTNAME}-kde4
-
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
-NO_STAGE=	yes
 .include <bsd.port.mk>
diff --git a/sysutils/policykit-qt/Makefile b/sysutils/policykit-qt/Makefile
index 39744c5c9f67..2fc1e5084583 100644
--- a/sysutils/policykit-qt/Makefile
+++ b/sysutils/policykit-qt/Makefile
@@ -5,14 +5,13 @@ PORTNAME=	policykit-qt
 PORTVERSION=	0.9.4
 PORTREVISION=	1
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/apps/KDE4.x/admin/
+MASTER_SITES=	KDE/stable/apps/KDE4.x/admin/
 DISTNAME=	polkit-qt-${PORTVERSION}
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	PolicyKit manager for Qt
 
-LIB_DEPENDS=	polkit.2:${PORTSDIR}/sysutils/policykit
+LIB_DEPENDS=	libpolkit.so:${PORTSDIR}/sysutils/policykit
 
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
@@ -23,7 +22,6 @@ USES=		cmake gettext
 
 PORTSCOUT=	limit:^0
 
-NO_STAGE=	yes
 post-extract:
 	${REINPLACE_CMD} -e 's|$${LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|' \
 		${WRKSRC}/CMakeLists.txt
diff --git a/sysutils/polkit-qt/Makefile b/sysutils/polkit-qt/Makefile
index fac0c5900c2e..1658f6eaa07a 100644
--- a/sysutils/polkit-qt/Makefile
+++ b/sysutils/polkit-qt/Makefile
@@ -6,8 +6,7 @@ PORTVERSION=	0.103.0
 PORTREVISION=	1
 DISTVERSIONPREFIX=	1-
 CATEGORIES=	sysutils
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/apps/KDE4.x/admin/
+MASTER_SITES=	KDE/stable/apps/KDE4.x/admin/
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Qt 4 frontend to PolKit-1
@@ -15,7 +14,7 @@ COMMENT=	Qt 4 frontend to PolKit-1
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	polkit-agent-1.0:${PORTSDIR}/sysutils/polkit
+LIB_DEPENDS=	libpolkit-agent-1.so:${PORTSDIR}/sysutils/polkit
 
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
@@ -28,7 +27,6 @@ USES=		cmake gettext
 #       requiring us to explicitly set LDFLAGS.
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-NO_STAGE=	yes
 post-extract:
 	${REINPLACE_CMD} -e 's|$${LIB_INSTALL_DIR}/pkgconfig|libdata/pkgconfig|' \
 		${WRKSRC}/CMakeLists.txt