From af486177525e6eef42dbf5053e0ecdc603f335a2 Mon Sep 17 00:00:00 2001 From: jasper Date: Thu, 3 Nov 2011 20:13:20 +0000 Subject: [PATCH] - regen WANTLIB --- textproc/clucene/Makefile | 6 ++++-- textproc/exempi/Makefile | 5 +++-- textproc/gtkspell/Makefile | 8 ++++---- textproc/iksemel/Makefile | 6 +++--- textproc/libwpd/Makefile | 6 +++--- textproc/libxml++/Makefile | 6 +++--- textproc/ots/Makefile | 6 +++--- textproc/py-MarkupSafe/Makefile | 6 ++++-- textproc/py-xmldiff/Makefile | 6 ++++-- textproc/py-yaml/Makefile | 6 +++--- textproc/urlview/Makefile | 8 +++++--- textproc/xerces-c/Makefile | 5 ++++- textproc/xxdiff/Makefile | 6 +++--- textproc/zathura/Makefile | 8 ++++---- 14 files changed, 50 insertions(+), 38 deletions(-) diff --git a/textproc/clucene/Makefile b/textproc/clucene/Makefile index 3cd86c0e18c..e424e170186 100644 --- a/textproc/clucene/Makefile +++ b/textproc/clucene/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.5 2010/09/24 18:40:44 steven Exp $ +# $OpenBSD: Makefile,v 1.6 2011/11/03 20:13:20 jasper Exp $ COMMENT = full-text search engine library CATEGORIES = textproc DISTNAME = clucene-core-0.9.21b -REVISION = 0 +REVISION = 1 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=clucene/} @@ -15,6 +15,8 @@ CONFIGURE_STYLE = gnu USE_LIBTOOL = Yes MODGNU_CONFIG_GUESS_DIRS = ${WRKSRC}/config +WANTLIB+= m stdc++ + # LGPL/Apache PERMIT_PACKAGE_CDROM = Yes PERMIT_PACKAGE_FTP = Yes diff --git a/textproc/exempi/Makefile b/textproc/exempi/Makefile index a9315b29ba6..37a7b82854d 100644 --- a/textproc/exempi/Makefile +++ b/textproc/exempi/Makefile @@ -1,7 +1,8 @@ -# $OpenBSD: Makefile,v 1.3 2010/04/09 08:59:56 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.4 2011/11/03 20:13:20 jasper Exp $ COMMENT = implementation of XMP DISTNAME = exempi-2.1.1 +REVISION = 0 CATEGORIES = textproc @@ -17,7 +18,7 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB += expat z +WANTLIB += expat z m stdc++ MODULES = converters/libiconv MASTER_SITES = http://libopenraw.freedesktop.org/download/ diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile index 11efc23a75f..ea9d31c04ca 100644 --- a/textproc/gtkspell/Makefile +++ b/textproc/gtkspell/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.35 2011/09/16 11:41:40 espie Exp $ +# $OpenBSD: Makefile,v 1.36 2011/11/03 20:13:20 jasper Exp $ COMMENT= gtk2 spelling checker DISTNAME= gtkspell-2.0.16 SHARED_LIBS= gtkspell 1.0 # .0.0 -REVISION= 3 +REVISION= 4 CATEGORIES= textproc x11 @@ -25,8 +25,8 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ fontconfig freetype glib-2.0 gmodule-2.0 \ gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ pcre pixman-1 png pthread-stubs stdc++ xcb z gio-2.0 \ - gthread-2.0 xcb-render xcb-render-util gdk_pixbuf-2.0 \ - enchant>=5 gdk-x11-2.0 gtk-x11-2.0 + gthread-2.0 xcb-render gdk_pixbuf-2.0 drm ffi \ + enchant>=5 gdk-x11-2.0 gtk-x11-2.0 GL Xxf86vm xcb-shm USE_LIBTOOL= Yes USE_GMAKE= Yes diff --git a/textproc/iksemel/Makefile b/textproc/iksemel/Makefile index 3adbb4ff7d9..c0fdc38a8c8 100644 --- a/textproc/iksemel/Makefile +++ b/textproc/iksemel/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.9 2011/04/15 16:13:23 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.10 2011/11/03 20:13:20 jasper Exp $ COMMENT= XML parser designed for Jabber applications DISTNAME= iksemel-1.4 -REVISION= 1 +REVISION= 2 SHARED_LIBS= iksemel 0.1 # .4.0 @@ -18,7 +18,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += c gmp gnutls hogweed nettle pthread tasn1 z +WANTLIB += c gmp gnutls hogweed nettle pthread tasn1 z p11-kit MASTER_SITES= http://iksemel.googlecode.com/files/ diff --git a/textproc/libwpd/Makefile b/textproc/libwpd/Makefile index aa9f5b5b568..676f190b6fd 100644 --- a/textproc/libwpd/Makefile +++ b/textproc/libwpd/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.13 2010/11/20 19:56:49 espie Exp $ +# $OpenBSD: Makefile,v 1.14 2011/11/03 20:13:20 jasper Exp $ COMMENT= import and export WordPerfect(tm) documents DISTNAME= libwpd-0.8.9 CATEGORIES= textproc -REVISION= 5 +REVISION= 6 SHARED_LIBS= wpd-0.8 8.9 \ wpd-stream-0.8 8.9 @@ -23,7 +23,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libwpd/} WANTLIB += bz2 c gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 m pcre -WANTLIB += stdc++ xml2 z gsf-1 +WANTLIB += stdc++ xml2 z gsf-1 ffi WANTLIB += gthread-2.0 pthread MODULES= devel/gettext diff --git a/textproc/libxml++/Makefile b/textproc/libxml++/Makefile index e089532f118..f1c0ab4a90d 100644 --- a/textproc/libxml++/Makefile +++ b/textproc/libxml++/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.19 2011/09/16 11:41:41 espie Exp $ +# $OpenBSD: Makefile,v 1.20 2011/11/03 20:13:20 jasper Exp $ COMMENT= C++ wrapper for the libxml XML parser library V= 2.34.2 DISTNAME= libxml++-$V -REVISION= 0 +REVISION= 1 SHARED_LIBS+= xml++-2.6 1.0 # .2.7 CATEGORIES= textproc @@ -23,7 +23,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= ${MASTER_SITE_GNOME:=sources/libxml++/${V:C/^([0-9]+\.[0-9]+).*/\1/}/} WANTLIB += m z glib-2.0 gmodule-2.0 gobject-2.0 pcre sigc-2.0 gthread-2.0 -WANTLIB += glibmm-2.4 xml2 stdc++ +WANTLIB += glibmm-2.4 xml2 stdc++ ffi MODULES= devel/gettext diff --git a/textproc/ots/Makefile b/textproc/ots/Makefile index fd1aef9fb6e..dd1ab3c3cfa 100644 --- a/textproc/ots/Makefile +++ b/textproc/ots/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.11 2011/09/16 11:41:41 espie Exp $ +# $OpenBSD: Makefile,v 1.12 2011/11/03 20:13:20 jasper Exp $ COMMENT= open source tool for summarizing texts DISTNAME= ots-0.4.2 -REVISION= 3 +REVISION= 4 SHARED_LIBS= ots-1 4.2 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libots/} @@ -22,7 +22,7 @@ LIB_DEPENDS= devel/glib2 \ devel/popt \ textproc/libxml -WANTLIB= c m pcre z glib-2.0 popt xml2 +WANTLIB= c m pcre z glib-2.0 popt xml2 pthread USE_LIBTOOL=Yes USE_GROFF = Yes diff --git a/textproc/py-MarkupSafe/Makefile b/textproc/py-MarkupSafe/Makefile index ef8f30f7585..6a24bdc10d4 100644 --- a/textproc/py-MarkupSafe/Makefile +++ b/textproc/py-MarkupSafe/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.4 2011/09/16 11:41:41 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2011/11/03 20:13:20 jasper Exp $ COMMENT= implements an XML/HTML/XHTML markup safe string MODPY_EGG_VERSION= 0.11 DISTNAME= MarkupSafe-${MODPY_EGG_VERSION} PKGNAME= py-${DISTNAME} -REVISION= 1 +REVISION= 2 CATEGORIES= textproc @@ -21,6 +21,8 @@ MASTER_SITES= ${MASTER_SITE_PYPI:=M/MarkupSafe/} MODULES= lang/python +WANTLIB+= ${MODPY_WANTLIB} + MODPY_SETUPTOOLS= Yes .include diff --git a/textproc/py-xmldiff/Makefile b/textproc/py-xmldiff/Makefile index a222c50c533..4ec2f652ee9 100644 --- a/textproc/py-xmldiff/Makefile +++ b/textproc/py-xmldiff/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.4 2011/09/16 11:41:41 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2011/11/03 20:13:20 jasper Exp $ COMMENT= show differences between XML files/DOM trees MODPY_EGG_VERSION= 0.6.10 DISTNAME= xmldiff-${MODPY_EGG_VERSION} PKGNAME= py-xmldiff-${MODPY_EGG_VERSION} -REVISION= 1 +REVISION= 2 CATEGORIES= textproc HOMEPAGE= http://www.logilab.org/859/ @@ -23,6 +23,8 @@ MASTER_SITES= http://ftp.logilab.org/pub/xmldiff/ RUN_DEPENDS= shells/bash \ textproc/py-xml +WANTLIB += ${MODPY_WANTLIB} + pre-configure: ${SUBST_CMD} ${WRKSRC}/bin/{xmldiff,xmlrev} diff --git a/textproc/py-yaml/Makefile b/textproc/py-yaml/Makefile index 333cda143ea..99b17d6f7d2 100644 --- a/textproc/py-yaml/Makefile +++ b/textproc/py-yaml/Makefile @@ -1,11 +1,11 @@ -# $OpenBSD: Makefile,v 1.8 2011/09/16 11:41:41 espie Exp $ +# $OpenBSD: Makefile,v 1.9 2011/11/03 20:13:20 jasper Exp $ COMMENT= YAML parser and emitter in Python MODPY_EGG_VERSION=3.08 DISTNAME= PyYAML-${MODPY_EGG_VERSION} PKGNAME= py-yaml-${MODPY_EGG_VERSION} -REVISION= 4 +REVISION= 5 CATEGORIES= textproc HOMEPAGE= http://pyyaml.org/wiki/PyYAML @@ -20,7 +20,7 @@ PERMIT_DISTFILES_FTP= Yes MASTER_SITES= http://pyyaml.org/download/pyyaml/ -WANTLIB+= yaml +WANTLIB+= yaml ${MODPY_WANTLIB} MODULES= lang/python diff --git a/textproc/urlview/Makefile b/textproc/urlview/Makefile index 5e843566662..7460f610d11 100644 --- a/textproc/urlview/Makefile +++ b/textproc/urlview/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.18 2011/05/04 14:00:13 gsoares Exp $ +# $OpenBSD: Makefile,v 1.19 2011/11/03 20:13:20 jasper Exp $ COMMENT= curses-based URL ripper DISTNAME= urlview-0.9 -REVISION= 3 +REVISION= 4 CATEGORIES= textproc MASTER_SITES= ftp://ftp.fu-berlin.de/pub/unix/mail/mutt/contrib/ \ ftp://ftp.mutt.org/mutt/contrib/ \ @@ -15,7 +15,7 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c ncurses +WANTLIB= c CONFIGURE_STYLE= gnu @@ -30,6 +30,8 @@ WANTLIB+= slang curses m LIB_DEPENDS= devel/libslang CONFIGURE_ARGS= --with-slang=${LOCALBASE} CONFIGURE_ENV= LIBS=-lcurses +.else +WANTLIB+= ncurses .endif pre-build: diff --git a/textproc/xerces-c/Makefile b/textproc/xerces-c/Makefile index 1c616c2902c..5d788aeba0f 100644 --- a/textproc/xerces-c/Makefile +++ b/textproc/xerces-c/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2008/10/26 23:15:15 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.2 2011/11/03 20:13:20 jasper Exp $ COMMENT= c++ validating XML parser DISTNAME= xerces-c-src_2_8_0 PKGNAME= xerces-c-2.8.0 +REVISION= 0 CATEGORIES= textproc devel SO_VERSION= 0.0 # .28.0 @@ -23,6 +24,8 @@ MASTER_SITES= http://apache.mirrors.crysys.hit.bme.hu/dist/xerces/c/2/sources/ USE_GMAKE= Yes +WANTLIB= m stdc++ + XERCESCROOT= ${WRKDIR}/${DISTNAME} WRKSRC= ${XERCESCROOT}/src/xercesc diff --git a/textproc/xxdiff/Makefile b/textproc/xxdiff/Makefile index 2c440f27739..38221add2d4 100644 --- a/textproc/xxdiff/Makefile +++ b/textproc/xxdiff/Makefile @@ -1,9 +1,9 @@ -# $OpenBSD: Makefile,v 1.31 2011/09/16 11:41:42 espie Exp $ +# $OpenBSD: Makefile,v 1.32 2011/11/03 20:13:20 jasper Exp $ COMMENT= graphical file comparator and merge tool DISTNAME= xxdiff-3.1 -REVISION= 3 +REVISION= 4 CATEGORIES= textproc x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=xxdiff/} @@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= X11 Xext c m png pthread pthread-stubs stdc++ xcb +WANTLIB= X11 Xext c m png pthread stdc++ BUILD_DEPENDS= devel/bison \ devel/tmake>=1.10 diff --git a/textproc/zathura/Makefile b/textproc/zathura/Makefile index b671e4debb2..85117ecfe38 100644 --- a/textproc/zathura/Makefile +++ b/textproc/zathura/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.12 2011/09/16 11:41:42 espie Exp $ +# $OpenBSD: Makefile,v 1.13 2011/11/03 20:13:20 jasper Exp $ COMMENT = pdf viewer with vi-like keybindings DISTNAME = zathura-0.0.8.3 -REVISION= 0 +REVISION= 1 CATEGORIES = textproc x11 @@ -18,8 +18,8 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB += GL X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi -WANTLIB += Xinerama Xrandr Xrender Xxf86vm atk-1.0 c cairo cairo drm expat +WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi +WANTLIB += Xinerama Xrandr Xrender atk-1.0 c cairo cairo expat WANTLIB += fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 WANTLIB += gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0 m WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1 png poppler