2 files changed, 25 insertions, 28 deletions

diff --git a/archivers/xarchive/Makefile b/archivers/xarchive/Makefile
index b966297c511c..1d37b58b59ad 100644
--- a/archivers/xarchive/Makefile
+++ b/archivers/xarchive/Makefile
@@ -1,66 +1,63 @@
-# New ports collection makefile for:	xarchive
-# Date created:				09 November 2005
-# Whom:					Mark Kane <mark@mkproductions.org>
-#
+# Created by: Mark Kane <mark@mkproductions.org>
 # $FreeBSD$
-#
 
 PORTNAME=	xarchive
-PORTVERSION=	0.2.8.6
+DISTVERSION=	0.2.8-6
 PORTREVISION=	7
 CATEGORIES=	archivers
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/0.2.8-6
-DISTNAME=	${PORTNAME}-0.2.8-6
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${DISTVERSION}
 
 MAINTAINER=	mark@mkproductions.org
-COMMENT=	A GTK+ front end for archiving tools
+COMMENT=	GTK+ front end for various archiving tools
 
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
-MAN1=		xarchive.1
-
 GNU_CONFIGURE=	yes
 USE_GNOME=	gtk20
 
-OPTIONS=	7ZIP "Support for 7zip archives" off \
-		ARJ "Support for ARJ archives" off \
-		ACE "Support for ACE archives" off \
-		DEB "Support for DEB archives" off \
-		RAR "Support for RAR archives" off \
-		RPM "Support for RPM archives" off \
-		ZIP "Support for ZIP archives" off
+MAN1=		${PORTNAME}.1
+
+OPTIONS_DEFINE=	7ZIP ARJ ACE DEB RAR RPM ZIP
+
+7ZIP_DESC=	7zip archive support
+ARJ_DESC=	ARJ archive support
+ACE_DESC=	ACE archive support
+DEB_DESC=	DEB archive support
+RAR_DESC=	RAR archive support
+RPM_DESC=	RPM archive support
+ZIP_DESC=	ZIP archive support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined (WITH_7ZIP)
+.if ${PORT_OPTIONS:M7ZIP}
 RUN_DEPENDS+=	7z:${PORTSDIR}/archivers/p7zip
 .endif
 
-.if defined (WITH_ARJ)
+.if ${PORT_OPTIONS:MARJ}
 RUN_DEPENDS+=	arj:${PORTSDIR}/archivers/arj
 .endif
 
-.if defined (WITH_ACE)
+.if ${PORT_OPTIONS:MACE}
 RUN_DEPENDS+=	unace:${PORTSDIR}/archivers/unace
 .endif
 
-.if defined (WITH_DEB)
+.if ${PORT_OPTIONS:MDEB}
 RUN_DEPENDS+=	dpkg-deb:${PORTSDIR}/archivers/dpkg
 .endif
 
-.if defined (WITH_RAR)
+.if ${PORT_OPTIONS:MRAR}
 RUN_DEPENDS+=	rar:${PORTSDIR}/archivers/rar \
 		unrar:${PORTSDIR}/archivers/unrar
 .endif
 
-.if defined (WITH_RPM)
+.if ${PORT_OPTIONS:MRPM}
 RUN_DEPENDS+=	rpm2cpio:${PORTSDIR}/archivers/rpm2cpio \
 		rpm:${PORTSDIR}/archivers/rpm
 .endif
 
-.if defined (WITH_ZIP)
+.if ${PORT_OPTIONS:MZIP}
 RUN_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/archivers/xarchive/pkg-descr b/archivers/xarchive/pkg-descr
index 51b7c7e4d0dc..1b2c708dcbcf 100644
--- a/archivers/xarchive/pkg-descr
+++ b/archivers/xarchive/pkg-descr
@@ -5,4 +5,4 @@ It uses external bash shell wrappers to handle the different types of file
 formats, so adding support for new archive types can be easily done by writing
 a wrapper.
 
-WWW: http://xarchive.sourceforge.net
+WWW: http://xarchive.sourceforge.net/