diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index 97e3fbaab96..c529e9f7a63 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.49 2011/04/01 23:03:12 sthen Exp $ +# $OpenBSD: Makefile,v 1.50 2011/04/15 16:10:38 ajacoutot Exp $ COMMENT= database drivers for Sybase/Microsoft SQL Server @@ -8,6 +8,8 @@ DISTNAME= freetds-$V PKGNAME= ${DISTNAME}.${PATCHVER} PATCHFILES= freetds-post82-${PATCHVER}.diff.gz:0 +REVISION= 0 + SHARED_LIBS += ct 4.0 # .4.0 SHARED_LIBS += sybdb 6.0 # .5.0 SHARED_LIBS += tdsodbc 0.0 # .0.0 @@ -23,7 +25,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += c iodbc iodbcinst gcrypt gnutls gpg-error ncurses +WANTLIB += c gmp gnutls hogweed iodbc iodbcinst ncurses nettle WANTLIB += pthread readline tasn1 z MASTER_SITES= ftp://ftp.ibiblio.org/pub/Linux/ALPHA/freetds/stable/ @@ -38,10 +40,7 @@ BUILD_DEPENDS= devel/doxygen>=1.7.2 \ ${MODGNU_AUTOCONF_DEPENDS} \ ${MODGNU_AUTOMAKE_DEPENDS} LIB_DEPENDS= databases/iodbc,-main \ - security/libgcrypt \ - security/gnutls \ - security/libgpg-error \ - security/libtasn1 + security/gnutls FLAVORS= msdblib FLAVOR?= diff --git a/databases/libdbi-drivers/Makefile b/databases/libdbi-drivers/Makefile index 803690ff847..0a9791fb2a1 100644 --- a/databases/libdbi-drivers/Makefile +++ b/databases/libdbi-drivers/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.5 2011/04/12 11:16:35 sthen Exp $ +# $OpenBSD: Makefile,v 1.6 2011/04/15 16:10:38 ajacoutot Exp $ V = 0.8.3-1 COMMENT-main = mysql driver for libdbi @@ -13,7 +13,7 @@ REVISION-pgsql = 0 PKGNAME-sqlite = libdbi-drivers-sqlite-${V:S/-/./} PKGNAME-sqlite3 = libdbi-drivers-sqlite3-${V:S/-/./} PKGNAME-freetds = libdbi-drivers-freetds-${V:S/-/./} -REVISION-freetds = 0 +REVISION-freetds = 1 CATEGORIES = databases HOMEPAGE = http://libdbi-drivers.sourceforge.net/ @@ -61,9 +61,11 @@ WANTLIB-sqlite3 = m sqlite3 dbi LIB_DEPENDS-sqlite3 = databases/sqlite3 \ databases/libdbi -WANTLIB-freetds = iconv m ct dbi gcrypt gnutls gpg-error intl tasn1 z +WANTLIB-freetds = iconv m ct dbi gcrypt gmp gnutls gpg-error hogweed \ + intl nettle tasn1 z LIB_DEPENDS-freetds = databases/freetds \ - databases/libdbi + databases/libdbi \ + security/libgcrypt REGRESS_IS_INTERACTIVE =Yes REGRESS_DEPENDS = databases/libdbi-drivers,-main \ diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile index 18d13c863d8..b49c6a39ffe 100644 --- a/mail/claws-mail/Makefile +++ b/mail/claws-mail/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.42 2011/03/10 21:37:33 landry Exp $ +# $OpenBSD: Makefile,v 1.43 2011/04/15 16:10:38 ajacoutot Exp $ SHARED_ONLY= Yes @@ -14,6 +14,10 @@ PKGNAME-bogofilter= claws-mail-bogofilter-${V} PKGNAME-spamassassin= claws-mail-spamassassin-${V} CATEGORIES= mail news +REVISION-main= 0 +REVISION-bogofilter= 0 +REVISION-spamassassin= 0 + HOMEPAGE= http://www.claws-mail.org/ MAINTAINER= Ulrich Kahl @@ -50,7 +54,7 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ gdk-x11-2.0 gtk-x11-2.0 execinfo etpan>=13 sasl2 \ GL Xxf86vm drm xcb-render xcb-shm -WANTLIB-main= ${WANTLIB} ICE SM c dbus-1 \ +WANTLIB-main= ${WANTLIB} ICE SM c dbus-1 gmp hogweed nettle \ pthread stdc++ tasn1 xcb-atom xcb-aux xcb-event \ startup-notification-1 enchant gnutls gpgme dbus-glib-1 @@ -59,7 +63,8 @@ WANTLIB-docs= LIB_DEPENDS= x11/gtk+2 \ devel/libexecinfo \ mail/libetpan \ - security/cyrus-sasl2 + security/cyrus-sasl2 \ + security/libgcrypt RUN_DEPENDS-main= ${RUN_DEPENDS} \ devel/desktop-file-utils diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile index ecb5bb29c2f..6194f82aba5 100644 --- a/mail/wmbiff/Makefile +++ b/mail/wmbiff/Makefile @@ -1,8 +1,8 @@ -# $OpenBSD: Makefile,v 1.22 2010/11/19 07:23:09 espie Exp $ +# $OpenBSD: Makefile,v 1.23 2011/04/15 16:10:37 ajacoutot Exp $ COMMENT= multiple mailbox checker dockapp DISTNAME= wmbiff-0.4.27 -REVISION = 1 +REVISION = 2 CATEGORIES= mail x11 x11/windowmaker MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=wmbiff/} @@ -14,12 +14,14 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += X11 Xext Xpm c gcrypt gpg-error iconv intl pthread-stubs \ - tasn1 xcb z gnutls>=12 +WANTLIB += X11 Xext Xpm c gcrypt gpg-error z + +MODULES= devel/gettext USE_GROFF = Yes -LIB_DEPENDS= security/gnutls +LIB_DEPENDS= security/gnutls \ + security/libgcrypt CONFIGURE_STYLE=gnu CONFIGURE_ENV+= ac_cv_path_CVS2CL="" diff --git a/net/bitlbee/Makefile b/net/bitlbee/Makefile index cbf482ecd92..4dc149fd63c 100644 --- a/net/bitlbee/Makefile +++ b/net/bitlbee/Makefile @@ -1,10 +1,12 @@ -# $OpenBSD: Makefile,v 1.35 2010/11/22 10:16:08 espie Exp $ +# $OpenBSD: Makefile,v 1.36 2011/04/15 16:10:38 ajacoutot Exp $ COMMENT= IRC proxy to connect to AIM, ICQ, Jabber, MSN and Yahoo DISTNAME= bitlbee-1.2.7 CATEGORIES= net +REVISION= 0 + HOMEPAGE= http://bitlbee.org/ MAINTAINER= Andrew Dalgleish @@ -15,7 +17,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB= c pthread glib-2.0 gmodule-2.0 gnutls>=13 +WANTLIB= c pthread glib-2.0 gmodule-2.0 gnutls>=13 tasn1 MASTER_SITES= http://get.bitlbee.org/src/ diff --git a/net/filezilla/Makefile b/net/filezilla/Makefile index d53aa1528e3..1f633f73567 100644 --- a/net/filezilla/Makefile +++ b/net/filezilla/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 2011/03/31 12:38:42 lum Exp $ +# $OpenBSD: Makefile,v 1.18 2011/04/15 16:10:38 ajacoutot Exp $ COMMENT= fast FTP and SFTP GUI client with a lot of features @@ -6,7 +6,7 @@ V= 3.4.0 PKGNAME= filezilla-$V DISTNAME= FileZilla_$V_src EXTRACT_SUFX= .tar.bz2 -REVISION= 0 +REVISION= 1 CATEGORIES= net @@ -19,7 +19,7 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += c gcrypt gpg-error m pthread stdc++ tasn1 z +WANTLIB += c m pthread stdc++ tasn1 z gmp hogweed nettle WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 cairo expat fontconfig WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 diff --git a/net/glib2-networking/Makefile b/net/glib2-networking/Makefile index 5b6553e192f..df2510cf5a6 100644 --- a/net/glib2-networking/Makefile +++ b/net/glib2-networking/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.2 2011/04/04 17:04:38 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.3 2011/04/15 16:10:38 ajacoutot Exp $ SHARED_ONLY= Yes @@ -7,6 +7,8 @@ COMMENT= network-related gio modules for glib2 GNOME_VERSION= 2.28.5 GNOME_PROJECT= glib-networking +REVISION= 0 + PKGNAME= glib2-networking-${GNOME_VERSION} CATEGORIES= net @@ -21,9 +23,9 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += c gcrypt gio-2.0 glib-2.0 gmodule-2.0 gnutls gobject-2.0 -WANTLIB += gpg-error gthread-2.0 m modman pcre proxy pthread stdc++ -WANTLIB += tasn1 z +WANTLIB += c gcrypt gio-2.0 glib-2.0 gmodule-2.0 gmp gnutls gobject-2.0 +WANTLIB += gpg-error gthread-2.0 hogweed m modman nettle pcre +WANTLIB += proxy pthread stdc++ tasn1 z MODULES= devel/gettext \ x11/gnome @@ -33,7 +35,8 @@ RUN_DEPENDS= devel/gsettings-desktop-schemas LIB_DEPENDS= net/libproxy>=0.4.6 \ security/gnutls \ - devel/glib2 + devel/glib2 \ + security/libgcrypt LIBTOOL_FLAGS= --tag=disable-static diff --git a/net/winexe/Makefile b/net/winexe/Makefile index b515ac383e9..67ec4926eb2 100644 --- a/net/winexe/Makefile +++ b/net/winexe/Makefile @@ -1,10 +1,12 @@ -# $OpenBSD: Makefile,v 1.4 2010/11/19 22:31:39 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2011/04/15 16:10:37 ajacoutot Exp $ COMMENT = remotely execute programs on a Windows host DISTNAME = winexe-source-081123 PKGNAME = winexe-0.90 +REVISION = 0 + CATEGORIES = net HOMEPAGE = http://eol.ovh.org/winexe/ @@ -21,7 +23,7 @@ PERMIT_DISTFILES_FTP = Yes MASTER_SITES = ${HOMEPAGE} EXTRACT_SUFX = .tar.bz2 -WANTLIB = c gnutls +WANTLIB = c gnutls pthread tasn1 BUILD_DEPENDS = ${MODGNU_AUTOCONF_DEPENDS} LIB_DEPENDS = security/gnutls MODULES = converters/libiconv diff --git a/security/prelude/libprelude/Makefile b/security/prelude/libprelude/Makefile index 7f13d8f2ad7..fa5de3cc1d5 100644 --- a/security/prelude/libprelude/Makefile +++ b/security/prelude/libprelude/Makefile @@ -1,4 +1,6 @@ -# $OpenBSD: Makefile,v 1.28 2010/11/20 17:22:45 espie Exp $ +# $OpenBSD: Makefile,v 1.29 2011/04/15 16:10:38 ajacoutot Exp $ + +# XXX fails to build if not using the bundled libtool COMMENT= Prelude framework library @@ -6,7 +8,7 @@ MODPY_EGG_VERSION=0.9.24.1 DISTNAME= libprelude-${MODPY_EGG_VERSION} PKGNAME= prelude-${DISTNAME} -REVISION= 2 +REVISION= 3 MASTER_SITES= http://www.prelude-ids.com/download/releases/libprelude/ @@ -18,9 +20,10 @@ MODULES= devel/gettext \ CONFIGURE_STYLE=gnu USE_GROFF = Yes -WANTLIB= c gcrypt tasn1 z gpg-error gnutls +WANTLIB += c gcrypt gmp gnutls gpg-error hogweed nettle pthread +WANTLIB += tasn1 z -LIB_DEPENDS= security/libgpg-error \ +LIB_DEPENDS= security/libgcrypt \ security/gnutls .include diff --git a/security/prelude/libpreludedb/Makefile b/security/prelude/libpreludedb/Makefile index c3e39b2f984..7e168a920f8 100644 --- a/security/prelude/libpreludedb/Makefile +++ b/security/prelude/libpreludedb/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.29 2010/11/20 17:22:45 espie Exp $ +# $OpenBSD: Makefile,v 1.30 2011/04/15 16:10:38 ajacoutot Exp $ COMMENT-main= Prelude framework database-access library COMMENT-pgsql= PostgreSQL module for libpreludedb @@ -13,10 +13,10 @@ PKGNAME-pgsql= prelude-libpreludedb-pgsql-${VERSION} PKGNAME-mysql= prelude-libpreludedb-mysql-${VERSION} PKGNAME-sqlite= prelude-libpreludedb-sqlite-${VERSION} -REVISION-main= 4 -REVISION-pgsql= 2 -REVISION-mysql= 2 -REVISION-sqlite=2 +REVISION-main= 5 +REVISION-pgsql= 3 +REVISION-mysql= 3 +REVISION-sqlite=3 MODPY_EGG_VERSION=0.0.0 @@ -28,7 +28,7 @@ USE_GROFF = Yes SHARED_LIBS= preludedb 4.9 -WANTLIB= tasn1 z gcrypt gnutls prelude +WANTLIB= tasn1 z gcrypt gnutls prelude gmp gpg-error hogweed nettle WANTLIB-main= ${WANTLIB} c WANTLIB-mysql= ${WANTLIB} preludedb lib/mysql/mysqlclient crypto m ssl WANTLIB-pgsql= ${WANTLIB} preludedb pq @@ -36,7 +36,6 @@ WANTLIB-sqlite= ${WANTLIB} preludedb sqlite3 LIB_DEPENDS= security/libgcrypt \ security/gnutls \ - security/libgpg-error \ security/prelude/libprelude LIB_DEPENDS-pgsql= ${LIB_DEPENDS} \ diff --git a/security/prelude/lml/Makefile b/security/prelude/lml/Makefile index 91894c0d15f..dfce6bdb41b 100644 --- a/security/prelude/lml/Makefile +++ b/security/prelude/lml/Makefile @@ -1,21 +1,21 @@ -# $OpenBSD: Makefile,v 1.19 2010/11/20 17:22:45 espie Exp $ +# $OpenBSD: Makefile,v 1.20 2011/04/15 16:10:38 ajacoutot Exp $ COMMENT= Prelude log analyzer DISTNAME= prelude-lml-0.9.15 -REVISION= 2 +REVISION= 3 -WANTLIB= c gcrypt gnutls gpg-error m tasn1 z pcre prelude +WANTLIB += c gcrypt gnutls gpg-error m tasn1 z pcre prelude +WANTLIB += gmp hogweed nettle pthread MODULES= devel/gettext MASTER_SITES= http://www.prelude-ids.com/download/releases/prelude-lml/ CONFIGURE_STYLE=gnu +CONFIGURE_ARGS= --disable-unsupported-rulesets LIB_DEPENDS= devel/pcre \ security/prelude/libprelude -CONFIGURE_ARGS= --disable-unsupported-rulesets - .include diff --git a/security/prelude/manager/Makefile b/security/prelude/manager/Makefile index b57631b902a..a9652d62ef6 100644 --- a/security/prelude/manager/Makefile +++ b/security/prelude/manager/Makefile @@ -1,25 +1,22 @@ -# $OpenBSD: Makefile,v 1.23 2010/11/20 17:22:45 espie Exp $ +# $OpenBSD: Makefile,v 1.24 2011/04/15 16:10:38 ajacoutot Exp $ COMMENT= Prelude manager DISTNAME= prelude-manager-0.9.15 -REVISION= 1 +REVISION= 2 MASTER_SITES= http://www.prelude-ids.com/download/releases/prelude-manager/ WANTLIB += c gcrypt gnutls gpg-error m prelude preludedb pthread tasn1 z -WANTLIB += xml2 preludedb +WANTLIB += xml2 preludedb gmp hogweed nettle MODULES= devel/gettext CONFIGURE_STYLE=gnu + USE_GROFF = Yes LIB_DEPENDS= textproc/libxml \ security/prelude/libpreludedb -# XXX check on update whether this is still necessary -post-extract: - ${INSTALL} -m 555 ${FILESDIR}/libgnutls-config ${WRKDIR}/bin - .include diff --git a/security/prelude/manager/files/libgnutls-config b/security/prelude/manager/files/libgnutls-config deleted file mode 100644 index 124a6056a57..00000000000 --- a/security/prelude/manager/files/libgnutls-config +++ /dev/null @@ -1,41 +0,0 @@ -#!/bin/sh - -usage() -{ - cat <&2 -fi - -while test $# -gt 0; do - case "$1" in - -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - case $1 in - --version) - echo "`pkg-config --modversion gnutls`" - exit 0 - ;; - --cflags) - echo "`pkg-config --cflags gnutls`" - ;; - --libs) - echo "`pkg-config --libs gnutls`" - ;; - *) - usage 1 1>&2 - ;; - esac - shift -done diff --git a/security/xmlsec/Makefile b/security/xmlsec/Makefile index 5722dfcfdee..33894e8f74d 100644 --- a/security/xmlsec/Makefile +++ b/security/xmlsec/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2011/04/03 10:59:50 jasper Exp $ +# $OpenBSD: Makefile,v 1.28 2011/04/15 16:10:38 ajacoutot Exp $ COMMENT-main= XML security library COMMENT-docs= XML security library documentation @@ -13,6 +13,8 @@ SHARED_LIBS= xmlsec1-gnutls 5.0 \ xmlsec1-gcrypt 0.0 \ xmlsec1 5.0 +REVISION= 0 + HOMEPAGE= http://www.aleksey.com/xmlsec/ # MIT Licence @@ -21,7 +23,8 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += c crypto gcrypt gpg-error m tasn1 xml2 z ltdl xslt>=3 gnutls>=13 ssl +WANTLIB += c crypto gcrypt gmp gnutls gpg-error hogweed ltdl m +WANTLIB += nettle ssl tasn1 xml2 xslt z MASTER_SITES= ${HOMEPAGE}/download/ \ ftp://ftp.aleksey.com/pub/xmlsec/releases/ \ diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile index 75403c5d47c..50ce1be401d 100644 --- a/sysutils/heartbeat/Makefile +++ b/sysutils/heartbeat/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.21 2010/12/28 15:08:31 jasper Exp $ +# $OpenBSD: Makefile,v 1.22 2011/04/15 16:10:38 ajacoutot Exp $ SHARED_ONLY= Yes @@ -10,11 +10,11 @@ DISTNAME= obs-2.1.2-15 VERSION= 2.1.2.15 PKGNAME= heartbeat-${VERSION} PKGNAME-main= heartbeat-${VERSION} -REVISION-main = 5 +REVISION-main = 6 PKGNAME-gui= heartbeat-gui-${VERSION} -REVISION-gui = 4 +REVISION-gui = 5 PKGNAME-snmp= heartbeat-snmp-${VERSION} -REVISION-snmp = 4 +REVISION-snmp = 5 EXTRACT_SUFX= .tar.bz2 CATEGORIES= sysutils @@ -50,9 +50,10 @@ BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \ LIB_DEPENDS+= textproc/libxml -WANTLIB-main= ${WANTLIB} crypto gcrypt gpg-error idn ncurses ssl tasn1 \ +WANTLIB-main= ${WANTLIB} crypto idn ncurses ssl tasn1 \ e2fs-uuid gnutls>=12 lib/libnet-1.0/net=0 bz2>=10 \ - xml2>=9 ltdl>=4 glib-2.0>=1400 curl>=7 + xml2>=9 ltdl>=4 glib-2.0>=1400 curl>=7 \ + gmp hogweed nettle LIB_DEPENDS-main=${LIB_DEPENDS} \ sysutils/e2fsprogs \ security/gnutls \ @@ -64,8 +65,9 @@ LIB_DEPENDS-main=${LIB_DEPENDS} \ RUN_DEPENDS-main=${MODPY_RUN_DEPENDS} \ devel/p5-Time-TimeDate -WANTLIB-gui= ${MODGETTEXT_WANTLIB} gcrypt gpg-error m tasn1 util xml2 z \ - bz2>=10 gnutls>=12 ltdl>=4 e2fs-uuid +WANTLIB-gui= ${MODGETTEXT_WANTLIB} m tasn1 util xml2 z \ + bz2>=10 gnutls>=12 ltdl>=4 e2fs-uuid \ + gmp hogweed nettle LIB_DEPENDS-gui=${LIB_DEPENDS} \ archivers/bzip2 \ security/gnutls \ @@ -74,8 +76,8 @@ LIB_DEPENDS-gui=${LIB_DEPENDS} \ RUN_DEPENDS-gui=${MODPY_RUN_DEPENDS} \ x11/py-gtk2 -WANTLIB-snmp= ${WANTLIB} bz2 crypto e2fs-uuid gcrypt glib-2.0 gnutls \ - gpg-error kvm ltdl perl tasn1 wrap xml2 ccmclient \ +WANTLIB-snmp= ${WANTLIB} bz2 crypto e2fs-uuid glib-2.0 \ + kvm ltdl perl wrap xml2 ccmclient \ clm hbclient pils plumb netsnmp>=7 netsnmpagent \ netsnmpmibs LIB_DEPENDS-snmp=${LIB_DEPENDS} \ diff --git a/sysutils/rsyslog/Makefile b/sysutils/rsyslog/Makefile index 7ef6b45f554..70ae76503dc 100644 --- a/sysutils/rsyslog/Makefile +++ b/sysutils/rsyslog/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.4 2010/11/20 17:22:42 espie Exp $ +# $OpenBSD: Makefile,v 1.5 2011/04/15 16:10:38 ajacoutot Exp $ SHARED_ONLY = Yes @@ -15,6 +15,8 @@ PKGNAME-mysql = rsyslog-mysql-$V PKGNAME-pgsql = rsyslog-pgsql-$V CATEGORIES = sysutils +REVISION-main = 0 + HOMEPAGE = http://www.rsyslog.com/ # GPLv3+ @@ -23,7 +25,7 @@ PERMIT_PACKAGE_FTP = Yes PERMIT_DISTFILES_CDROM =Yes PERMIT_DISTFILES_FTP = Yes -WANTLIB-main += c gcrypt gpg-error gnutls iconv intl pthread +WANTLIB-main += c gmp hogweed nettle gnutls iconv intl pthread WANTLIB-main += relp tasn1 z WANTLIB-mysql += crypto m mysqlclient ssl z WANTLIB-pgsql += crypto com_err pq ssl diff --git a/www/liferea/Makefile b/www/liferea/Makefile index a795fd00fcc..8e735502082 100644 --- a/www/liferea/Makefile +++ b/www/liferea/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.39 2011/04/07 12:07:02 pea Exp $ +# $OpenBSD: Makefile,v 1.40 2011/04/15 16:10:38 ajacoutot Exp $ SHARED_ONLY= Yes @@ -7,6 +7,8 @@ COMMENT= simple GTK desktop news aggregator DISTNAME= liferea-1.6.5 CATEGORIES= www x11 +REVISION= 0 + HOMEPAGE= http://liferea.sourceforge.net/ MAINTAINER= Wiktor Izdebski @@ -28,7 +30,7 @@ WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread WANTLIB += pthread-stubs sqlite3 stdc++ tasn1 xcb xml2 z WANTLIB += gnutls>=12 lua>=5 notify>=2 xslt>=3.3 glade-2.0 WANTLIB += soup-2.4 enchant>=6 webkit-1.0 GL Xxf86vm drm -WANTLIB += gstapp-0.10 xcb-render xcb-shm +WANTLIB += gstapp-0.10 xcb-render xcb-shm gmp hogweed nettle MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=liferea/} diff --git a/x11/gnome/eog-plugins/Makefile b/x11/gnome/eog-plugins/Makefile index b8a161167b7..920442f86ea 100644 --- a/x11/gnome/eog-plugins/Makefile +++ b/x11/gnome/eog-plugins/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.14 2011/03/23 15:25:39 jasper Exp $ +# $OpenBSD: Makefile,v 1.15 2011/04/15 16:10:38 ajacoutot Exp $ COMMENT= plugins for EOG GNOME_PROJECT= eog-plugins GNOME_VERSION= 2.30.2 -REVISION= 0 +REVISION= 1 CATEGORIES= graphics @@ -25,7 +25,7 @@ WANTLIB += gpg-error gthread-2.0 gtk-x11-2.0 json-glib-1.0 m pango-1.0 WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread-stubs WANTLIB += soup-2.4 sqlite3 tasn1 xcb xml2 z gnome-keyring proxy WANTLIB += soup-gnome-2.4 xcb-render xcb-shm -WANTLIB += champlain-0.8 champlain-gtk-0.8 +WANTLIB += champlain-0.8 champlain-gtk-0.8 gmp hogweed nettle MODULES= devel/gettext \ lang/python \ diff --git a/x11/gnome/vino/Makefile b/x11/gnome/vino/Makefile index 5ab0d65ea99..33a5eebc583 100644 --- a/x11/gnome/vino/Makefile +++ b/x11/gnome/vino/Makefile @@ -1,10 +1,12 @@ -# $OpenBSD: Makefile,v 1.25 2010/12/23 14:13:22 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.26 2011/04/15 16:10:37 ajacoutot Exp $ COMMENT= VNC server for remote acces to your GNOME desktop GNOME_PROJECT= vino GNOME_VERSION= 2.32.1 +REVISION= 0 + CATEGORIES= net # GPLv2 @@ -20,7 +22,7 @@ WANTLIB += gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 WANTLIB += gmodule-2.0 gobject-2.0 gpg-error gthread-2.0 WANTLIB += gtk-x11-2.0 jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0 WANTLIB += pcre pixman-1 png pthread pthread-stubs tasn1 xcb xml2 -WANTLIB += z xcb-render notify unique-1.0 +WANTLIB += z xcb-render notify unique-1.0 gmp hogweed nettle WANTLIB += gnutls telepathy-glib soup-2.4 gnome-keyring>=6 avahi-client WANTLIB += avahi-common avahi-glib GL Xxf86vm drm xcb-shm diff --git a/x11/gnustep/base/Makefile b/x11/gnustep/base/Makefile index ee644bfad0f..9aa4603d147 100644 --- a/x11/gnustep/base/Makefile +++ b/x11/gnustep/base/Makefile @@ -1,9 +1,11 @@ -# $OpenBSD: Makefile,v 1.35 2011/01/10 18:23:33 sebastia Exp $ +# $OpenBSD: Makefile,v 1.36 2011/04/15 16:10:38 ajacoutot Exp $ COMMENT= GNUstep base library DISTNAME= gnustep-base-1.20.2 +REVISION= 0 + SHARED_LIBS= gnustep-base 3.2 # .1.20 CATEGORIES= devel @@ -13,7 +15,7 @@ SUBST_VARS= LIBDIR HOMEPAGE= http://www.gnustep.org/ WANTLIB += c crypto gcrypt m objc pthread ssl xml2 z ffi gmp xslt gnutls -WANTLIB += avahi-client avahi-common icudata icui18n icuuc +WANTLIB += avahi-client avahi-common icudata icui18n icuuc tasn1 .if ${MACHINE_ARCH} != "i386" && ${MACHINE_ARCH} != "amd64" WANTLIB += iberty diff --git a/x11/gtk-vnc/Makefile b/x11/gtk-vnc/Makefile index 63153f43671..70f98a70b1d 100644 --- a/x11/gtk-vnc/Makefile +++ b/x11/gtk-vnc/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.27 2011/04/07 08:11:06 jasper Exp $ +# $OpenBSD: Makefile,v 1.28 2011/04/15 16:10:38 ajacoutot Exp $ COMMENT-main= VNC viewer widget for GTK COMMENT-plugin= gtk-vnc browser plugin @@ -9,7 +9,8 @@ GNOME_VERSION= 0.4.3 PKGNAME-main= ${DISTNAME} PKGNAME-plugin= gtk-vnc-plugin-${GNOME_VERSION} -REVISION-main= 0 +REVISION-main= 1 +REVISION-plugin= 0 SHARED_LIBS += gtk-vnc-1.0 2.0 # .0.1 SHARED_LIBS += gvnc-1.0 0.0 # 0.1 @@ -34,7 +35,7 @@ WANTLIB= X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ glib-2.0 gmodule-2.0 gobject-2.0 gpg-error gthread-2.0 \ gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \ pcre pixman-1 png tasn1 z pthread-stubs xcb xcb-render \ - GL Xxf86vm drm xcb-shm + GL Xxf86vm drm xcb-shm gmp hogweed nettle MULTI_PACKAGES= -main -plugin @@ -43,7 +44,8 @@ BUILD_DEPENDS= ${RUN_DEPENDS-main} \ devel/xulrunner/1.9,-devel>=1.9.1 LIB_DEPENDS= security/gnutls \ - security/cyrus-sasl2 + security/cyrus-sasl2 \ + security/libgcrypt RUN_DEPENDS-main= x11/py-gtk2 WANTLIB-main += ${WANTLIB} c ffi pthread gnutls>=13 sasl2>=2