Index: head/audio/adplay/Makefile
===================================================================
--- head/audio/adplay/Makefile	(revision 303815)
+++ head/audio/adplay/Makefile	(revision 303816)
@@ -1,61 +1,56 @@
-# New ports collection makefile for:	adplay
-# Date created:				10 August 2004
-# Whom:					Emanuel Haupt <ehaupt@critical.ch>
-#
 # $FreeBSD$
-#
 
 PORTNAME=	adplay
 PORTVERSION=	1.7
 PORTREVISION=	4
 CATEGORIES=	audio
 MASTER_SITES=	SF/adplug/AdPlay_UNIX/${PORTVERSION}:main \
 		SF/adplug/Database/2006-07-06:db
 DISTFILES=	${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${EXTRACT_SUFX}:main \
 		adplugdb-${DBVERSION}${EXTRACT_SUFX}:db
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	AdLib player using adplug library
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	adplug-2.2:${PORTSDIR}/audio/libadplug
+LIB_DEPENDS=	adplug:${PORTSDIR}/audio/libadplug
 
 GNU_CONFIGURE=	yes
 WANT_SDL=	yes
 MAKE_JOBS_SAFE=	yes
 
 DBFILE=		adplug.db
 DBVERSION=	2006-07-07
 
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libbinio
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 CONFIGURE_ARGS+=	--sharedstatedir=${DATADIR}
 
 MAN1=		adplay.1
 PLIST_FILES=	bin/adplay %%DATADIR%%/adplug.db
 PLIST_DIRS=	%%DATADIR%%
 
-OPTIONS=	SDL	"Build with SDL output support"	off
+OPTIONS_DEFINE=	SDL
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_SDL)
+.if ${PORT_OPTIONS:MSDL}
 USE_SDL=	sdl mixer
 .else
 CONFIGURE_ARGS+=	--disable-output-sdl
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|^\(adplug_data_dir.*\)/.*|\1|' \
 		${WRKSRC}/src/Makefile.in
 	@${RM} ${WRKSRC}/src/getopt.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/adplay ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/adplay.1 ${MANPREFIX}/man/man1
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/${DBVERSION}/${DBFILE} ${DATADIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>