new-style LIB_DEPENDS/REVISION/WANTLIB

avsm · Nov 11, 2010 · f726de3 · f726de3
1 parent d2c0a35
commit f726de3
Show file tree

Hide file tree

Showing 124 changed files with 473 additions and 369 deletions.
diff --git a/www/amaya/browser/Makefile b/www/amaya/browser/Makefile
@@ -1,34 +1,35 @@
-# $OpenBSD: Makefile,v 1.23 2010/10/24 21:40:09 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.24 2010/11/11 12:35:09 sthen Exp $
 #
 # Many variables moved to ../Makefile.inc
 
 COMMENT=		test-bed browser/authoring tool of the W3C
 
 AMAYA_VERSION=		5.1
 DISTNAME=		amaya-src-${AMAYA_VERSION}
-PKGNAME=		amaya-${AMAYA_VERSION}p6
+PKGNAME=		amaya-${AMAYA_VERSION}
+REVISION=		6
 
 HOMEPAGE=		http://www.w3.org/Amaya/
 
 FLAVORS=		motif gtk
 FLAVOR?=		motif
 
-WANTLIB=		ICE SM X11 Xext Xt c expat m pthread-stubs xcb z
-
+WANTLIB += ICE SM X11 Xext Xt c expat m pthread-stubs xcb z
 
 .if ${FLAVOR:L} == "gtk"
 
 CONFIGURE_ARGS+=	--with-gtk=${LOCALBASE}
 # I'm too lazy to write a proper imlib autoconf test.
-LIB_DEPENDS+=		gdk_imlib.>=19::graphics/imlib
+LIB_DEPENDS+=		::graphics/imlib
 
-WANTLIB+=		Xi gdk gif glib gmodule gtk iconv intl jpeg png tiff
+WANTLIB += Xi gdk gif glib gmodule gtk iconv intl jpeg png tiff gdk_imlib.>=19
 
 .elif ${FLAVOR:L} == "motif"
 
 USE_MOTIF=		any
-LIB_DEPENDS+=		jpeg.>=62::graphics/jpeg \
-			png.>=2::graphics/png 
+WANTLIB += jpeg png
+LIB_DEPENDS+=		::graphics/jpeg \
+			::graphics/png 
 CONFIGURE_ARGS+=	--without-gtk \
 			--with-motif-includes=${LOCALBASE}/include \
 			--with-motif-libraries=${LOCALBASE}/lib

diff --git a/www/analog/Makefile b/www/analog/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.51 2009/03/23 20:09:51 naddy Exp $
+# $OpenBSD: Makefile,v 1.52 2010/11/11 12:35:09 sthen Exp $
 
 COMMENT=	extremely fast program for analysing WWW logfiles
 
 DISTNAME=	analog-6.0
-PKGNAME=	${DISTNAME}p1
+REVISION=	1
 CATEGORIES=	www
 
 MASTER_SITES=	http://www.analog.cx/ \
@@ -26,9 +26,10 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-LIB_DEPENDS=	gd.>=18::graphics/gd \
-		pcre::devel/pcre
-WANTLIB=	c m jpeg png z
+WANTLIB += c m jpeg png z gd.>=18 pcre
+
+LIB_DEPENDS=	::graphics/gd \
+		::devel/pcre
 
 MODULES=	converters/libiconv
 

diff --git a/www/ap2-mod_fcgid/Makefile b/www/ap2-mod_fcgid/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.3 2008/10/27 11:34:00 pirofti Exp $
+# $OpenBSD: Makefile,v 1.4 2010/11/11 12:35:09 sthen Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT=		binary compatible alternative to Apache mod_fastcgi
 DISTNAME=		mod_fcgid.2.2
-PKGNAME=		ap2-mod_fcgid-2.2p1
+PKGNAME=		ap2-mod_fcgid-2.2
+REVISION=		1
 
 CATEGORIES=		www
 

diff --git a/www/ap2-mod_perl/Makefile b/www/ap2-mod_perl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2010/10/19 08:02:53 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2010/11/11 12:35:09 sthen Exp $
 
 COMMENT=	module that embeds a Perl interpreter into Apache2
 
@@ -7,7 +7,7 @@ PKGNAME=	ap2-${DISTNAME}
 REVISION=	3
 CATEGORIES=	www net
 
-WANTLIB=	c m perl util db expat
+WANTLIB=	c m perl util db expat apr-1 aprutil-1
 MODULES=	cpan converters/libiconv
 MASTER_SITES=	http://perl.apache.org/dist/ \
 		${MASTER_SITE_PERL_CPAN:=Apache/}
@@ -23,9 +23,9 @@ PERMIT_DISTFILES_FTP=	Yes
 SHARED_ONLY=		Yes
 
 CONFIGURE_ARGS+=	MP_APXS=${LOCALBASE}/sbin/apxs2
-USE_GROFF =	Yes
-LIB_DEPENDS=		apr-1::devel/apr \
-			aprutil-1::devel/apr-util
+USE_GROFF =		Yes
+LIB_DEPENDS=		::devel/apr \
+			::devel/apr-util
 RUN_DEPENDS=		::www/apache-httpd
 BUILD_DEPENDS=		${RUN_DEPENDS} \
 			:p5-Apache-Test->=1.29:www/p5-Apache-Test

diff --git a/www/apache-httpd/Makefile b/www/apache-httpd/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.24 2010/10/19 08:02:53 espie Exp $
+# $OpenBSD: Makefile,v 1.25 2010/11/11 12:35:09 sthen Exp $
 
 COMMENT=	apache HTTP server
 
@@ -20,20 +20,20 @@ SHARED_ONLY=		Yes
 USE_GROFF =	Yes
 NO_REGRESS=		Yes
 
-WANTLIB=		c crypto m ssl expat apr-1-mt db.>=4 z pthread
+WANTLIB += c crypto m ssl expat apr-1-mt db.>=4 z pcre pthread aprutil-1-mt.>=2
 
-LIB_DEPENDS=		pcre::devel/pcre
+LIB_DEPENDS=		::devel/pcre
 
 FLAVORS=		ldap
 FLAVOR?=
 
 .if ${FLAVOR:L:Mldap}
 CONFIGURE_ARGS+=	--with-ldap --enable-ldap --enable-authnz-ldap
-WANTLIB+=		asn1 com_err gssapi krb5 sasl2
-LIB_DEPENDS+=		ldap,lber::databases/openldap
-LIB_DEPENDS+=		aprutil-1-mt.>=2:apr-util-mt-*-ldap:devel/apr-util,ldap,mt
+WANTLIB+=		asn1 com_err gssapi krb5 sasl2 ldap lber
+LIB_DEPENDS+=		::databases/openldap
+LIB_DEPENDS+=		:apr-util-mt-*-ldap:devel/apr-util,ldap,mt
 .else
-LIB_DEPENDS+=		aprutil-1-mt.>=2:apr-util-mt-*-!ldap:devel/apr-util,mt
+LIB_DEPENDS+=		:apr-util-mt-*-!ldap:devel/apr-util,mt
 .endif
 
 MODULES=		converters/libiconv

diff --git a/www/august/Makefile b/www/august/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.18 2009/03/14 21:09:40 sthen Exp $
+# $OpenBSD: Makefile,v 1.19 2010/11/11 12:35:09 sthen Exp $
 
 COMMENT=	html editor designed for the experienced web designer
 
 DISTNAME=	august0.63b.src
-PKGNAME=	august-0.63bp0
+PKGNAME=	august-0.63b
+REVISION=	0
 CATEGORIES=	www
 
 HOMEPAGE=	http://www.bostream.nu/johanb/august/

diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.59 2010/10/24 21:40:09 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.60 2010/11/11 12:35:09 sthen Exp $
 
 COMMENT=	HTML editor for experienced web designers
 
@@ -22,15 +22,16 @@ WANTLIB += expat fontconfig freetype gconf-2 gio-2.0 glib-2.0 gdk_pixbuf-2.0
 WANTLIB += gmodule-2.0 gnome-2 gnome-keyring gnomecanvas-2
 WANTLIB += gnomevfs-2 gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0
 WANTLIB += pangoft2-1.0 pixman-1 png popt pthread pthread-stubs xcb xml2 z
+WANTLIB += gailutil gtk-x11-2.0.>=0.14 gdk-x11-2.0.>=0.14 pcre gnomeui-2
 
 MODULES=	devel/gettext
 
 RUN_DEPENDS=	:desktop-file-utils-*:devel/desktop-file-utils \
 		:shared-mime-info-*:misc/shared-mime-info
 BUILD_DEPENDS=	::misc/shared-mime-info
-LIB_DEPENDS=	gailutil,gtk-x11-2.0.>=0.14,gdk-x11-2.0.>=0.14::x11/gtk+2 \
-		pcre::devel/pcre \
-		gnomeui-2::x11/gnome/libgnomeui
+LIB_DEPENDS=	::x11/gtk+2 \
+		::devel/pcre \
+		::x11/gnome/libgnomeui
 
 CONFIGURE_STYLE=gnu
 CONFIGURE_ARGS=	--with-freedesktop_org-menu='${PREFIX}/share/applications/' \

diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.14 2008/01/04 17:48:37 espie Exp $
+# $OpenBSD: Makefile,v 1.15 2010/11/11 12:35:09 sthen Exp $
 
 COMMENT=	c++ compliant CGI applications libraries
 
 DISTNAME=	cgicc-3.2.1
-PKGNAME=	${DISTNAME}p2
+REVISION=	2
 CATEGORIES=     www devel
 SHARED_LIBS=	cgicc	5.0
 MODGNU_SHARED_LIBS=cgicc ''

diff --git a/www/cgiparse/Makefile b/www/cgiparse/Makefile
@@ -1,11 +1,11 @@
-# $OpenBSD: Makefile,v 1.31 2010/10/19 08:02:53 espie Exp $
+# $OpenBSD: Makefile,v 1.32 2010/11/11 12:35:09 sthen Exp $
 
 BROKEN-alpha=	Alpha architecture not yet supported
 
 COMMENT=	C library to parse CGI Forms
 
 DISTNAME=	cgiparse-0.9b
-PKGNAME=	${DISTNAME}p0
+REVISION=	0
 CATEGORIES=	www
 SHARED_LIBS=	cgiparse	1.0
 

diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.16 2010/10/19 08:02:53 espie Exp $
+# $OpenBSD: Makefile,v 1.17 2010/11/11 12:35:09 sthen Exp $
 
 SHARED_ONLY=	Yes
 
@@ -47,27 +47,27 @@ MODULES =	lang/python
 BUILD_DEPENDS =	::textproc/py-docutils \
 		::www/php5/core,-fastcgi
 
-LIB_DEPENDS-main =	pcre::devel/pcre
-WANTLIB-main =		c crypto pthread ssl
+LIB_DEPENDS-main =	::devel/pcre
+WANTLIB-main =		c crypto pcre pthread ssl
 RUN_DEPENDS-main =	${RUN_DEPENDS} \
 			::www/spawn-fcgi \
 			::net/rrdtool
 
-LIB_DEPENDS-geoip =	GeoIP.>=6::net/GeoIP
-WANTLIB-geoip =		crypto
+LIB_DEPENDS-geoip =	::net/GeoIP
+WANTLIB-geoip =		crypto GeoIP.>=6
 RUN_DEPENDS-geoip =	::${BASE_PKGPATH}
 
-LIB_DEPENDS-ldap =	lber.>=9,ldap::databases/openldap
-WANTLIB-ldap =		asn1 com_err crypto gssapi krb5 sasl2 ssl
+LIB_DEPENDS-ldap =	::databases/openldap
+WANTLIB-ldap =		asn1 com_err crypto gssapi krb5 lber.>=9 ldap sasl2 ssl
 RUN_DEPENDS-ldap =	::${BASE_PKGPATH}
 
-LIB_DEPENDS-mysql =	mysqlclient.>=19::databases/mysql
-WANTLIB-mysql =		crypto m ssl z
+LIB_DEPENDS-mysql =	::databases/mysql
+WANTLIB-mysql =		crypto m mysqlclient.>=19 ssl z
 RUN_DEPENDS-mysql =	::${BASE_PKGPATH}
 
-LIB_DEPENDS-streaming =	avutil.>=6,avcodec.>=13,avformat.>=12::graphics/ffmpeg \
-			bz2::archivers/bzip2
-WANTLIB-streaming =	crypto m
+LIB_DEPENDS-streaming =	::graphics/ffmpeg \
+			::archivers/bzip2
+WANTLIB-streaming =	avcodec.>=13 avformat.>=12 avutil.>=6 bz2 crypto m
 RUN_DEPENDS-streaming = ::${BASE_PKGPATH}
 
 USE_LIBTOOL =	Yes

diff --git a/www/cntlm/Makefile b/www/cntlm/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.3 2010/10/19 08:02:53 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2010/11/11 12:35:09 sthen Exp $
 
 COMMENT =		fast NTLM/NTLMv2 authenticating HTTP proxy
 DISTNAME =		cntlm-0.35.1
-PKGNAME =		${DISTNAME}p0
+REVISION =		0
 CATEGORIES =		www
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=cntlm/}
 HOMEPAGE =		http://cntlm.sourceforge.net/

diff --git a/www/cronolog/Makefile b/www/cronolog/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2010/10/19 08:02:53 espie Exp $
+# $OpenBSD: Makefile,v 1.7 2010/11/11 12:35:09 sthen Exp $
 
 COMMENT=	web log rotation program
 
 DISTNAME=	cronolog-1.6.2
-PKGNAME=	${DISTNAME}p0
+REVISION=	0
 CATEGORIES=	www
 MASTER_SITES=	http://www.cronolog.org/download/
 

diff --git a/www/dansguardian/Makefile b/www/dansguardian/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.10 2010/10/19 08:02:53 espie Exp $
+# $OpenBSD: Makefile,v 1.11 2010/11/11 12:35:09 sthen Exp $
 
 COMMENT =	content scanning web filter
 DISTNAME =	dansguardian-2.10.1.1
@@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB =		c m stdc++ z
+WANTLIB =		c execinfo m pcre pcreposix stdc++ z
 
 # This is deliberately not downloaded directly from the author's
 # master site, since although it is GPL code, the author only
@@ -23,8 +23,8 @@ WANTLIB =		c m stdc++ z
 MASTER_SITES =		http://spacehopper.org/mirrors/
 #MASTER_SITES =		http://dansguardian.org/downloads/2/Stable/
 
-LIB_DEPENDS =		pcre.>=1,pcreposix.>=1::devel/pcre \
-			execinfo::devel/libexecinfo
+LIB_DEPENDS =		::devel/pcre \
+			::devel/libexecinfo
 
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \

diff --git a/www/dillo/Makefile b/www/dillo/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.35 2010/10/24 21:40:09 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.36 2010/11/11 12:35:09 sthen Exp $
 
 COMMENT =		fast and light graphical web browser
 
@@ -15,8 +15,9 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB =	X11 Xcursor Xext Xft Xi Xinerama Xrender c crypto fontconfig \
-		m pthread pthread-stubs ssl stdc++ xcb z
+WANTLIB += X11 Xcursor Xext Xft Xi Xinerama Xrender c crypto fontconfig
+WANTLIB += m pthread pthread-stubs ssl stdc++ xcb z
+WANTLIB += jpeg.>=62 png.>=2
 
 MODULES =	converters/libiconv
 
@@ -25,8 +26,8 @@ MASTER_SITES =	${HOMEPAGE}download/
 EXTRACT_SUFX =	.tar.bz2
 
 BUILD_DEPENDS =	::x11/fltk2
-LIB_DEPENDS =	jpeg.>=62::graphics/jpeg \
-		png.>=2::graphics/png
+LIB_DEPENDS =	::graphics/jpeg \
+		::graphics/png
 # XXX dillo should be patched to use ftp(1)
 RUN_DEPENDS =	::net/wget
 

diff --git a/www/drupal6/FCKeditor/Makefile b/www/drupal6/FCKeditor/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.8 2010/04/15 14:29:17 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.9 2010/11/11 12:35:09 sthen Exp $
 
 COMMENT =	FCKeditor for drupal
 
 DISTNAME = 	fckeditor-6.x-2.1
-PKGNAME =	drupal6-fckeditor-2.1p0
+PKGNAME =	drupal6-fckeditor-2.1
+REVISION =	0
 DISTFILES =	${DISTNAME}.tar.gz \
 		FCKeditor_2.6.6.tar.gz:0
 EXTRACT_ONLY =	${DISTNAME}.tar.gz

diff --git a/www/drupal6/ldap_integration/Makefile b/www/drupal6/ldap_integration/Makefile
@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.2 2010/04/19 14:15:01 stephan Exp $
+# $OpenBSD: Makefile,v 1.3 2010/11/11 12:35:09 sthen Exp $
 
 COMMENT =	authenticate against LDAP
 
 MAINTAINER =	Stephan A. Rickauer <[email protected]>
 
 DISTNAME = 	ldap_integration-6.x-1.0-beta2
-PKGNAME =	drupal6-ldap_integration-1.0beta2p0
+PKGNAME =	drupal6-ldap_integration-1.0beta2
+REVISION =	0
 
 .include <bsd.port.mk>
diff --git a/www/drupal6/locale-fr/Makefile b/www/drupal6/locale-fr/Makefile
@@ -1,11 +1,12 @@
-# $OpenBSD: Makefile,v 1.4 2009/07/27 12:39:05 espie Exp $
+# $OpenBSD: Makefile,v 1.5 2010/11/11 12:35:09 sthen Exp $
 
 COMMENT =	french translation
 LANG =		fr
 EXTRACT_ONLY =
 
 DISTNAME =	${LANG}-6.x-1.0
-PKGNAME =	drupal6-${LANG}-1.0p2
+PKGNAME =	drupal6-${LANG}-1.0
+REVISION =	2
 
 post-extract:
 	mkdir -p ${WRKDIST}

diff --git a/www/drupal6/locale-it/Makefile b/www/drupal6/locale-it/Makefile
@@ -1,11 +1,12 @@
-# $OpenBSD: Makefile,v 1.3 2009/07/26 12:20:08 espie Exp $
+# $OpenBSD: Makefile,v 1.4 2010/11/11 12:35:09 sthen Exp $
 
 COMMENT =	italian translation
 LANG =		it
 EXTRACT_ONLY =
 
 DISTNAME =	${LANG}-6.x-1.4
-PKGNAME =	drupal6-${LANG}-1.4p1
+PKGNAME =	drupal6-${LANG}-1.4
+REVISION =	1
 
 post-extract:
 	mkdir -p ${WRKDIST}