Chase pcre update. Remove library versioning from ports that still mention pcre.1.

While here update to new header format and convert to OptionsNG.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17164 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 63 insertions, 82 deletions

diff --git a/deskutils/gnote/Makefile b/deskutils/gnote/Makefile
index 761e28320..a23e1063b 100644
--- a/deskutils/gnote/Makefile
+++ b/deskutils/gnote/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	gnote
-# Date created:				20 July 2009
-# Whom:					Mezz <mezz@FreeBSD.org>
-#
+# Created by: Mezz <mezz@FreeBSD.org>
 # $FreeBSD$
-#   $MCom$
-#
+#   $MCom: ports/deskutils/gnote/Makefile,v 1.16 2012/06/02 04:10:01 mezz Exp $
 
 PORTNAME=	gnote
 PORTVERSION=	0.8.3
@@ -17,15 +13,14 @@ COMMENT=	A port of Tomboy to C++, note taking application
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	gtkmm-3.0:${PORTSDIR}/x11-toolkits/gtkmm30 \
-		pcre.1:${PORTSDIR}/devel/pcre \
-		boost_filesystem.4:${PORTSDIR}/devel/boost-libs \
-		uuid.1:${PORTSDIR}/misc/e2fsprogs-libuuid
+LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre \
+		boost_filesystem:${PORTSDIR}/devel/boost-libs \
+		uuid:${PORTSDIR}/misc/e2fsprogs-libuuid
 
 USE_GMAKE=	yes
 USE_XZ=		yes
 USE_GNOME=	gnomehack gnomeprefix gtk30 intltool libxml2 libxslt \
-		ltverhack desktopfileutils gnomedocutils
+		ltverhack desktopfileutils gnomedocutils gtkmm30
 USE_GETTEXT=	yes
 GLIB_SCHEMAS=	org.gnome.gnote.gschema.xml
 USE_AUTOTOOLS=	libtool
@@ -38,7 +33,12 @@ CONFIGURE_ARGS=	--with-dbus-service-dir=${PREFIX}/share/dbus-1/services
 DOCS=		AUTHORS ChangeLog NEWS README TODO
 MAN1=		gnote.1
 
-.if !defined(WITHOUT_APPLET)
+OPTIONS_DEFINE=	APPLET
+APPLET_DESC=	Build the gnome3 applet
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MAPPLET}
 USE_GNOME+=	gnomepanel3
 CONFIGURE_ARGS+=--enable-applet
 PLIST_SUB+=	APPLET=""
@@ -55,7 +55,7 @@ post-patch:
 
 post-install:
 	@-update-desktop-database
-.ifndef (NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for i in ${DOCS}
 	@${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index a552ef402..c9f53b527 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	anjuta
-# Date created:				31 March 2001
-# Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
-#
+# Created by: Dmitry Sivachenko <demon@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/anjuta/Makefile,v 1.70 2012/09/01 23:02:09 mezz Exp $
-#
+#   $MCom: ports/devel/anjuta/Makefile,v 1.71 2012/09/03 16:30:19 mezz Exp $
 
 PORTNAME=	anjuta
 PORTVERSION=	2.32.1.1
@@ -19,10 +15,10 @@ COMMENT=	Integrated Development Environment for C and C++
 BUILD_DEPENDS=	autogen:${PORTSDIR}/devel/autogen \
 		bash:${PORTSDIR}/shells/bash \
 		p5-Locale-gettext>=1.05:${PORTSDIR}/devel/p5-Locale-gettext
-LIB_DEPENDS=	pcre.1:${PORTSDIR}/devel/pcre \
-		gladeui-1.10:${PORTSDIR}/devel/glade3 \
-		unique-1.0.2:${PORTSDIR}/x11-toolkits/unique \
-		gdl-1.3:${PORTSDIR}/x11-toolkits/gdl
+LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre \
+		gladeui-1:${PORTSDIR}/devel/glade3 \
+		unique-1.0:${PORTSDIR}/x11-toolkits/unique \
+		gdl-1:${PORTSDIR}/x11-toolkits/gdl
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		autogen:${PORTSDIR}/devel/autogen \
 		${LOCALBASE}/share/autotools:${PORTSDIR}/devel/autotools \
@@ -64,16 +60,17 @@ GCONF_SCHEMAS=	anjuta-build-basic-autotools-plugin.schemas \
 
 MAN1=		anjuta.1 anjuta-launcher.1
 
-OPTIONS=	SVN "Build subversion plugin" off \
-		DEVHELP "Build devhelp plugin" on \
-		GRAPHVIZ "Build inheritance plugin" on
+OPTIONS_DEFINE=	SVN DEVHELP GRAPHVIZ
+OPTIONS_DEFAULT=DEVHELP GRAPHVIZ
+DEVHELP_DESC=	Devhelp support
+GRAPHVIZ_DESC=	inheritance plugin
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
-.if defined(WITH_SVN)
+.if ${PORT_OPTIONS:MSVN}
 BUILD_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
-LIB_DEPENDS+=	apr-1.4:${PORTSDIR}/devel/apr1
-LIB_DEPENDS+=	neon.27:${PORTSDIR}/www/neon29
+LIB_DEPENDS+=	apr-1:${PORTSDIR}/devel/apr1
+LIB_DEPENDS+=	neon:${PORTSDIR}/www/neon29
 RUN_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
 PLIST_SUB+=	SVN=""
 .else
@@ -81,8 +78,8 @@ CONFIGURE_ARGS+=--disable-plugin-subversion
 PLIST_SUB+=	SVN="@comment "
 .endif
 
-.if defined(WITH_DEVHELP)
-LIB_DEPENDS+=	devhelp-2.1:${PORTSDIR}/devel/devhelp
+.if ${PORT_OPTIONS:MDEVHELP}
+LIB_DEPENDS+=	devhelp-2:${PORTSDIR}/devel/devhelp
 PLIST_SUB+=	DEVHELP=""
 .else
 CONFIGURE_ARGS+=--disable-plugin-devhelp
@@ -92,7 +89,7 @@ CONFIGURE_ARGS+=--disable-plugin-devhelp
 PLIST_SUB+=	DEVHELP=""
 .endif
 
-.if defined(WITH_GRAPHVIZ)
+.if ${PORT_OPTIONS:MGRAPHVIZ}
 CONFIGURE_ARGS+=--enable-graphviz
 BUILD_DEPENDS+=	neato:${PORTSDIR}/graphics/graphviz
 RUN_DEPENDS+=	neato:${PORTSDIR}/graphics/graphviz
@@ -113,7 +110,7 @@ post-configure:
 		${WRKSRC}/plugins/symbol-db/symbol-db-prefs.h
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	${MKDIR} ${DOCSDIR}
 .for f in AUTHORS COPYING ChangeLog FUTURE INSTALL NEWS README \
 	doc/ScintillaDoc.html TODO
@@ -122,4 +119,4 @@ post-install:
 .endif
 	@-update-mime-database ${PREFIX}/share/mime
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/anjuta3/Makefile b/devel/anjuta3/Makefile
index 570646b6d..8c9b899a0 100644
--- a/devel/anjuta3/Makefile
+++ b/devel/anjuta3/Makefile
@@ -1,10 +1,6 @@
-# New ports collection makefile for:	anjuta
-# Date created:				31 March 2001
-# Whom:					Dmitry Sivachenko <demon@FreeBSD.org>
-#
+# Created by: Dmitry Sivachenko <demon@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/anjuta/Makefile,v 1.67 2010/11/13 08:07:29 kwm Exp $
-#
+#   $MCom: ports/devel/anjuta3/Makefile,v 1.1 2012/06/16 21:10:00 kwm Exp $
 
 PORTNAME=	anjuta
 PORTVERSION=	3.4.3
@@ -69,12 +65,12 @@ MAN1=		anjuta.1 anjuta-launcher.1
 
 OPTIONS_DEFINE=	SVN DEVHELP GRAPHVIZ VALA
 OPTIONS_DEFAULT=DEVHELP GRAPHVIZ
-SVN_DESC=	Build subversion plugin
-DEVHELP_DESC=	Build devhelp plugin
-GRAPHVIZ_DESC=	Build inheritance plugin
-VALA_DESC=	Build vala support
+SVN_DESC=	Subversion plugin
+DEVHELP_DESC=	Devhelp plugin
+GRAPHVIZ_DESC=	Inheritance plugin
+VALA_DESC=	Vala support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MSVN}
 BUILD_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
@@ -126,12 +122,5 @@ post-patch:
 
 post-install:
 	@update-mime-database ${PREFIX}/share/mime
-#.if !defined(NOPORTDOCS)
-#	${MKDIR} ${DOCSDIR}
-#.for f in AUTHORS COPYING ChangeLog FUTURE INSTALL NEWS README \
-#	doc/ScintillaDoc.html TODO
-#	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
-#.endfor
-#.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/goffice/Makefile b/devel/goffice/Makefile
index 6e8b213d6..57086e7a1 100644
--- a/devel/goffice/Makefile
+++ b/devel/goffice/Makefile
@@ -1,9 +1,6 @@
-# New ports collection makefile for:	goffice
-# Date created:				07 June 2005
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/goffice/Makefile,v 1.37 2012/06/04 19:04:16 kwm Exp $
+#   $MCom: ports/devel/goffice/Makefile,v 1.38 2012/09/03 16:30:19 mezz Exp $
 #
 # !!! When updating goffice, don't forget to update pkg-plist in:
 #     math/gnumeric science/gchemutils
@@ -20,8 +17,6 @@ COMMENT=	GLib/GTK+ set of document centric objects and utilities
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	pcre.1:${PORTSDIR}/devel/pcre
-
 USE_XZ=		yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gtk20 libgsf ltverhack
@@ -35,7 +30,12 @@ PLIST_SUB=	VERSION=${PORTVERSION} \
 
 MAKE_JOBS_SAFE=	yes
 
-.if !defined(WITHOUT_GCONF)
+OPTIONS_DEFINE=	GCONF
+OPTIONS_DEAFULT=GCONF
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGCONF}
 USE_GNOME+=	gconf2
 .else
 CONFIGURE_ARGS+=--with-config-backend=keyfile
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index 2d82a0b3f..086635814 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,10 +1,6 @@
-# Ports collection Makefile for:	epiphany-extensions
-# Date created:				30 December 2003
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/www/epiphany-extensions/Makefile,v 1.138 2012/08/17 19:06:47 kwm Exp $
-#
+#   $MCom: ports/www/epiphany-extensions/Makefile,v 1.139 2012/09/01 23:02:13 mezz Exp $
 
 PORTNAME=	epiphany-extensions
 PORTVERSION=	2.30.2
@@ -17,8 +13,8 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A set of add-ons for the Epiphany web browser
 
 BUILD_DEPENDS=	epiphany:${PORTSDIR}/www/epiphany
-LIB_DEPENDS=	pcre.1:${PORTSDIR}/devel/pcre \
-		webkitgtk-1.0.0:${PORTSDIR}/www/webkit-gtk2
+LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre \
+		webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2
 RUN_DEPENDS=	epiphany:${PORTSDIR}/www/epiphany
 
 CONFLICTS=	epiphany-extensions-3.[0-9]*
@@ -37,11 +33,12 @@ EPHY_VERSION=	${PORTVERSION:R}
 
 PLIST_SUB=	VERSION=${EPHY_VERSION} EPHY_VERSION=${EPHY_VERSION}
 
-OPTIONS=	OPENSP "Enable OpenSP SGML support" off
+OPTIONS_DEFINE=	OPENSP
+OPENSP_DESC=	OpenSP SGML support
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.optioins.mk>
 
-.if defined(WITH_OPENSP)
+.if ${PORT_OPTIONS:MOPENSP}
 CONFIGURE_ARGS+=	--enable-opensp=yes
 LIB_DEPENDS+=		osp.5:${PORTSDIR}/textproc/opensp
 .else
@@ -56,4 +53,4 @@ post-patch:
 		-e 's|EPIPHANY_API_VERSION=2.29|EPIPHANY_API_VERSION=2.30|g' \
 		${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/epiphany-extensions3/Makefile b/www/epiphany-extensions3/Makefile
index 6ecb6ae34..e1be31a19 100644
--- a/www/epiphany-extensions3/Makefile
+++ b/www/epiphany-extensions3/Makefile
@@ -1,15 +1,12 @@
-# Ports collection Makefile for:	epiphany-extensions
-# Date created:				30 December 2003
-# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/www/epiphany-extensions3/Makefile,v 1.7 2012/05/31 11:55:35 mezz Exp $
-#
+#   $MCom: ports/www/epiphany-extensions3/Makefile,v 1.8 2012/08/04 10:39:35 kwm Exp $
 
 PORTNAME=	epiphany-extensions
 PORTVERSION=	3.4.0
 CATEGORIES=	www gnome
 MASTER_SITES=	GNOME
+PKGNAMESUFFIX=	3
 DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -40,11 +37,12 @@ EPHY_VERSION=	${PORTVERSION:R}
 
 PLIST_SUB=	VERSION=${EPHY_VERSION} EPHY_VERSION=3.4
 
-OPTIONS=	OPENSP "Enable OpenSP SGML support" off
+OPTIONS_DEFINE=	OPENSP
+OPENSP_DESC=	OpenSP SGML support
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_OPENSP)
+.if ${PORT_OPTIONS:MOPENSP}
 CONFIGURE_ARGS+=	--enable-opensp=yes
 LIB_DEPENDS+=		osp:${PORTSDIR}/textproc/opensp
 .else