diff --git a/print/xfce4-print/Makefile b/print/xfce4-print/Makefile
index fe69142b109e..4e5ae59808dc 100644
--- a/print/xfce4-print/Makefile
+++ b/print/xfce4-print/Makefile
@@ -1,70 +1,65 @@
-# New ports collection makefile for:	xfprint
-# Date created:		7 June 2003
-# Whom:			James Earl <jdearl@telus.net>
-#
+# Created by: James Earl <jdearl@telus.net>
 # $FreeBSD$
-#
 
 PORTNAME=	xfce4-print
 PORTVERSION=	4.6.1
 PORTREVISION=	8
 CATEGORIES=	print xfce
 MASTER_SITES=	${MASTER_SITE_XFCE}
 MASTER_SITE_SUBDIR=	src/archive/xfprint/${PORTVERSION:R}
 DISTNAME=	xfprint-${PORTVERSION}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Xfce 4 graphical frontend for printing
 
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_GMAKE=	yes
 USE_GNOME=	glib20 gnomehack gtk20 intltool intlhack pkgconfig
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv libgui libutil xfconf
 
-OPTIONS=	LPR	"Use lpr as printing system"		on \
-		CUPS	"Use cups as printing system"		off \
-		LETTER	"Use letter paper format instead of A4" off
+OPTIONS_DEFINE=	LETTER
+OPTIONS_SINGLE=	PRINTMETHOD
+OPTIONS_SINGLE_PRINTMETHOD=	LPR CUPS
+LETTER_DESC=	Use letter paper format instead of A4
+LPR_DESC=	Use lpr as printing system
 
 .include <bsd.port.pre.mk>
 
-.if defined(WITH_CUPS)
+.if ${PORT_OPTIONS:MCUPS}
 CONFIGURE_ARGS+=--enable-cups
 LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client
 PLIST_SUB+=	CUPS=""
 .else
 CONFIGURE_ARGS+=--disable-cups
 PLIST_SUB+=	CUPS="@comment "
 .endif
 
-.if defined(WITHOUT_LPR)
+.if ${PORT_OPTIONS:MLPR}
 CONFIGURE_ARGS+=--disable-bsdlpr
 PLIST_SUB+=	LPR="@comment "
 .else
 CONFIGURE_ARGS+=--enable-bsdlpr --with-printcap=/etc/printcap
 PLIST_SUB+=	LPR=""
 .endif
 
-.if defined(WITHOUT_LPR) && !defined(WITH_CUPS)
-IGNORE=		define WITH_CUPS or undefine WITHOUT_LPR to install this port
-.endif
 
-.if defined(WITH_LETTER)
+.if ${PORT_OPTIONS:MLETTER}
 CONFIGURE_ARGS+=--enable-letter
 BUILD_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-letter
 RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-letter
 .else
 CONFIGURE_ARGS+=--disable-letter
 BUILD_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-a4
 RUN_DEPENDS+=	a2ps:${PORTSDIR}/print/a2ps-a4
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/@LDFLAGS@/& -Wl,-E/' ${WRKSRC}/xfprint/Makefile.in \
 		 ${WRKSRC}/xfprint-manager/Makefile.in
 
 .include <bsd.port.post.mk>