Reset to the pool per maintainer request.

Thank you Shawn for your work.

While here: trim headers, convert to optionsng

PR:		ports/175949
Submitted by:	Shane Bell <shanjobe@gmail.com>

14 files changed, 43 insertions, 100 deletions

diff --git a/deskutils/basket/Makefile b/deskutils/basket/Makefile
index 3cacc15712a5..aed93e76de87 100644
--- a/deskutils/basket/Makefile
+++ b/deskutils/basket/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	basket
-# Date created:			Mon Sep  8 19:32:42 CEST 2003
-# Whom:				Markus Brueffer <brueffer@phoenix-systems.de>
-#
+# Created by: Markus Brueffer <brueffer@phoenix-systems.de>
 # $FreeBSD$
 
 PORTNAME=	basket
@@ -10,7 +7,7 @@ PORTREVISION=	7
 CATEGORIES=	deskutils kde
 MASTER_SITES=	http://basket.kde.org/downloads/
 
-MAINTAINER=	shanjobe@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Desktop organization tool
 
 USE_KDELIBS_VER=3
@@ -18,12 +15,14 @@ USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 
-OPTIONS=	KONTACT	"Kontact plugin" on \
-		GPGME "GPG support (experimental)" off
+OPTIONS_DEFINE=	KONTACT GPGME
+OPTIONS_DEFAULT=	KONTACT GPGME
+KONTACT_DESC=	Kontact plugin
+GPGME_DESC=	GPG support (experimental)
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_KONTACT)
+.if ${PORT_OPTIONS:MKONTACT}
 LIB_DEPENDS+=	kontact.1:${PORTSDIR}/deskutils/kdepim3
 PLIST_SUB=	KONTACT=""
 .else
@@ -31,7 +30,7 @@ PLIST_SUB=	KONTACT="@comment "
 CONFIGURE_ENV+=	DO_NOT_COMPILE="kontact_plugin"
 .endif
 
-.if defined(WITH_GPGME)
+.if ${PORT_OPTIONS:MGPGME}
 RUN_DEPENDS+=	pinentry-qt:${PORTSDIR}/security/pinentry-qt
 LIB_DEPENDS+=	gpgme.19:${PORTSDIR}/security/gpgme \
 		gpg-error.0:${PORTSDIR}/security/libgpg-error
@@ -42,4 +41,4 @@ CONFIGURE_ARGS+=	--with-encryption=no
 post-patch:
 	@${REINPLACE_CMD} -e 's/-O2//g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/net-im/libmsn/Makefile b/net-im/libmsn/Makefile
index dca9f373fbec..67d7d37a13b6 100644
--- a/net-im/libmsn/Makefile
+++ b/net-im/libmsn/Makefile
@@ -1,17 +1,12 @@
-# ex:ts=8
-# Ports collection makefile for:	libmsn
-# Date created:			Feb 6, 2005
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	libmsn
 DISTVERSION=	4.2.1
 CATEGORIES=	net-im
 MASTER_SITES=	SF
 
-MAINTAINER=	shanjobe@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A library for connecting to MSN Messenger service
 
 LICENSE=	GPLv2
diff --git a/sysutils/filelight/Makefile b/sysutils/filelight/Makefile
index 50fb9f956fc0..ad492d5e1e59 100644
--- a/sysutils/filelight/Makefile
+++ b/sysutils/filelight/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	filelight
-# Date created:		Fri Aug 29 21:16:39 CEST 2003
-# Whom:			Markus Brueffer <brueffer@phoenix-systems.de>
-#
+# Created by: Markus Brueffer <brueffer@phoenix-systems.de>
 # $FreeBSD$
-#
 
 PORTNAME=	filelight
 PORTVERSION=	1.0
@@ -11,7 +7,7 @@ PORTREVISION=	7
 CATEGORIES=	sysutils kde
 MASTER_SITES=	http://www.methylblue.com/filelight/packages/
 
-MAINTAINER=	shanjobe@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Represent a file system as a set of concentric segmented-rings
 
 USE_KDELIBS_VER=3
diff --git a/x11-themes/cursor-polar-theme/Makefile b/x11-themes/cursor-polar-theme/Makefile
index 284dc0c28d26..28a3d763f8c0 100644
--- a/x11-themes/cursor-polar-theme/Makefile
+++ b/x11-themes/cursor-polar-theme/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cursor-polar-theme
-# Date created:				1st September, 2005
-# Whom:					decept
-#
+# Created by: Shawn Bell <decept@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	polar-theme
 PORTVERSION=	1.4
@@ -13,7 +9,7 @@ MASTER_SITES=	http://www.kde-look.org/CONTENT/content-files/
 PKGNAMEPREFIX=	cursor-
 DISTNAME=	27913-PolarCursorThemes
 
-MAINTAINER=	shanjobe@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Polar is a smooth and simple cursor set
 
 NO_BUILD=	yes
diff --git a/x11-themes/kde-style-comix/Makefile b/x11-themes/kde-style-comix/Makefile
index b41b78faf04d..7b431562b088 100644
--- a/x11-themes/kde-style-comix/Makefile
+++ b/x11-themes/kde-style-comix/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   comix
-# Date created:                        13th March, 2005
-# Whom:                                decept
-#
+# Created by: decept
 # $FreeBSD$
-#
 
 PORTNAME=	comix
 PORTVERSION=	1.3.8
@@ -13,7 +9,7 @@ MASTER_SITES=	http://www.kde-look.org/CONTENT/content-files/
 PKGNAMEPREFIX=	kde-style-
 DISTNAME=	16028-${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	shanjobe@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Flat KDE style and window decoration
 
 USE_BZIP2=	yes
diff --git a/x11-themes/kde-style-lipstik/Makefile b/x11-themes/kde-style-lipstik/Makefile
index e1b90febc3b4..f31264d01779 100644
--- a/x11-themes/kde-style-lipstik/Makefile
+++ b/x11-themes/kde-style-lipstik/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   lipstik
-# Date created:                        12th February, 2005
-# Whom:                                decept
-#
+# Created by: decept
 # $FreeBSD$
-#
 
 PORTNAME=	lipstik
 PORTVERSION=	2.2.3
@@ -13,12 +9,11 @@ MASTER_SITES=	http://www.kde-look.org/CONTENT/content-files/
 PKGNAMEPREFIX=	kde-style-
 DISTNAME=	18223-${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	shanjobe@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Modified Plastik KDE style
 
 USE_KDEBASE_VER=3
 USE_AUTOTOOLS=	libtool
-LDFLAGS+=	${PTHREAD_LIBS}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/x11-themes/kde-style-tiblit/Makefile b/x11-themes/kde-style-tiblit/Makefile
index 6a08b9326f7e..1be689ec7faa 100644
--- a/x11-themes/kde-style-tiblit/Makefile
+++ b/x11-themes/kde-style-tiblit/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   tiblit
-# Date created:                        13th March, 2005
-# Whom:                                decept
-#
+# Created by: decept
 # $FreeBSD$
-#
 
 PORTNAME=	tiblit
 PORTVERSION=	1.2
@@ -19,7 +15,6 @@ COMMENT=	KDE style focused on customization
 USE_BZIP2=	yes
 USE_KDEBASE_VER=3
 USE_AUTOTOOLS=	libtool
-LDFLAGS+=	${PTHREAD_LIBS}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.mk>
diff --git a/x11-themes/kde-windeco-crystal/Makefile b/x11-themes/kde-windeco-crystal/Makefile
index 8d5687ee334f..ba43cc5bb0d4 100644
--- a/x11-themes/kde-windeco-crystal/Makefile
+++ b/x11-themes/kde-windeco-crystal/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   crystal
-# Date created:                        15th March, 2005
-# Whom:                                decept
-#
+# Created by: decept
 # $FreeBSD$
-#
 
 PORTNAME=	crystal
 PORTVERSION=	1.0.7
@@ -13,7 +9,7 @@ MASTER_SITES=	http://www.kde-look.org/CONTENT/content-files/
 PKGNAMEPREFIX=	kde-windeco-
 DISTNAME=	13969-${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	shanjobe@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Transparent KDE window decoration
 
 USE_BZIP2=	yes
diff --git a/x11-themes/kde-windeco-knifty/Makefile b/x11-themes/kde-windeco-knifty/Makefile
index 8851bb902981..3e2460c26d81 100644
--- a/x11-themes/kde-windeco-knifty/Makefile
+++ b/x11-themes/kde-windeco-knifty/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   knifty
-# Date created:                        22nd February, 2005
-# Whom:                                decept
-#
+# Created by: decept
 # $FreeBSD$
-#
 
 PORTNAME=	knifty
 PORTVERSION=	0.4.2
@@ -13,12 +9,11 @@ MASTER_SITES=	http://www.kde-look.org/CONTENT/content-files/
 PKGNAMEPREFIX=	kde-windeco-
 DISTNAME=	8841-${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	shanjobe@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Lightweight KDE window decoration
 
 USE_BZIP2=	yes
 USE_KDEBASE_VER=3
-LDFLAGS+=	${PTHREAD_LIBS}
 USE_AUTOTOOLS=	libtool
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/x11-themes/kde-windeco-neos/Makefile b/x11-themes/kde-windeco-neos/Makefile
index 294a73531737..ecb26a6cf7dd 100644
--- a/x11-themes/kde-windeco-neos/Makefile
+++ b/x11-themes/kde-windeco-neos/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   neos
-# Date created:                        14th March, 2005
-# Whom:                                decept
-#
+# Created by: decept
 # $FreeBSD$
-#
 
 PORTNAME=	neos
 PORTVERSION=	0.2b
@@ -13,7 +9,7 @@ MASTER_SITES=	http://perso.orange.fr/chamayou/
 PKGNAMEPREFIX=	kde-windeco-
 DISTNAME=	kwin-${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	shanjobe@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	KDE window decoration
 
 USE_BZIP2=	yes
diff --git a/x11-themes/kde-windeco-smoothblend/Makefile b/x11-themes/kde-windeco-smoothblend/Makefile
index eb2e4e557b64..51581da9d0f0 100644
--- a/x11-themes/kde-windeco-smoothblend/Makefile
+++ b/x11-themes/kde-windeco-smoothblend/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   smoothblend
-# Date created:                        18th March, 2005
-# Whom:                                decept
-#
+# Created by: decept
 # $FreeBSD$
-#
 
 PORTNAME=	smoothblend
 PORTVERSION=	1.2
@@ -13,7 +9,7 @@ MASTER_SITES=	http://www.p0z3r.org/downloads/
 PKGNAMEPREFIX=	kde-windeco-
 DISTNAME=	smooth-blend-${PORTVERSION}
 
-MAINTAINER=	shanjobe@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A window decoration for KDE
 
 CONFLICTS=	kdeartwork-3.5.[0-9]*
diff --git a/x11-themes/kde4-windeco-nitrogen/Makefile b/x11-themes/kde4-windeco-nitrogen/Makefile
index ac9f287a531a..39e714b6ea85 100644
--- a/x11-themes/kde4-windeco-nitrogen/Makefile
+++ b/x11-themes/kde4-windeco-nitrogen/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   nitrogen
-# Date created:                        29th October, 2009
-# Whom:                                kmoore
-#
+# Created by: kmoore
 # $FreeBSD$
-#
 
 PORTNAME=	nitrogen
 PORTVERSION=	3.3.3
@@ -13,7 +9,7 @@ MASTER_SITES=	http://www.kde-look.org/CONTENT/content-files/
 PKGNAMEPREFIX=	kde4-windeco-
 DISTNAME=	99551-${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}-Source
 
-MAINTAINER=	shanjobe@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	KDE4 window decoration
 
 USE_KDE4=	kdelibs kdehier kdeprefix automoc4 workspace
diff --git a/x11/yakuake-kde4/Makefile b/x11/yakuake-kde4/Makefile
index 7cc37a651159..fd3116b40025 100644
--- a/x11/yakuake-kde4/Makefile
+++ b/x11/yakuake-kde4/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   yakuake
-# Date created:                        7th September, 2008
-# Whom:                                Shane Bell <decept0@gmail.com>
-#
+# Created by: Shane Bell <decept0@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	yakuake
 PORTVERSION=	2.9.8
@@ -13,7 +9,7 @@ MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/src
 PKGNAMESUFFIX=	-kde4
 
-MAINTAINER=	shanjobe@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Drop-down terminal emulator for KDE
 
 LICENSE=	GPLv2
@@ -22,11 +18,13 @@ USE_BZIP2=	yes
 USE_CMAKE=	yes
 USE_KDE4=	kdelibs kdeprefix automoc4
 
-.if defined(WITHOUT_NLS)
-PLIST_SUB+=	NLS="@comment "
-.else
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
 PLIST_SUB+=	NLS=""
 USE_GETTEXT=	yes
+.else
+PLIST_SUB+=	NLS="@comment "
 .endif
 
 USE_QT4=	corelib qmake_build moc_build rcc_build uic_build
@@ -34,10 +32,10 @@ INSTALLS_ICONS=	yes
 MAKE_JOBS_SAFE=	yes
 
 post-patch:
-.if defined(WITHOUT_NLS)
-	@${REINPLACE_CMD} -e 's/^%%NLS%%/# /' ${WRKSRC}/CMakeLists.txt
-.else
+.if ${PORT_OPTIONS:MNLS}
 	@${REINPLACE_CMD} -e 's/^%%NLS%%//' ${WRKSRC}/CMakeLists.txt
+.else
+	@${REINPLACE_CMD} -e 's/^%%NLS%%/# /' ${WRKSRC}/CMakeLists.txt
 .endif
 
 .include <bsd.port.mk>
diff --git a/x11/yakuake/Makefile b/x11/yakuake/Makefile
index 5e91e661bfc6..93a6569f0dc3 100644
--- a/x11/yakuake/Makefile
+++ b/x11/yakuake/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   yakuake
-# Date created:                        1st November, 2005
-# Whom:                                decept
-#
+# Created by: decept
 # $FreeBSD$
-#
 
 PORTNAME=	yakuake
 PORTVERSION=	2.8.1
@@ -11,7 +7,7 @@ PORTREVISION=	8
 CATEGORIES=	x11 kde
 MASTER_SITES=	BERLIOS
 
-MAINTAINER=	shanjobe@gmail.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Quake-style terminal emulator based on KDE's Konsole
 
 USE_AUTOTOOLS=	libtool
@@ -20,6 +16,4 @@ USE_KDEBASE_VER=3
 USE_GMAKE=	yes
 USE_GETTEXT=	yes
 
-LDFLAGS+=	${PTHREAD_LIBS}
-
 .include <bsd.port.mk>