convert some of my ports to the new LIB_DEPENDS and REVISION conventi…

…ons. OK sthen@
avsm · Jul 21, 2010 · 48ce720 · 48ce720
1 parent 5812144
commit 48ce720
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 43 deletions.
diff --git a/editors/texworks/Makefile b/editors/texworks/Makefile
@@ -1,8 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2009/10/13 14:36:26 edd Exp $
+# $OpenBSD: Makefile,v 1.7 2010/07/21 21:14:47 edd Exp $
 
 COMMENT =		easy to use LaTeX and ConTeXt editor
 
 DISTNAME =		texworks-0.2.3
+REVISION = 		0
 CATEGORIES =		editors print
 HOMEPAGE =		http://www.tug.org/texworks/
 MAINTAINER =		Edd Barrett <[email protected]>
@@ -13,18 +14,16 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-WANTLIB += ICE SM X11 Xext Xi Xinerama Xrender c expat fontconfig
-WANTLIB += freetype glib-2.0 gobject-2.0 gthread-2.0 m png poppler
-WANTLIB += pthread stdc++ z
+WANTLIB +=		QtDBus QtGui QtXml c dbus-1 hunspell-1.2 m poppler \
+			poppler-qt4 pthread stdc++ z
 
 MASTER_SITES =		http://texworks.googlecode.com/files/
 
-MODULES =		x11/qt4 \
-			devel/gettext
-LIB_DEPENDS =		hunspell-1.2::textproc/hunspell \
-			dbus-1::x11/dbus \
-			poppler-qt4::print/poppler,-qt4 \
-			QtDBus,QtGui,QtXml::x11/qt4
+MODULES =		x11/qt4
+LIB_DEPENDS =		::textproc/hunspell \
+			::x11/dbus \
+			::print/poppler,-qt4 \
+			::x11/qt4
 RUN_DEPENDS = 		:texlive_base-*:print/texlive/base
 
 USE_X11 =		Yes

diff --git a/net/flickcurl/Makefile b/net/flickcurl/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.5 2010/07/12 22:07:38 sthen Exp $
+# $OpenBSD: Makefile,v 1.6 2010/07/21 21:14:47 edd Exp $
 
 COMMENT =		flickr API library and utility
 
@@ -19,16 +19,17 @@ PERMIT_DISTFILES_FTP =	Yes
 
 MODULES =		devel/gettext
 
-WANTLIB =		c crypto m ssl xslt z
+WANTLIB =		c crypto curl.>=10 idn.>=16 m raptor.>=2 ssl \
+			xml2.>=9 xslt z
 
 MASTER_SITES =		http://download.dajobe.org/flickcurl/
 
 USE_LIBTOOL =		Yes
 
-LIB_DEPENDS =		curl.>=10::net/curl \
-			idn.>=16::devel/libidn \
-			xml2.>=9::textproc/libxml,-main \
-			raptor.>=2::textproc/raptor
+LIB_DEPENDS =		::net/curl \
+			::devel/libidn \
+			::textproc/libxml,-main \
+			::textproc/raptor
 
 CONFIGURE_STYLE =	gnu
 CONFIGURE_ARGS = 	${CONFIGURE_SHARED} --with-raptor

diff --git a/textproc/hunspell/Makefile b/textproc/hunspell/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.2 2009/10/11 14:06:20 edd Exp $
+# $OpenBSD: Makefile,v 1.3 2010/07/21 21:14:47 edd Exp $
 
 COMMENT =	spelling, stemming, morphological analysis and generation
 
 DISTNAME =	hunspell-1.2.8
-PKGNAME = 	${DISTNAME}p0
+REVISION =	0
 
 SHARED_LIBS =	hunspell-1.2 	0.0 #	.0.0
 

diff --git a/www/elinks/Makefile b/www/elinks/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.21 2010/06/13 11:42:31 edd Exp $
+# $OpenBSD: Makefile,v 1.22 2010/07/21 21:14:47 edd Exp $
 
 COMMENT=		full-featured text WWW browser
 DISTNAME=		elinks-0.11.7
-PKGNAME=		${DISTNAME}p4
+REVISION=		4
 CATEGORIES=		www
 MASTER_SITES=		http://elinks.cz/download/
 
@@ -29,13 +29,13 @@ CONFIGURE_ARGS+=	--with-bzlib \
 
 # don't hide compiler command lines
 MAKE_ENV=		V=true
-LIB_DEPENDS+=		bz2::archivers/bzip2 \
-			idn::devel/libidn
+LIB_DEPENDS+=		::archivers/bzip2 \
+			::devel/libidn
 
 USE_GMAKE=		Yes
 
 RUN_DEPENDS=		::devel/gettext
-WANTLIB=		crypto c z ssl
+WANTLIB=		bz2 crypto c idn ssl z
 MODULES=		converters/libiconv
 
 FLAVORS=		lua no_x11 js
@@ -44,8 +44,8 @@ FLAVOR?=
 .if ${FLAVOR:L:Mlua}
 BROKEN=			has this ever worked?
 CONFIGURE_ARGS+=	--with-lua
-LIB_DEPENDS+=		lua.>=5.1::lang/lua
-WANTLIB+=		m
+LIB_DEPENDS+=		::lang/lua
+WANTLIB+=		m lua.>=5.1
 .else
 CONFIGURE_ARGS+=	--without-lua
 .endif
@@ -60,8 +60,8 @@ WANTLIB+=		X11
 
 .if ${FLAVOR:L:Mjs}
 CONFIGURE_ARGS+=	--with-spidermonkey
-LIB_DEPENDS+=		js.>=2.0::lang/spidermonkey
-WANTLIB+=		pthread
+LIB_DEPENDS+=		::lang/spidermonkey
+WANTLIB+=		pthread js.>=2.0
 CFLAGS+=		-I${LOCALBASE}/include/js -pthread
 .else
 CONFIGURE_ARGS+=	--without-spidermonkey

diff --git a/x11/jwm/Makefile b/x11/jwm/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.6 2009/10/11 14:06:20 edd Exp $
+# $OpenBSD: Makefile,v 1.7 2010/07/21 21:14:47 edd Exp $
 
 COMMENT=		Joe's Window Manager
 
 DISTNAME=		jwm-2.0.1
-PKGNAME=		${DISTNAME}p1
+REVISION=		2
 
 CATEGORIES=		x11
 
@@ -17,15 +17,16 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=		X11 Xext Xft Xinerama Xpm Xrender pthread-stubs xcb \
-			c fontconfig freetype m z Xau Xdmcp expat jpeg
+WANTLIB=		X11 Xau Xdmcp Xext Xft Xinerama Xpm Xrender c expat \
+			fontconfig freetype fribidi jpeg m png.>=2 \
+			pthread-stubs xcb z
 
 MASTER_SITES=		${HOMEPAGE}/releases/
 EXTRACT_SUFX=		.tar.bz2
 
-LIB_DEPENDS=		fribidi::devel/fribidi \
-			png.>=2::graphics/png \
-			jpeg::graphics/jpeg
+LIB_DEPENDS=		::devel/fribidi \
+			::graphics/png \
+			::graphics/jpeg
 
 NO_REGRESS=		Yes
 

diff --git a/x11/tint/Makefile b/x11/tint/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.9 2010/07/19 15:17:45 edd Exp $
+# $OpenBSD: Makefile,v 1.10 2010/07/21 21:14:47 edd Exp $
 
 COMMENT=	lightweight freedesktop-compliant panel/taskbar/clock
 
@@ -18,17 +18,19 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi \
-		Xinerama Xrandr Xrender atk-1.0 c cairo expat fontconfig \
-		freetype gio-2.0 glib-2.0 glitz gmodule-2.0 gobject-2.0 \
-		gthread-2.0 iconv intl m pixman-1 png pthread pthread-stubs \
-		xcb xcb-render xcb-render-util z
+WANTLIB=	Imlib2.>=2 X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext \
+		Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo expat \
+		fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 \
+		glib-2.0 glitz gmodule-2.0 gobject-2.0 gthread-2.0 \
+		gtk-x11-2.0 iconv intl m pango-1.0 pangocairo-1.0 \
+		pangoft2-1.0 pixman-1 png pthread pthread-stubs xcb \
+		xcb-render xcb-render-util z
 
 MASTER_SITES=	http://tint2.googlecode.com/files/
 
-LIB_DEPENDS=	Imlib2.>=2::graphics/imlib2 \
-		pango-1.0,pangocairo-1.0,pangoft2-1.0::devel/pango \
-		gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2
+LIB_DEPENDS=	::graphics/imlib2 \
+		::devel/pango \
+		::x11/gtk+2
 RUN_DEPENDS=	::x11/py-gtk2 \
 		::devel/desktop-file-utils