Index: head/audio/gbsplay/Makefile
===================================================================
--- head/audio/gbsplay/Makefile	(revision 303817)
+++ head/audio/gbsplay/Makefile	(revision 303818)
@@ -1,101 +1,96 @@
-# New ports collection makefile for:	gbsplay
-# Date created:				25 Jun 2005
-# Whom:					Emanuel Haupt <ehaupt@critical.ch>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	gbsplay
 PORTVERSION=	0.0.8
 PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	BERLIOS CRITICAL
 PKGNAMEPREFIX?=
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT?=	Emulates the sound hardware of the Nintendo Game Boy(TM)
 
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 MAKE_JOBS_SAFE=	yes
 USE_CSTD=	gnu89
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX}
 
 .if ${PKGNAMEPREFIX} == ""
 
 CONFIGURE_ARGS+=	--without-xmmsplugin
 
 MAN1=		gbsplay.1 gbsinfo.1
 MAN5=		gbsplayrc.5
 PORTDOCS=	COPYRIGHT HISTORY README
 
-OPTIONS=	NAS "NAS sound output" on
+OPTIONS_DEFINE=	NAS
 
 .endif
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PKGNAMEPREFIX} == ""
 
-.if defined(WITH_NAS)
-LIB_DEPENDS+=	audio.2:${PORTSDIR}/audio/nas
+.if ${PORT_OPTIONS:MNAS}
+LIB_DEPENDS+=	audio:${PORTSDIR}/audio/nas
 .else
 CONFIGURE_ARGS+=	--disable-nas
 .endif
 
 .endif
 
 post-patch: gbsplay-post-patch
 	@${REINPLACE_CMD} -e 's|^\(default.*\)test|\1|' ${WRKSRC}/${MAKEFILE}
 	@${REINPLACE_CMD} -e \
 		'/^need_include\ /d; \
 		 468s|char argc|int argc|; \
 		 s|/usr/local/include|${LOCALBASE}/include|; \
 		 s|/usr/local/lib|${LOCALBASE}/lib|; \
 		 s|/usr/X11R6/include||; \
 		 s|/usr/X11R6/lib||; \
 		 s|/usr/X11/lib|${LOCALBASE}/lib|; \
 		 s|/usr/lib/X11|${LOCALBASE}/lib/X11|; \
 		 s|-Os||; s|-pipe||; s|-fomit-frame-pointer||; \
 		 s|-march=$$ARCH||' \
 		${WRKSRC}/configure
 
 .if ${PKGNAMEPREFIX} == ""
 
 gbsplay-post-patch:
 	@${REINPLACE_CMD} -e 's|/\(etc/gbsplayrc\)|${PREFIX}/\1|' \
 		${WRKSRC}/gbsplay.c \
 		${WRKSRC}/gbsplay.in.1 \
 		${WRKSRC}/gbsplayrc.in.5
 
 do-install:
 .for f in ${PORTNAME} gbsinfo
 	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${PREFIX}/bin
 .endfor
 .for f in ${MAN1} ${MAN5}
 	${INSTALL_MAN} ${WRKSRC}/${f} ${MAN${f:E}PREFIX}/man/man${f:E}
 .endfor
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/nightmode.gbs ${EXAMPLESDIR}
 
 	${INSTALL_DATA} ${WRKSRC}/examples/gbsplayrc_sample ${PREFIX}/etc/gbsplayrc.default
 .if !exists(${PREFIX}/etc/gbsplayrc)
 	${INSTALL_DATA} ${WRKSRC}/examples/gbsplayrc_sample ${PREFIX}/etc/gbsplayrc
 .endif
 
 .for l in de en
 	${INSTALL_DATA} ${WRKSRC}/po/${l}.mo ${PREFIX}/share/locale/${l}/LC_MESSAGES/gbsplay.mo
 .endfor
 
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
 
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: head/audio/xmms-gbsplay/Makefile
===================================================================
--- head/audio/xmms-gbsplay/Makefile	(revision 303817)
+++ head/audio/xmms-gbsplay/Makefile	(revision 303818)
@@ -1,46 +1,41 @@
-# New ports collection makefile for:	xmms-gbsplay
-# Date created:				25 Jun 2005
-# Whom:					Emanuel Haupt <ehaupt@critical.ch>
-#
 # $FreeBSD$
-#
 
 PKGNAMEPREFIX=	xmms-
 
 COMMENT=	A XMMS plugin for playing Nintendo Game Boy(TM) audio
 
 MASTERDIR=	${.CURDIR}/../gbsplay
 
 BUILD_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms
 RUN_DEPENDS=	xmms:${PORTSDIR}/multimedia/xmms \
 		gbsplay:${PORTSDIR}/audio/gbsplay
 
 USE_GNOME=	glib12
 
 CONFIGURE_ARGS=	--disable-nas
 
 DESCR=		${.CURDIR}/pkg-descr
 PLIST=		${.CURDIR}/pkg-plist
 
 PLIST_FILES=	lib/xmms/Input/gbsxmms.so
 
 post-extract:
 	@${RM} -f ${WRKSRC}/po/subdir.mk
 
 gbsplay-post-patch:
 	@${REINPLACE_CMD} -e \
 		's|`which xmms-config`||; \
 		 s|\(xmms-config\)|${LOCALBASE}/bin/\1|g; \
 		 s|`which glib-config`||; \
 		 s|glib-config|${GLIB_CONFIG}|g; \
 		 /LOCALE_PREFIX/ s|$$localedir|${LOCALBASE}/share/locale|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e \
 		's|^objs += $$(objs_gbsplay) $$(objs_gbsinfo)||; \
 		 s|^dsts += gbsplay gbsinfo||; \
 		 /^default:/ s|$$(mans)||' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gbsxmms.so ${PREFIX}/lib/xmms/Input
 
 .include "${MASTERDIR}/Makefile"