- Trim Makefile headers

- Drop ABI versions from LIB_DEPENDS
- OptionsNG
- Pet portlint
- Switch to dynamic plist where useful

10 files changed, 30 insertions, 55 deletions

diff --git a/devel/gitg/Makefile b/devel/gitg/Makefile
index 151136fd0990..5f75ff23923c 100644
--- a/devel/gitg/Makefile
+++ b/devel/gitg/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	gitg
-# Date created:		2010-03-19
-# Whom:			kipz <somicide@gmail.com>
-#
+# Created by: kipz <somicide@gmail.com>
 # $FreeBSD$
-#
 
 PORTNAME=	gitg
 PORTVERSION=	0.0.8
@@ -14,11 +10,11 @@ MASTER_SITES=	GNOME
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	GTK-based git repository viewer
 
-RUN_DEPENDS=	git>=1.7.0.2:${PORTSDIR}/devel/git
-
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+RUN_DEPENDS=	git>=1.7.0.2:${PORTSDIR}/devel/git
+
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/devel/gitg/pkg-descr b/devel/gitg/pkg-descr
index 221dbdace9ff..0f1aca70f7cb 100644
--- a/devel/gitg/pkg-descr
+++ b/devel/gitg/pkg-descr
@@ -6,4 +6,4 @@ representation of data and actions. It can:
  * Show colorized diff of changes in revisions
  * Handles extremely large projects very well
 
-WWW:	http://trac.novowork.com/gitg/wiki
+WWW: http://trac.novowork.com/gitg/wiki
diff --git a/devel/love/Makefile b/devel/love/Makefile
index bfbab751f45e..a6610eb35ffd 100644
--- a/devel/love/Makefile
+++ b/devel/love/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	love
-# Date created:		01 Aug 2008
-# Whom:			Dmitry Marakasov <amdmi3@FreeBSD.org>
-#
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	love
 PORTVERSION=	0.8.0
@@ -40,11 +36,13 @@ PLIST_FILES=	bin/love
 
 PORTDOCS=	*
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^prefix=/ d; /^bindir=/ d; /^libdir=/ d; \
 		/test/ s|==|=|' ${WRKSRC}/configure
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	${MKDIR} ${DOCSDIR}
 .for f in changes.txt readme.md
diff --git a/devel/love07/Makefile b/devel/love07/Makefile
index 878d86e36397..2d77f1bbeff2 100644
--- a/devel/love07/Makefile
+++ b/devel/love07/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	love
-# Date created:		01 Aug 2008
-# Whom:			Dmitry Marakasov <amdmi3@FreeBSD.org>
-#
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	love
 PORTVERSION=	0.7.2
@@ -46,11 +42,13 @@ PLIST_FILES=	bin/love07
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}07
 PORTDOCS=	*
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e '/^prefix=/ d; /^bindir=/ d; /^libdir=/ d' \
 		${WRKSRC}/configure
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	${MKDIR} ${DOCSDIR}
 .for f in changes.txt readme.txt
diff --git a/devel/love5/Makefile b/devel/love5/Makefile
index 9906c853ce33..156f42e8d23c 100644
--- a/devel/love5/Makefile
+++ b/devel/love5/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	love
-# Date created:		01 Aug 2008
-# Whom:			Dmitry Marakasov <amdmi3@FreeBSD.org>
-#
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	love
 DISTVERSION=	0.5-0
@@ -37,13 +33,15 @@ PLIST_FILES=	bin/love5
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}5
 PORTDOCS=	*
 
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|ILvoid|void|' ${WRKSRC}/src/opengl/Image.cpp \
 		${WRKSRC}/src/opengl/love_opengl.cpp
 	@${REINPLACE_CMD} -e '/^prefix=/ d; /^bindir=/ d; /^libdir=/ d' \
 		${WRKSRC}/configure
 
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 post-install:
 	${MKDIR} ${DOCSDIR}
 .for f in changes.txt readme.txt
diff --git a/devel/p5-Tree-R/Makefile b/devel/p5-Tree-R/Makefile
index 9888c63da573..c6ee118671b3 100644
--- a/devel/p5-Tree-R/Makefile
+++ b/devel/p5-Tree-R/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Tree-R
-# Date created:		03 Mar 2011
-# Whom:			Dmitry Marakasov <amdmi3@FreeBSD.org>
-#
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Tree-R
 PORTVERSION=	0.06
diff --git a/devel/p5-Tree-R/pkg-descr b/devel/p5-Tree-R/pkg-descr
index 91c2e36deee3..13019f3abfd5 100644
--- a/devel/p5-Tree-R/pkg-descr
+++ b/devel/p5-Tree-R/pkg-descr
@@ -1,3 +1,3 @@
 Tree::R - Perl extension for the Rtree data structure and algorithms
 
-WWW:	http://search.cpan.org/dist/Tree-R/
+WWW: http://search.cpan.org/dist/Tree-R/
diff --git a/devel/p5-WeakRef/Makefile b/devel/p5-WeakRef/Makefile
index 9e2d770e71eb..f3b71f64e463 100644
--- a/devel/p5-WeakRef/Makefile
+++ b/devel/p5-WeakRef/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-WeakRef
-# Date created:		14 Jun 2006
-# Whom:			Dmitry Marakasov <amdmi3@amdmi3.ru>
-#
+# Created by: Dmitry Marakasov <amdmi3@amdmi3.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	WeakRef
 PORTVERSION=	0.01
diff --git a/devel/sfml/Makefile b/devel/sfml/Makefile
index 42f1633c9ef6..83aebf00c602 100644
--- a/devel/sfml/Makefile
+++ b/devel/sfml/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	sfml
-# Date created:		07 Jul 2009
-# Whom:			Dmitry Marakasov <amdmi3@FreeBSD.org>
-#
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	sfml
 PORTVERSION=	1.6
@@ -15,10 +11,10 @@ DISTNAME=	SFML-${PORTVERSION}-sdk-linux-32
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Simple and Fast Multimedia Library
 
-LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile \
-		jpeg.11:${PORTSDIR}/graphics/jpeg \
+LIB_DEPENDS=	sndfile:${PORTSDIR}/audio/libsndfile \
+		jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png \
-		freetype.9:${PORTSDIR}/print/freetype2
+		freetype:${PORTSDIR}/print/freetype2
 
 USE_GMAKE=	yes
 USE_OPENAL=	al
@@ -34,6 +30,8 @@ PORTDOCS=	*
 
 PORTSCOUT=	limit:[^c]$$
 
+.include <bsd.port.options.mk>
+
 post-extract:
 	@${RM} -f ${WRKSRC}/lib/*
 	@${FIND} ${WRKSRC}/samples/bin/ -type f -maxdepth 1 -delete
@@ -42,7 +40,7 @@ post-install:
 .for lib in audio graphics network system window
 	@${LN} -s libsfml-${lib}.so.${PORTVERSION} ${PREFIX}/lib/libsfml-${lib}.so.${PORTVERSION:C/^([0-9]).*/\1/}
 .endfor
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} "*" ${DOCSDIR}/
 .endif
diff --git a/devel/tokamak/Makefile b/devel/tokamak/Makefile
index 3602079ffb77..468ddfca79d7 100644
--- a/devel/tokamak/Makefile
+++ b/devel/tokamak/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tokamak
-# Date created:		24 Jun 2008
-# Whom:			Dmitry Marakasov <amdmi3@FreeBSD.org>
-#
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	tokamak
 PORTVERSION=	1.0.5a
@@ -26,7 +22,7 @@ BUILD_WRKSRC=	${WRKSRC}/build/gnu
 
 PORTDOCS=	*
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if !defined(WITH_DEBUG)
 CPPFLAGS+=	-DNDEBUG
@@ -43,11 +39,10 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/tokamak.h ${PREFIX}/include/
 	${INSTALL_DATA} ${WRKSRC}/include/math/*.h ${PREFIX}/include/math/
 	${INSTALL_DATA} ${WRKSRC}/lib/libtokamak_m.a ${PREFIX}/lib/
-
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/license.txt ${WRKSRC}/readme.txt ${DOCSDIR}
 	cd ${WRKSRC}/documentation && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>