Index: head/net-p2p/lopster/Makefile
===================================================================
--- head/net-p2p/lopster/Makefile	(revision 395154)
+++ head/net-p2p/lopster/Makefile	(revision 395155)
@@ -1,49 +1,37 @@
 # Created by: Roman Shterenzon <roman@xpert.com>
 # $FreeBSD$
 
 PORTNAME=	lopster
 PORTVERSION=	1.2.2
 PORTREVISION=	13
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF \
 		http://lopster.sourceforge.net/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+ client for Napster and free alternatives
 
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 GNU_CONFIGURE=	yes
 USES=		gmake
 USE_GNOME=	gtk12
 CONFIGURE_ARGS=	--with-pthread=yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 OPTIONS_DEFINE=	FLAC OGG ZLIB
 OPTIONS_DEFAULT=	FLAC OGG ZLIB
 
-.include <bsd.port.options.mk>
-
-# --with-flac is on by default
-.if ${PORT_OPTIONS:MFLAC}
-LIB_DEPENDS+=		libFLAC.so:${PORTSDIR}/audio/flac
-.else
-CONFIGURE_ARGS+=	--without-flac
-.endif
-
-# --with-ogg is on by default
-.if ${PORT_OPTIONS:MOGG}
-LIB_DEPENDS+=		libogg.so:${PORTSDIR}/audio/libogg
-.else
-CONFIGURE_ARGS+=	--without-ogg
-.endif
-
-# --with-zlib is on by default
-.if ! ${PORT_OPTIONS:MZLIB}
-CONFIGURE_ARGS+=	--without-zlib
-.endif
+FLAC_LIB_DEPENDS=	libFLAC.so:${PORTSDIR}/audio/flac
+FLAC_CONFIGURE_WITH=	flac
+OGG_LIB_DEPENDS=	libogg.so:${PORTSDIR}/audio/libogg
+OGG_CONFIGURE_WITH=	ogg
+ZLIB_CONFIGURE_WITH=	zlib
 
 post-patch:
 	@${REINPLACE_CMD} -e "s/www.naplist.com/www.gotnap.com/" \
 		${WRKSRC}/src/lopster.h
 
 .include <bsd.port.mk>