aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mk/bsd.ldap.mk8
-rw-r--r--databases/evolution-data-server/Makefile2
-rw-r--r--databases/glom/Makefile11
-rw-r--r--databases/glom/pkg-plist2
-rw-r--r--databases/ldb/Makefile2
-rw-r--r--databases/libgda4-bdb/Makefile2
-rw-r--r--databases/libgda4-bdb/pkg-plist1
-rw-r--r--databases/libgda4-jdbc/Makefile2
-rw-r--r--databases/libgda4-jdbc/pkg-plist1
-rw-r--r--databases/libgda4-ldap/Makefile2
-rw-r--r--databases/libgda4-ldap/pkg-plist1
-rw-r--r--databases/libgda4-mdb/Makefile2
-rw-r--r--databases/libgda4-mdb/pkg-plist1
-rw-r--r--databases/libgda4-mysql/Makefile2
-rw-r--r--databases/libgda4-mysql/pkg-plist1
-rw-r--r--databases/libgda4-postgresql/Makefile2
-rw-r--r--databases/libgda4-postgresql/pkg-plist1
-rw-r--r--databases/libgda4/Makefile17
-rw-r--r--databases/libgda4/pkg-plist23
-rw-r--r--databases/libgda5-bdb/Makefile2
-rw-r--r--databases/libgda5-bdb/pkg-plist2
-rw-r--r--databases/libgda5-jdbc/Makefile2
-rw-r--r--databases/libgda5-jdbc/pkg-plist2
-rw-r--r--databases/libgda5-ldap/Makefile2
-rw-r--r--databases/libgda5-ldap/pkg-plist2
-rw-r--r--databases/libgda5-mdb/Makefile2
-rw-r--r--databases/libgda5-mdb/pkg-plist2
-rw-r--r--databases/libgda5-mysql/Makefile2
-rw-r--r--databases/libgda5-mysql/pkg-plist2
-rw-r--r--databases/libgda5-postgresql/Makefile2
-rw-r--r--databases/libgda5-postgresql/pkg-plist2
-rw-r--r--databases/libgda5-ui/Makefile2
-rw-r--r--databases/libgda5-ui/pkg-plist7
-rw-r--r--databases/libgda5/Makefile19
-rw-r--r--databases/libgda5/pkg-plist23
-rw-r--r--databases/libgdamm/Makefile9
-rw-r--r--databases/libgdamm/pkg-plist1
-rw-r--r--databases/libgdamm5/Makefile7
-rw-r--r--databases/libgdamm5/pkg-plist1
-rw-r--r--databases/postgresql84-server/Makefile2
-rw-r--r--databases/postgresql91-server/Makefile2
-rw-r--r--databases/postgresql92-server/Makefile2
-rw-r--r--databases/virtuoso/Makefile2
-rw-r--r--deskutils/kdepim4/Makefile1
-rw-r--r--deskutils/kdepimlibs4/Makefile1
-rw-r--r--devel/anjuta/Makefile4
-rw-r--r--devel/anjuta/pkg-plist39
-rw-r--r--devel/apr1/Makefile2
-rw-r--r--devel/gconf2/Makefile2
-rw-r--r--devel/p5-Test-OpenLDAP/Makefile2
-rw-r--r--devel/ptlib/Makefile1
-rw-r--r--devel/pwlib/Makefile2
-rw-r--r--dns/bind910/Makefile2
-rw-r--r--dns/bind98/Makefile2
-rw-r--r--dns/bind99/Makefile2
-rw-r--r--dns/ldapdns/Makefile1
-rw-r--r--dns/powerdns-devel/Makefile17
-rw-r--r--dns/powerdns-devel/pkg-plist30
-rw-r--r--dns/powerdns/Makefile18
-rw-r--r--dns/powerdns/pkg-plist21
-rw-r--r--editors/libreoffice/Makefile2
-rw-r--r--emulators/wine-devel/Makefile2
-rw-r--r--emulators/wine/Makefile2
-rw-r--r--ftp/curl/Makefile2
-rw-r--r--ftp/pure-ftpd/Makefile2
-rw-r--r--irc/atheme-services/Makefile1
-rw-r--r--irc/inspircd/Makefile2
-rw-r--r--lang/hiphop-php/Makefile2
-rw-r--r--mail/alpine/Makefile2
-rw-r--r--mail/balsa/Makefile5
-rw-r--r--mail/claws-mail/Makefile2
-rw-r--r--mail/courier/Makefile2
-rw-r--r--mail/cyrus-imapd23/Makefile2
-rw-r--r--mail/cyrus-imapd24/Makefile2
-rw-r--r--mail/dbmail/Makefile2
-rw-r--r--mail/dbmail22/Makefile2
-rw-r--r--mail/dovecot/Makefile2
-rw-r--r--mail/dovecot2-pigeonhole/Makefile7
-rw-r--r--mail/dovecot2-pigeonhole/pkg-plist7
-rw-r--r--mail/dovecot2/Makefile4
-rw-r--r--mail/dovecot2/pkg-plist44
-rw-r--r--mail/dspam-devel/Makefile2
-rw-r--r--mail/dspam/Makefile2
-rw-r--r--mail/evolution-exchange/Makefile2
-rw-r--r--mail/evolution/Makefile2
-rw-r--r--mail/exim/Makefile2
-rw-r--r--mail/gnarwl/Makefile2
-rw-r--r--mail/milter-greylist-devel/Makefile1
-rw-r--r--mail/milter-greylist/Makefile1
-rw-r--r--mail/opendkim/Makefile2
-rw-r--r--mail/perdition/Makefile2
-rw-r--r--mail/postfix-current/Makefile1
-rw-r--r--mail/postfix/Makefile2
-rw-r--r--mail/postfix210/Makefile2
-rw-r--r--mail/postfix27/Makefile1
-rw-r--r--mail/postfix28/Makefile2
-rw-r--r--mail/postfix29/Makefile2
-rw-r--r--mail/prayer/Makefile2
-rw-r--r--mail/qmail-activedir/Makefile2
-rw-r--r--mail/qmail-ldap/Makefile2
-rw-r--r--mail/sendmail/Makefile1
-rw-r--r--mail/spamass-milter/Makefile1
-rw-r--r--mail/spmfilter/Makefile1
-rw-r--r--mail/sylpheed/Makefile1
-rw-r--r--mail/tpop3d/Makefile2
-rw-r--r--mail/vpopmail/Makefile1
-rw-r--r--math/gnumeric/Makefile6
-rw-r--r--math/gnumeric/pkg-plist45
-rw-r--r--misc/libhome/Makefile2
-rw-r--r--net-im/ekiga/Makefile2
-rw-r--r--net-im/jabberd/Makefile2
-rw-r--r--net-mgmt/monitoring-plugins/Makefile1
-rw-r--r--net-mgmt/nagios-plugins/Makefile1
-rw-r--r--net-mgmt/nefu/Makefile2
-rw-r--r--net-mgmt/xymon-server/Makefile2
-rw-r--r--net-mgmt/zabbix2-server/Makefile2
-rw-r--r--net-mgmt/zabbix22-server/Makefile1
-rw-r--r--net/asterisk/Makefile2
-rw-r--r--net/asterisk11/Makefile2
-rw-r--r--net/courier-authlib-ldap/Makefile1
-rw-r--r--net/echoping/Makefile2
-rw-r--r--net/fpc-ldap/Makefile2
-rw-r--r--net/freeradius2/Makefile2
-rw-r--r--net/freeradius3/Makefile2
-rw-r--r--net/gnu-dico/Makefile2
-rw-r--r--net/gq/Makefile2
-rw-r--r--net/isc-dhcp41-server/Makefile2
-rw-r--r--net/isc-dhcp42-server/Makefile2
-rw-r--r--net/isc-dhcp43-server/Makefile2
-rw-r--r--net/ldap2dns/Makefile2
-rw-r--r--net/ldapdiff/Makefile2
-rw-r--r--net/ldapscripts/Makefile2
-rw-r--r--net/lualdap/Makefile2
-rw-r--r--net/netatalk/Makefile2
-rw-r--r--net/netatalk3/Makefile1
-rw-r--r--net/nss-pam-ldapd/Makefile2
-rw-r--r--net/nss_ldap/Makefile2
-rw-r--r--net/ohphone/Makefile2
-rw-r--r--net/openh323/Makefile2
-rw-r--r--net/openldap24-server/Makefile28
-rw-r--r--net/openldap24-server/files/patch-build::top.mk11
-rw-r--r--net/openldap24-server/files/patch-shlib-version15
-rw-r--r--net/openldap24-server/files/patch-smbk5pwd-Makefile8
-rw-r--r--net/openldap24-server/pkg-plist34
-rw-r--r--net/openldap24-server/pkg-plist.client6
-rw-r--r--net/openradius/Makefile2
-rw-r--r--net/php5-ldap/Makefile1
-rw-r--r--net/php53-ldap/Makefile1
-rw-r--r--net/php55-ldap/Makefile1
-rw-r--r--net/proftpd-mod_ldap/Makefile1
-rw-r--r--net/proxy-suite/Makefile2
-rw-r--r--net/py-ldap2/Makefile1
-rw-r--r--net/ruby-ldap/Makefile2
-rw-r--r--net/samba36/Makefile2
-rw-r--r--net/samba4/Makefile2
-rw-r--r--net/samba41/Makefile2
-rw-r--r--net/ss5/Makefile2
-rw-r--r--net/x2goclient/Makefile1
-rw-r--r--net/xbone/Makefile2
-rw-r--r--net/yptransitd/Makefile2
-rw-r--r--news/nntpcache/Makefile2
-rw-r--r--security/clamav/Makefile1
-rw-r--r--security/cyrus-sasl2-ldapdb/Makefile2
-rw-r--r--security/cyrus-sasl2-saslauthd/Makefile2
-rw-r--r--security/dirmngr/Makefile2
-rw-r--r--security/gnupg/Makefile1
-rw-r--r--security/gnupg1/Makefile1
-rw-r--r--security/heimdal/Makefile2
-rw-r--r--security/ike/Makefile1
-rw-r--r--security/ipsec-tools/Makefile2
-rw-r--r--security/krb5-maint/Makefile2
-rw-r--r--security/krb5/Makefile2
-rw-r--r--security/openscep/Makefile2
-rw-r--r--security/openssh-portable/Makefile2
-rw-r--r--security/openvpn-auth-ldap/Makefile2
-rw-r--r--security/pam_ldap/Makefile2
-rw-r--r--security/pam_yubico/Makefile2
-rw-r--r--security/seahorse/Makefile2
-rw-r--r--security/sssd/Makefile2
-rw-r--r--security/strongswan/Makefile2
-rw-r--r--security/sudo/Makefile1
-rw-r--r--sysutils/adtool/Makefile1
-rw-r--r--sysutils/am-utils/Makefile2
-rw-r--r--sysutils/cpu/Makefile2
-rw-r--r--sysutils/ldapenter/Makefile1
-rw-r--r--sysutils/ldapvi/Makefile2
-rw-r--r--sysutils/lookupd_ldap/Makefile2
-rw-r--r--sysutils/msktutil/Makefile2
-rw-r--r--www/aws/Makefile2
-rw-r--r--www/c-icap/Makefile2
-rw-r--r--www/cacheboy16/Makefile2
-rw-r--r--www/cherokee/Makefile2
-rw-r--r--www/lighttpd/Makefile2
-rw-r--r--www/lusca-head/Makefile2
-rw-r--r--www/mod_cfg_ldap/Makefile2
-rw-r--r--www/mod_vhost_ldap/Makefile1
-rw-r--r--www/nginx-devel/Makefile1
-rw-r--r--www/nginx/Makefile2
-rw-r--r--www/sarg/Makefile2
-rw-r--r--www/squid/Makefile2
-rw-r--r--www/squid32/Makefile2
-rw-r--r--www/squid33/Makefile2
-rw-r--r--www/squidguard/Makefile2
-rw-r--r--www/tengine/Makefile2
-rw-r--r--www/xshttpd-devel/Makefile1
-rw-r--r--www/xshttpd/Makefile2
-rw-r--r--x11-toolkits/py-gnome-extras/Makefile4
-rw-r--r--x11-toolkits/py-gnome-extras/pkg-plist6
208 files changed, 279 insertions, 517 deletions
diff --git a/Mk/bsd.ldap.mk b/Mk/bsd.ldap.mk
index 013a76d8e359..6593baffc956 100644
--- a/Mk/bsd.ldap.mk
+++ b/Mk/bsd.ldap.mk
@@ -36,8 +36,8 @@ Database_Include_MAINTAINER= ports@FreeBSD.org
.if defined(USE_OPENLDAP)
DEFAULT_OPENLDAP_VER?= 24
# OpenLDAP client versions currently supported
-OPENLDAP23_LIBVER= 2.3
-OPENLDAP24_LIBVER= 2.4
+OPENLDAP23_LIB= libldap-2.3.so.2
+OPENLDAP24_LIB= libldap-2.4.so.2
.if exists(${LOCALBASE}/bin/ldapwhoami)
_OPENLDAP_VER!= ${LOCALBASE}/bin/ldapwhoami -VV 2>&1 | ${GREP} ldapwhoami | ${SED} -E 's/.*OpenLDAP: ldapwhoami (2)\.(3|4).*/\1\2/'
@@ -77,7 +77,7 @@ _OPENLDAP_FLAVOUR= -sasl
.endif
# And now we are checking if we can use it
-.if defined(OPENLDAP${OPENLDAP_VER}_LIBVER)
+.if defined(OPENLDAP${OPENLDAP_VER}_LIB)
# compatability shim
.if defined(BROKEN_WITH_OPENLDAP)
IGNORE_WITH_OPENLDAP=${BROKEN_WITH_OPENLDAP}
@@ -89,7 +89,7 @@ IGNORE= cannot install: doesn't work with OpenLDAP version: ${OPENLDAP_VER} (Do
. endif
. endfor
.endif # IGNORE_WITH_OPENLDAP
-LIB_DEPENDS+= libldap-${OPENLDAP${OPENLDAP_VER}_LIBVER}.so:${PORTSDIR}/net/openldap${OPENLDAP_VER}${_OPENLDAP_FLAVOUR}-client
+LIB_DEPENDS+= ${OPENLDAP${OPENLDAP_VER}_LIB}:${PORTSDIR}/net/openldap${OPENLDAP_VER}${_OPENLDAP_FLAVOUR}-client
.else
IGNORE= cannot install: unknown OpenLDAP version: ${OPENLDAP_VER}
.endif # Check for correct libs
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index bae9f77ea691..2e9b6372397f 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -4,7 +4,7 @@
PORTNAME= evolution-data-server
PORTVERSION= 2.32.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/databases/glom/Makefile b/databases/glom/Makefile
index 70bfaea76d74..0a62d8e24731 100644
--- a/databases/glom/Makefile
+++ b/databases/glom/Makefile
@@ -4,7 +4,7 @@
PORTNAME= glom
PORTVERSION= 1.12.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -26,12 +26,13 @@ BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-
RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/iso-codes.pc:${PORTSDIR}/misc/iso-codes \
${LOCALBASE}/libdata/pkgconfig/libgda-postgres-4.0.pc:${PORTSDIR}/databases/libgda4-postgresql
-USE_PYTHON= yes
GNU_CONFIGURE= yes
-USES= desktop-file-utils gettext gmake libtool:keepla pathfix \
+INSTALL_TARGET= install-strip
+USES= desktop-file-utils gettext gmake libtool pathfix \
pgsql pkgconfig shared-mime-info tar:bzip2
USE_GNOME= gnomedocutils gnomeprefix pygnomeextras
USE_LDCONFIG= yes
+USE_PYTHON= yes
INSTALLS_OMF= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
@@ -42,8 +43,4 @@ INSTALLS_ICONS= yes
BUILD_DEPENDS+= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-server
RUN_DEPENDS+= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER_NODOT}-server
-post-install:
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libglom-1.12.so.0.0.0
- @${STRIP_CMD} ${STAGEDIR}${PYTHON_SITELIBDIR}/glom_1_12.so
-
.include <bsd.port.mk>
diff --git a/databases/glom/pkg-plist b/databases/glom/pkg-plist
index dd2ecb5c2561..aceda92f6460 100644
--- a/databases/glom/pkg-plist
+++ b/databases/glom/pkg-plist
@@ -45,11 +45,9 @@ include/glom-1.12/libglom/init.h
include/glom-1.12/libglom/libglom_config.h
include/glom-1.12/libglom/sharedptr.h
include/glom-1.12/libglom/standard_table_prefs_fields.h
-lib/libglom-1.12.la
lib/libglom-1.12.so
lib/libglom-1.12.so.0
lib/libglom-1.12.so.0.0.0
-%%PYTHON_SITELIBDIR%%/glom_1_12.la
%%PYTHON_SITELIBDIR%%/glom_1_12.so
libdata/pkgconfig/glom-1.12.pc
share/applications/glom.desktop
diff --git a/databases/ldb/Makefile b/databases/ldb/Makefile
index a7884d472fc9..0f7becbee172 100644
--- a/databases/ldb/Makefile
+++ b/databases/ldb/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ldb
PORTVERSION= 1.1.16
-PORTREVISION= 0
+PORTREVISION= 1
PORTEPOCH= 0
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_SAMBA}
diff --git a/databases/libgda4-bdb/Makefile b/databases/libgda4-bdb/Makefile
index 144640eaae1d..3d3d338855d5 100644
--- a/databases/libgda4-bdb/Makefile
+++ b/databases/libgda4-bdb/Makefile
@@ -1,7 +1,7 @@
# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases gnome
PKGNAMESUFFIX= 4-bdb
diff --git a/databases/libgda4-bdb/pkg-plist b/databases/libgda4-bdb/pkg-plist
index c042ec6269f4..7975a9c5f4ab 100644
--- a/databases/libgda4-bdb/pkg-plist
+++ b/databases/libgda4-bdb/pkg-plist
@@ -1,5 +1,4 @@
lib/libgda-%%VERSION%%/providers/libgda-bdb.a
-lib/libgda-%%VERSION%%/providers/libgda-bdb.la
lib/libgda-%%VERSION%%/providers/libgda-bdb.so
libdata/pkgconfig/libgda-bdb-%%VERSION%%.pc
share/libgda-%%VERSION%%/bdb_specs_dsn.xml
diff --git a/databases/libgda4-jdbc/Makefile b/databases/libgda4-jdbc/Makefile
index c6b4c72f8edb..38b62752e3fb 100644
--- a/databases/libgda4-jdbc/Makefile
+++ b/databases/libgda4-jdbc/Makefile
@@ -1,7 +1,7 @@
# Created by: Koop Mast <kwm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases gnome
PKGNAMESUFFIX= 4-jdbc
diff --git a/databases/libgda4-jdbc/pkg-plist b/databases/libgda4-jdbc/pkg-plist
index 5022e14534b3..ce8daaecf6fb 100644
--- a/databases/libgda4-jdbc/pkg-plist
+++ b/databases/libgda4-jdbc/pkg-plist
@@ -1,7 +1,6 @@
bin/gda-list-jdbc-providers-%%VERSION%%
lib/libgda-%%VERSION%%/providers/gdaprovider-%%VERSION%%.jar
lib/libgda-%%VERSION%%/providers/libgda-jdbc.a
-lib/libgda-%%VERSION%%/providers/libgda-jdbc.la
lib/libgda-%%VERSION%%/providers/libgda-jdbc.so
libdata/pkgconfig/libgda-jdbc-%%VERSION%%.pc
share/libgda-%%VERSION%%/jdbc_specs_create_table.xml
diff --git a/databases/libgda4-ldap/Makefile b/databases/libgda4-ldap/Makefile
index 3b5aa427c5b1..b34366b5137b 100644
--- a/databases/libgda4-ldap/Makefile
+++ b/databases/libgda4-ldap/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
# $MCom: ports/databases/libgda4-ldap/Makefile,v 1.3 2011/10/15 15:18:35 kwm Exp $
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases gnome
PKGNAMESUFFIX= 4-ldap
diff --git a/databases/libgda4-ldap/pkg-plist b/databases/libgda4-ldap/pkg-plist
index a7e51a268510..915174d289aa 100644
--- a/databases/libgda4-ldap/pkg-plist
+++ b/databases/libgda4-ldap/pkg-plist
@@ -1,5 +1,4 @@
lib/libgda-%%VERSION%%/providers/libgda-ldap.a
-lib/libgda-%%VERSION%%/providers/libgda-ldap.la
lib/libgda-%%VERSION%%/providers/libgda-ldap.so
libdata/pkgconfig/libgda-ldap-%%VERSION%%.pc
share/libgda-%%VERSION%%/ldap_specs_auth.xml
diff --git a/databases/libgda4-mdb/Makefile b/databases/libgda4-mdb/Makefile
index 1f98f8dc4afc..0d48f7996543 100644
--- a/databases/libgda4-mdb/Makefile
+++ b/databases/libgda4-mdb/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
# $MCom: ports/databases/libgda4-mdb/Makefile,v 1.5 2012/03/13 01:34:31 mezz Exp $
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases gnome
PKGNAMESUFFIX= 4-mdb
diff --git a/databases/libgda4-mdb/pkg-plist b/databases/libgda4-mdb/pkg-plist
index 30b1df5d9f44..2e765f820c7e 100644
--- a/databases/libgda4-mdb/pkg-plist
+++ b/databases/libgda4-mdb/pkg-plist
@@ -1,5 +1,4 @@
lib/libgda-%%VERSION%%/providers/libgda-mdb.a
-lib/libgda-%%VERSION%%/providers/libgda-mdb.la
lib/libgda-%%VERSION%%/providers/libgda-mdb.so
libdata/pkgconfig/libgda-mdb-%%VERSION%%.pc
share/libgda-%%VERSION%%/mdb_specs_dsn.xml
diff --git a/databases/libgda4-mysql/Makefile b/databases/libgda4-mysql/Makefile
index dc815e5a8e59..945de9f0667c 100644
--- a/databases/libgda4-mysql/Makefile
+++ b/databases/libgda4-mysql/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
# $MCom: ports/databases/libgda4-mysql/Makefile,v 1.7 2011/10/15 15:18:36 kwm Exp $
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases gnome
PKGNAMESUFFIX= 4-mysql
diff --git a/databases/libgda4-mysql/pkg-plist b/databases/libgda4-mysql/pkg-plist
index b5ff48b6fe37..0013af55360e 100644
--- a/databases/libgda4-mysql/pkg-plist
+++ b/databases/libgda4-mysql/pkg-plist
@@ -1,5 +1,4 @@
lib/libgda-%%VERSION%%/providers/libgda-mysql.a
-lib/libgda-%%VERSION%%/providers/libgda-mysql.la
lib/libgda-%%VERSION%%/providers/libgda-mysql.so
libdata/pkgconfig/libgda-mysql-%%VERSION%%.pc
share/libgda-%%VERSION%%/mysql_specs_add_column.xml
diff --git a/databases/libgda4-postgresql/Makefile b/databases/libgda4-postgresql/Makefile
index e966b61630c6..1a5e36cf2680 100644
--- a/databases/libgda4-postgresql/Makefile
+++ b/databases/libgda4-postgresql/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
# $MCom: ports/databases/libgda4-postgresql/Makefile,v 1.7 2012/03/13 01:34:31 mezz Exp $
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases gnome
PKGNAMESUFFIX= 4-postgresql
diff --git a/databases/libgda4-postgresql/pkg-plist b/databases/libgda4-postgresql/pkg-plist
index 02ae080c90e0..8d183c20584f 100644
--- a/databases/libgda4-postgresql/pkg-plist
+++ b/databases/libgda4-postgresql/pkg-plist
@@ -1,5 +1,4 @@
lib/libgda-%%VERSION%%/providers/libgda-postgres.a
-lib/libgda-%%VERSION%%/providers/libgda-postgres.la
lib/libgda-%%VERSION%%/providers/libgda-postgres.so
libdata/pkgconfig/libgda-postgres-%%VERSION%%.pc
share/libgda-%%VERSION%%/postgres_specs_add_column.xml
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index dac3723fe5d1..f71ade652f97 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libgda
PORTVERSION= 4.2.12
-PORTREVISION?= 2
+PORTREVISION?= 3
CATEGORIES= databases gnome
MASTER_SITES= GNOME
PKGNAMESUFFIX?= 4
@@ -15,7 +15,7 @@ COMMENT?= Provides uniform access to different kinds of data sources
CONFLICTS= libgda5-ui-[0-9]*
-USE_XZ= yes
+USES= tar:xz
LIBGDA4_SLAVE?= no
.if !defined(REFERENCE_PORT)
@@ -23,11 +23,11 @@ LIBGDA4_SLAVE?= no
LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \
libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
-USE_AUTOTOOLS= libtool
-USES= pathfix gettext gmake pkgconfig
+USES+= gettext gmake libtool pathfix pkgconfig
USE_GNOME= gnomeprefix glib20 libxslt intlhack referencehack
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
+INSTALL_TARGET= install-strip
MAKE_JOBS_UNSAFE=yes
CONFIGURE_ARGS= --without-oracle \
--disable-crypto \
@@ -36,7 +36,7 @@ CONFIGURE_ARGS= --without-oracle \
--without-goocanvas \
--without-graphviz
CPPFLAGS+= -I${LOCALBASE}/include
-LDDFLAGS+= -L${LOCALBASE}/lib
+LIBS+= -L${LOCALBASE}/lib
.if ${LIBGDA4_SLAVE}=="no"
OPTIONS_DEFINE= UI SOUP KEYRING
@@ -142,7 +142,7 @@ post-patch:
.if ${LIBGDA4_SLAVE}!="no"
#. for d in msql firebird odbc freetds mdb ldap mysql sqlite postgres
. for d in bdb jdbc mdb mysql postgres reuseable/postgres reuseable/mysql ldap
- @${REINPLACE_CMD} -e 's|$$(top_builddir)/libgda/libgda-4.0.la|${LOCALBASE}/lib/libgda-4.0.la|g' \
+ @${REINPLACE_CMD} -e 's|$$(top_builddir)/libgda/libgda-4.0.la|-lgda-4.0|g' \
${WRKSRC}/providers/${d}/Makefile.in
. endfor
.endif
@@ -158,9 +158,8 @@ pre-build:
.if ${LIBGDA4_SLAVE}=="no"
post-install:
- ${INSTALL_DATA} ${WRKSRC}/data/config \
- ${STAGEDIR}${PREFIX}/etc/libgda-${VERSION}/config.default
- @${RM} -f ${STAGEDIR}${PREFIX}/etc/libgda-${VERSION}/config
+ ${MV} ${STAGEDIR}${PREFIX}/etc/libgda-${VERSION}/config \
+ ${STAGEDIR}${PREFIX}/etc/libgda-${VERSION}/config.sample
.endif
.include <bsd.port.mk>
diff --git a/databases/libgda4/pkg-plist b/databases/libgda4/pkg-plist
index d9ba27189abd..7202d2d3b23c 100644
--- a/databases/libgda4/pkg-plist
+++ b/databases/libgda4/pkg-plist
@@ -8,9 +8,7 @@ bin/gda-sql
bin/gda-sql-%%VERSION%%
bin/gda-test-connection-%%VERSION%%
%%UI%%bin/gdaui-demo-%%VERSION%%
-@unexec if cmp -s %D/etc/libgda-%%VERSION%%/config %D/etc/libgda-%%VERSION%%/config.default; then rm -f %D/etc/libgda-%%VERSION%%/config; fi
-etc/libgda-%%VERSION%%/config.default
-@exec [ -f %B/config ] || cp %B/%f %B/config
+@sample etc/libgda-%%VERSION%%/config.sample
etc/libgda-%%VERSION%%/sales_test.db
include/libgda-%%VERSION%%/libgda-report/gda-report-docbook-document.h
include/libgda-%%VERSION%%/libgda-report/gda-report-document.h
@@ -139,35 +137,32 @@ include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-data-model.h
include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-hub.h
include/libgda-%%VERSION%%/libgda/virtual/libgda-virtual.h
lib/libgda-%%VERSION%%.a
-lib/libgda-%%VERSION%%.la
lib/libgda-%%VERSION%%.so
-lib/libgda-%%VERSION%%.so.5
+lib/libgda-%%VERSION%%.so.4
+lib/libgda-%%VERSION%%.so.4.1.0
%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-filesel-spec.xml
%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-password.xml
%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec.xml
%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec_string.xml
%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-text-spec.xml
%%UI%%lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.a
-%%UI%%lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.la
%%UI%%lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.so
%%WEB%%lib/libgda-%%VERSION%%/providers/libgda-web.a
-%%WEB%%lib/libgda-%%VERSION%%/providers/libgda-web.la
%%WEB%%lib/libgda-%%VERSION%%/providers/libgda-web.so
lib/libgda-%%VERSION%%/providers/libgda-sqlite.a
-lib/libgda-%%VERSION%%/providers/libgda-sqlite.la
lib/libgda-%%VERSION%%/providers/libgda-sqlite.so
lib/libgda-report-%%VERSION%%.a
-lib/libgda-report-%%VERSION%%.la
lib/libgda-report-%%VERSION%%.so
-lib/libgda-report-%%VERSION%%.so.5
+lib/libgda-report-%%VERSION%%.so.4
+lib/libgda-report-%%VERSION%%.so.4.1.0
%%UI%%lib/libgda-ui-%%VERSION%%.a
-%%UI%%lib/libgda-ui-%%VERSION%%.la
%%UI%%lib/libgda-ui-%%VERSION%%.so
-%%UI%%lib/libgda-ui-%%VERSION%%.so.5
+%%UI%%lib/libgda-ui-%%VERSION%%.so.4
+%%UI%%lib/libgda-ui-%%VERSION%%.so.4.1.0
lib/libgda-xslt-%%VERSION%%.a
-lib/libgda-xslt-%%VERSION%%.la
lib/libgda-xslt-%%VERSION%%.so
-lib/libgda-xslt-%%VERSION%%.so.5
+lib/libgda-xslt-%%VERSION%%.so.4
+lib/libgda-xslt-%%VERSION%%.so.4.1.0
libdata/pkgconfig/libgda-%%VERSION%%.pc
libdata/pkgconfig/libgda-report-%%VERSION%%.pc
libdata/pkgconfig/libgda-sqlite-%%VERSION%%.pc
diff --git a/databases/libgda5-bdb/Makefile b/databases/libgda5-bdb/Makefile
index 2fee4faaf509..e9c03be310cf 100644
--- a/databases/libgda5-bdb/Makefile
+++ b/databases/libgda5-bdb/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
# $MCom: ports/trunk/databases/libgda5-bdb/Makefile 18393 2013-04-26 21:23:07Z kwm $
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases gnome
PKGNAMESUFFIX= 5-bdb
diff --git a/databases/libgda5-bdb/pkg-plist b/databases/libgda5-bdb/pkg-plist
index c042ec6269f4..d8aee73c0c66 100644
--- a/databases/libgda5-bdb/pkg-plist
+++ b/databases/libgda5-bdb/pkg-plist
@@ -1,5 +1,3 @@
-lib/libgda-%%VERSION%%/providers/libgda-bdb.a
-lib/libgda-%%VERSION%%/providers/libgda-bdb.la
lib/libgda-%%VERSION%%/providers/libgda-bdb.so
libdata/pkgconfig/libgda-bdb-%%VERSION%%.pc
share/libgda-%%VERSION%%/bdb_specs_dsn.xml
diff --git a/databases/libgda5-jdbc/Makefile b/databases/libgda5-jdbc/Makefile
index cf7033ecffdc..443e37eee79f 100644
--- a/databases/libgda5-jdbc/Makefile
+++ b/databases/libgda5-jdbc/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
# $MCom: ports/trunk/databases/libgda5-jdbc/Makefile 18393 2013-04-26 21:23:07Z kwm $
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases gnome
PKGNAMESUFFIX= 5-jdbc
diff --git a/databases/libgda5-jdbc/pkg-plist b/databases/libgda5-jdbc/pkg-plist
index 5022e14534b3..556d7059cc9c 100644
--- a/databases/libgda5-jdbc/pkg-plist
+++ b/databases/libgda5-jdbc/pkg-plist
@@ -1,7 +1,5 @@
bin/gda-list-jdbc-providers-%%VERSION%%
lib/libgda-%%VERSION%%/providers/gdaprovider-%%VERSION%%.jar
-lib/libgda-%%VERSION%%/providers/libgda-jdbc.a
-lib/libgda-%%VERSION%%/providers/libgda-jdbc.la
lib/libgda-%%VERSION%%/providers/libgda-jdbc.so
libdata/pkgconfig/libgda-jdbc-%%VERSION%%.pc
share/libgda-%%VERSION%%/jdbc_specs_create_table.xml
diff --git a/databases/libgda5-ldap/Makefile b/databases/libgda5-ldap/Makefile
index e4975456924e..dc313c234759 100644
--- a/databases/libgda5-ldap/Makefile
+++ b/databases/libgda5-ldap/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
# $MCom: ports/trunk/databases/libgda5-ldap/Makefile 18610 2013-06-30 16:33:05Z marcus $
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases gnome
PKGNAMESUFFIX= 5-ldap
diff --git a/databases/libgda5-ldap/pkg-plist b/databases/libgda5-ldap/pkg-plist
index a7e51a268510..edf6e110ba24 100644
--- a/databases/libgda5-ldap/pkg-plist
+++ b/databases/libgda5-ldap/pkg-plist
@@ -1,5 +1,3 @@
-lib/libgda-%%VERSION%%/providers/libgda-ldap.a
-lib/libgda-%%VERSION%%/providers/libgda-ldap.la
lib/libgda-%%VERSION%%/providers/libgda-ldap.so
libdata/pkgconfig/libgda-ldap-%%VERSION%%.pc
share/libgda-%%VERSION%%/ldap_specs_auth.xml
diff --git a/databases/libgda5-mdb/Makefile b/databases/libgda5-mdb/Makefile
index e0d8b1c32668..d59ccfba3607 100644
--- a/databases/libgda5-mdb/Makefile
+++ b/databases/libgda5-mdb/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
# $MCom: ports/trunk/databases/libgda5-mdb/Makefile 18610 2013-06-30 16:33:05Z marcus $
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases gnome
PKGNAMESUFFIX= 5-mdb
diff --git a/databases/libgda5-mdb/pkg-plist b/databases/libgda5-mdb/pkg-plist
index 30b1df5d9f44..2300d6e2fd4e 100644
--- a/databases/libgda5-mdb/pkg-plist
+++ b/databases/libgda5-mdb/pkg-plist
@@ -1,5 +1,3 @@
-lib/libgda-%%VERSION%%/providers/libgda-mdb.a
-lib/libgda-%%VERSION%%/providers/libgda-mdb.la
lib/libgda-%%VERSION%%/providers/libgda-mdb.so
libdata/pkgconfig/libgda-mdb-%%VERSION%%.pc
share/libgda-%%VERSION%%/mdb_specs_dsn.xml
diff --git a/databases/libgda5-mysql/Makefile b/databases/libgda5-mysql/Makefile
index a7e0a9daa248..dc40a5da7812 100644
--- a/databases/libgda5-mysql/Makefile
+++ b/databases/libgda5-mysql/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
# $MCom: ports/trunk/databases/libgda5-mysql/Makefile 18610 2013-06-30 16:33:05Z marcus $
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases gnome
PKGNAMESUFFIX= 5-mysql
diff --git a/databases/libgda5-mysql/pkg-plist b/databases/libgda5-mysql/pkg-plist
index b5ff48b6fe37..2fc6e5e35c38 100644
--- a/databases/libgda5-mysql/pkg-plist
+++ b/databases/libgda5-mysql/pkg-plist
@@ -1,5 +1,3 @@
-lib/libgda-%%VERSION%%/providers/libgda-mysql.a
-lib/libgda-%%VERSION%%/providers/libgda-mysql.la
lib/libgda-%%VERSION%%/providers/libgda-mysql.so
libdata/pkgconfig/libgda-mysql-%%VERSION%%.pc
share/libgda-%%VERSION%%/mysql_specs_add_column.xml
diff --git a/databases/libgda5-postgresql/Makefile b/databases/libgda5-postgresql/Makefile
index 7b0302ccb605..0f529c322aa9 100644
--- a/databases/libgda5-postgresql/Makefile
+++ b/databases/libgda5-postgresql/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
# $MCom: ports/trunk/databases/libgda5-postgresql/Makefile 18610 2013-06-30 16:33:05Z marcus $
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases gnome
PKGNAMESUFFIX= 5-postgresql
diff --git a/databases/libgda5-postgresql/pkg-plist b/databases/libgda5-postgresql/pkg-plist
index 02ae080c90e0..e25ad9eb123d 100644
--- a/databases/libgda5-postgresql/pkg-plist
+++ b/databases/libgda5-postgresql/pkg-plist
@@ -1,5 +1,3 @@
-lib/libgda-%%VERSION%%/providers/libgda-postgres.a
-lib/libgda-%%VERSION%%/providers/libgda-postgres.la
lib/libgda-%%VERSION%%/providers/libgda-postgres.so
libdata/pkgconfig/libgda-postgres-%%VERSION%%.pc
share/libgda-%%VERSION%%/postgres_specs_add_column.xml
diff --git a/databases/libgda5-ui/Makefile b/databases/libgda5-ui/Makefile
index 0801eab4fefb..dd27a4c787ac 100644
--- a/databases/libgda5-ui/Makefile
+++ b/databases/libgda5-ui/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
# $MCom: ports/trunk/databases/libgda5-ui/Makefile 17268 2013-04-01 05:13:11Z marcus $
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases gnome
PKGNAMESUFFIX= 5-ui
diff --git a/databases/libgda5-ui/pkg-plist b/databases/libgda5-ui/pkg-plist
index e15fff798fac..30871a8ce7b7 100644
--- a/databases/libgda5-ui/pkg-plist
+++ b/databases/libgda5-ui/pkg-plist
@@ -34,13 +34,10 @@ lib/libgda-%%VERSION%%/plugins/gdaui-entry-password.xml
lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec.xml
lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec_string.xml
lib/libgda-%%VERSION%%/plugins/gdaui-entry-text-spec.xml
-lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.a
-lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.la
lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.so
-lib/libgda-ui-%%VERSION%%.a
-lib/libgda-ui-%%VERSION%%.la
lib/libgda-ui-%%VERSION%%.so
-lib/libgda-ui-%%VERSION%%.so.5
+lib/libgda-ui-%%VERSION%%.so.4
+lib/libgda-ui-%%VERSION%%.so.4.1.0
libdata/pkgconfig/libgda-ui-%%VERSION%%.pc
share/applications/gda-browser-%%VERSION%%.desktop
share/applications/gda-control-center-%%VERSION%%.desktop
diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile
index 976c27157c7a..0648e4f31533 100644
--- a/databases/libgda5/Makefile
+++ b/databases/libgda5/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libgda
PORTVERSION?= 5.0.3
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= databases gnome
MASTER_SITES= GNOME
PKGNAMESUFFIX?= 5
@@ -13,7 +13,7 @@ DIST_SUBDIR= gnome3
MAINTAINER?= gnome@FreeBSD.org
COMMENT?= Provides uniform access to different kinds of data sources
-USE_XZ= yes
+USES= tar:xz
LIBGDA5_SLAVE?= no
.if !defined(REFERENCE_PORT)
@@ -22,18 +22,18 @@ LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \
libsoup-2.4.so:${PORTSDIR}/devel/libsoup \
libjson-glib-1.0.so:${PORTSDIR}/devel/json-glib
-USE_AUTOTOOLS= libtool
-USES= gettext gmake pathfix pkgconfig
+USES+= gettext gmake libtool pathfix pkgconfig
USE_GNOME= gnomeprefix glib20 libxslt intlhack referencehack
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
+INSTALL_TARGET= install-strip
MAKE_JOBS_UNSAFE=yes
CONFIGURE_ARGS= --without-oracle \
--disable-crypto \
--disable-default-binary \
--disable-introspection
CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
+LIBS+= -L${LOCALBASE}/lib
.include <bsd.port.options.mk>
@@ -109,8 +109,8 @@ post-patch:
${WRKSRC}/providers/bdb/gda-bdb-test.c
.if ${LIBGDA5_SLAVE}!="no"
@${FIND} ${WRKSRC} -name Makefile.in -exec ${REINPLACE_CMD} \
- -e 's|$$(top_builddir)/libgda/libgda-5.0.la|${LOCALBASE}/lib/libgda-5.0.la|g' \
- -e 's|../libgda/libgda-5.0.la|${LOCALBASE}/lib/libgda-5.0.la|g' \
+ -e 's|$$(top_builddir)/libgda/libgda-5.0.la|-lgda-5.0|g' \
+ -e 's|../libgda/libgda-5.0.la|-lgda-5.0|g' \
{} \;
.endif
@@ -129,9 +129,8 @@ pre-build:
.if ${LIBGDA5_SLAVE}==no
post-install:
- ${INSTALL_DATA} ${WRKSRC}/data/config \
- ${STAGEDIR}${PREFIX}/etc/libgda-${VERSION}/config.default
- @${RM} -f ${STAGEDIR}${PREFIX}/etc/libgda-${VERSION}/config
+ ${MV} ${STAGEDIR}${PREFIX}/etc/libgda-${VERSION}/config \
+ ${STAGEDIR}${PREFIX}/etc/libgda-${VERSION}/config.sample
.endif
.if ${LIBGDA5_SLAVE}==ui
post-install:
diff --git a/databases/libgda5/pkg-plist b/databases/libgda5/pkg-plist
index ea4251e7f230..bc796402f904 100644
--- a/databases/libgda5/pkg-plist
+++ b/databases/libgda5/pkg-plist
@@ -2,9 +2,7 @@ bin/gda-list-config-%%VERSION%%
bin/gda-list-server-op-%%VERSION%%
bin/gda-sql-%%VERSION%%
bin/gda-test-connection-%%VERSION%%
-@unexec if cmp -s %D/etc/libgda-%%VERSION%%/config %D/etc/libgda-%%VERSION%%/config.default; then rm -f %D/etc/libgda-%%VERSION%%/config; fi
-etc/libgda-%%VERSION%%/config.default
-@exec [ -f %B/config ] || cp %B/%f %B/config
+@sample etc/libgda-%%VERSION%%/config.sample
etc/libgda-%%VERSION%%/sales_test.db
include/libgda-%%VERSION%%/libgda-report/gda-report-docbook-document.h
include/libgda-%%VERSION%%/libgda-report/gda-report-document.h
@@ -105,24 +103,17 @@ include/libgda-%%VERSION%%/libgda/virtual/gda-virtual-provider.h
include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-data-model.h
include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-hub.h
include/libgda-%%VERSION%%/libgda/virtual/libgda-virtual.h
-lib/libgda-%%VERSION%%.a
-lib/libgda-%%VERSION%%.la
lib/libgda-%%VERSION%%.so
-lib/libgda-%%VERSION%%.so.5
-lib/libgda-%%VERSION%%/providers/libgda-web.a
-lib/libgda-%%VERSION%%/providers/libgda-web.la
+lib/libgda-%%VERSION%%.so.4
+lib/libgda-%%VERSION%%.so.4.1.0
lib/libgda-%%VERSION%%/providers/libgda-web.so
-lib/libgda-%%VERSION%%/providers/libgda-sqlite.a
-lib/libgda-%%VERSION%%/providers/libgda-sqlite.la
lib/libgda-%%VERSION%%/providers/libgda-sqlite.so
-lib/libgda-report-%%VERSION%%.a
-lib/libgda-report-%%VERSION%%.la
lib/libgda-report-%%VERSION%%.so
-lib/libgda-report-%%VERSION%%.so.5
-lib/libgda-xslt-%%VERSION%%.a
-lib/libgda-xslt-%%VERSION%%.la
+lib/libgda-report-%%VERSION%%.so.4
+lib/libgda-report-%%VERSION%%.so.4.1.0
lib/libgda-xslt-%%VERSION%%.so
-lib/libgda-xslt-%%VERSION%%.so.5
+lib/libgda-xslt-%%VERSION%%.so.4
+lib/libgda-xslt-%%VERSION%%.so.4.1.0
libdata/pkgconfig/libgda-%%VERSION%%.pc
libdata/pkgconfig/libgda-report-%%VERSION%%.pc
libdata/pkgconfig/libgda-sqlite-%%VERSION%%.pc
diff --git a/databases/libgdamm/Makefile b/databases/libgdamm/Makefile
index 98c88e305f10..9976bcdbce7d 100644
--- a/databases/libgdamm/Makefile
+++ b/databases/libgdamm/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libgdamm
PORTVERSION= 3.99.21
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -15,14 +15,11 @@ COMMENT= C++ wrapper for libgda4 library
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-USE_BZIP2= yes
-USES= gmake libtool:keepla pathfix pkgconfig
+USES= gmake libtool pathfix pkgconfig tar:bzip2
USE_GNOME= glibmm libgda4
GNU_CONFIGURE= yes
+INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
CONFIGURE_ARGS= --disable-documentation
-post-install:
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgdamm-4.0.so.12.0.0
-
.include <bsd.port.mk>
diff --git a/databases/libgdamm/pkg-plist b/databases/libgdamm/pkg-plist
index c38c79da770c..6de69e8f9547 100644
--- a/databases/libgdamm/pkg-plist
+++ b/databases/libgdamm/pkg-plist
@@ -77,7 +77,6 @@ include/libgdamm-4.0/libgdamm/throw_exception.h
include/libgdamm-4.0/libgdamm/value.h
include/libgdamm-4.0/libgdamm/wrap_init.h
include/libgdamm-4.0/libgdamm/xatransaction.h
-lib/libgdamm-4.0.la
lib/libgdamm-4.0.so
lib/libgdamm-4.0.so.12
lib/libgdamm-4.0.so.12.0.0
diff --git a/databases/libgdamm5/Makefile b/databases/libgdamm5/Makefile
index 45ef1d976981..3c00ce2f64f8 100644
--- a/databases/libgdamm5/Makefile
+++ b/databases/libgdamm5/Makefile
@@ -4,7 +4,7 @@
PORTNAME= libgdamm
PORTVERSION= 4.99.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -14,13 +14,12 @@ COMMENT= C++ wrapper for libgda5 library
BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4
-LATEST_LINK= libgdamm5
-
USES= gmake libtool pathfix pkgconfig tar:xz
USE_GNOME= libgda5 glibmm
GNU_CONFIGURE= yes
+INSTALL_TARGET= install-strip
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --enable-static --disable-documentation
+CONFIGURE_ARGS= --disable-documentation
OPTIONS_DEFINE= BDB
diff --git a/databases/libgdamm5/pkg-plist b/databases/libgdamm5/pkg-plist
index eda134ba7536..b6b22b98acec 100644
--- a/databases/libgdamm5/pkg-plist
+++ b/databases/libgdamm5/pkg-plist
@@ -79,7 +79,6 @@ include/libgdamm-5.0/libgdamm/throw_exception.h
include/libgdamm-5.0/libgdamm/value.h
include/libgdamm-5.0/libgdamm/wrap_init.h
include/libgdamm-5.0/libgdamm/xatransaction.h
-lib/libgdamm-5.0.a
lib/libgdamm-5.0.so
lib/libgdamm-5.0.so.13
lib/libgdamm-5.0.so.13.0.0
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 1e8bc1dfc093..a574c2a1bbb8 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= postgresql
DISTVERSION?= 8.4.21
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES?= databases
MASTER_SITES= PGSQL
MASTER_SITE_SUBDIR= source/v${DISTVERSION}
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 6d03be717250..900877f7db59 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= postgresql
DISTVERSION?= 9.1.13
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES?= databases
MASTER_SITES= PGSQL
MASTER_SITE_SUBDIR= source/v${DISTVERSION}
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index de3d2df219bf..56824d09387d 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= postgresql
DISTVERSION?= 9.2.8
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES?= databases
MASTER_SITES= PGSQL
MASTER_SITE_SUBDIR= source/v${DISTVERSION}
diff --git a/databases/virtuoso/Makefile b/databases/virtuoso/Makefile
index c60c9829f64f..f8d57a90dc27 100644
--- a/databases/virtuoso/Makefile
+++ b/databases/virtuoso/Makefile
@@ -3,7 +3,7 @@
PORTNAME= virtuoso
PORTVERSION= 6.1.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= databases
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-opensource-${PORTVERSION}
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 3c8344545045..21bc56bfc522 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -3,6 +3,7 @@
PORTNAME= kdepim
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
diff --git a/deskutils/kdepimlibs4/Makefile b/deskutils/kdepimlibs4/Makefile
index 97fd16ac7e0f..fe590547b00c 100644
--- a/deskutils/kdepimlibs4/Makefile
+++ b/deskutils/kdepimlibs4/Makefile
@@ -3,6 +3,7 @@
PORTNAME= kdepimlibs
PORTVERSION= ${KDE4_VERSION}
+PORTREVISION= 1
CATEGORIES= deskutils kde
MASTER_SITES= KDE/${KDE4_BRANCH}/${PORTVERSION}/src
DIST_SUBDIR= KDE/${PORTVERSION}
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 0889890955bb..fffac325b45e 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -4,7 +4,7 @@
PORTNAME= anjuta
PORTVERSION= 2.32.1.1
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= devel gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
@@ -30,7 +30,7 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash \
CONFLICTS= anjuta-3.[0-9]*
-USES= desktop-file-utils gmake gettext libtool:keepla pathfix \
+USES= desktop-file-utils gmake gettext libtool pathfix \
perl5 pkgconfig shared-mime-info shebangfix tar:bzip2
INSTALLS_OMF= yes
INSTALLS_ICONS= yes
diff --git a/devel/anjuta/pkg-plist b/devel/anjuta/pkg-plist
index e447357719a9..dca1f0205b73 100644
--- a/devel/anjuta/pkg-plist
+++ b/devel/anjuta/pkg-plist
@@ -135,90 +135,51 @@ lib/anjuta/git.plugin
lib/anjuta/js_debugger.plugin
lib/anjuta/js-support-plugin.plugin
lib/anjuta/language-manager.plugin
-lib/anjuta/libanjuta-build-basic-autotools.la
lib/anjuta/libanjuta-build-basic-autotools.so
-lib/anjuta/libanjuta-class-gen.la
lib/anjuta/libanjuta-class-gen.so
-lib/anjuta/libanjuta-cvs-plugin.la
lib/anjuta/libanjuta-cvs-plugin.so
-lib/anjuta/libanjuta-debug-manager.la
lib/anjuta/libanjuta-debug-manager.so
-%%DEVHELP%%lib/anjuta/libanjuta-devhelp.la
%%DEVHELP%%lib/anjuta/libanjuta-devhelp.so
-lib/anjuta/libanjuta-document-manager.la
lib/anjuta/libanjuta-document-manager.so
-lib/anjuta/libanjuta-file-wizard.la
lib/anjuta/libanjuta-file-wizard.so
-lib/anjuta/libanjuta-gdb.la
lib/anjuta/libanjuta-gdb.so
-lib/anjuta/libanjuta-git.la
lib/anjuta/libanjuta-git.so
-lib/anjuta/libanjuta-glade.la
lib/anjuta/libanjuta-glade.so
-lib/anjuta/libanjuta-gtodo.la
lib/anjuta/libanjuta-gtodo.so
-lib/anjuta/libanjuta-language-cpp-java.la
lib/anjuta/libanjuta-language-cpp-java.so
-lib/anjuta/libanjuta-loader.la
lib/anjuta/libanjuta-loader.so
-lib/anjuta/libanjuta-message-view.la
lib/anjuta/libanjuta-message-view.so
-lib/anjuta/libanjuta-patch.la
lib/anjuta/libanjuta-patch.so
-lib/anjuta/libanjuta-project-import.la
lib/anjuta/libanjuta-project-import.so
-lib/anjuta/libanjuta-project-manager.la
lib/anjuta/libanjuta-project-manager.so
-lib/anjuta/libanjuta-project-wizard.la
lib/anjuta/libanjuta-project-wizard.so
-lib/anjuta/libanjuta-python-loader.la
lib/anjuta/libanjuta-python-loader.so
-lib/anjuta/libanjuta-run-program.la
lib/anjuta/libanjuta-run-program.so
-lib/anjuta/libanjuta-search.la
lib/anjuta/libanjuta-search.so
-lib/anjuta/libanjuta-snippets-manager.la
lib/anjuta/libanjuta-snippets-manager.so
-lib/anjuta/libanjuta-sourceview.la
lib/anjuta/libanjuta-sourceview.so
-lib/anjuta/libanjuta-starter.la
lib/anjuta/libanjuta-starter.so
-%%SVN%%lib/anjuta/libanjuta-subversion.la
%%SVN%%lib/anjuta/libanjuta-subversion.so
-lib/anjuta/libanjuta-symbol-db.la
lib/anjuta/libanjuta-symbol-db.so
-lib/anjuta/libanjuta-terminal.la
lib/anjuta/libanjuta-terminal.so
-lib/anjuta/libanjuta-tools.la
lib/anjuta/libanjuta-tools.so
-lib/anjuta/libdir-project.la
lib/anjuta/libdir-project.so
-lib/anjuta/libfile-manager.la
lib/anjuta/libfile-manager.so
-lib/anjuta/libgbf-am.la
lib/anjuta/libgbf-am.so
-lib/anjuta/libgbf-mkfile.la
lib/anjuta/libgbf-mkfile.so
-lib/anjuta/libjs_debugger.la
lib/anjuta/libjs_debugger.so
-lib/anjuta/libjs-support-plugin.la
lib/anjuta/libjs-support-plugin.so
-lib/anjuta/liblanguage-manager.la
lib/anjuta/liblanguage-manager.so
-lib/anjuta/libpython_plugin.la
lib/anjuta/libpython_plugin.so
lib/anjuta/libpython_plugin.so.0
lib/anjuta/libpython_plugin.so.0.0.0
lib/anjuta/python-plugin.plugin
lib/anjuta/sourceview.plugin
lib/anjuta/symbol-db.plugin
-lib/glade3/modules/libgladeanjuta.la
lib/glade3/modules/libgladeanjuta.so
-lib/libanjuta.la
lib/libanjuta.so
lib/libanjuta.so.0
lib/libanjuta.so.0.0.0
-lib/libanjuta-foocanvas.la
lib/libanjuta-foocanvas.so
lib/libanjuta-foocanvas.so.0
lib/libanjuta-foocanvas.so.0.0.0
diff --git a/devel/apr1/Makefile b/devel/apr1/Makefile
index fa375208385e..fd6f6903df1f 100644
--- a/devel/apr1/Makefile
+++ b/devel/apr1/Makefile
@@ -3,7 +3,7 @@
PORTNAME= apr
PORTVERSION= ${APR_VERSION}.${APU_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_APACHE}
MASTER_SITE_SUBDIR= apr
diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 8fb9f838888b..dc6b4d00bc47 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gconf2
PORTVERSION= 2.32.0
-PORTREVISION?= 4
+PORTREVISION?= 5
CATEGORIES= devel gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/GConf/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/devel/p5-Test-OpenLDAP/Makefile b/devel/p5-Test-OpenLDAP/Makefile
index cfe34ff8f170..6c39fa5f8fed 100644
--- a/devel/p5-Test-OpenLDAP/Makefile
+++ b/devel/p5-Test-OpenLDAP/Makefile
@@ -2,7 +2,7 @@
PORTNAME= Test-OpenLDAP
PORTVERSION= 0.05
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= devel perl5
MASTER_SITES= CPAN
PKGNAMEPREFIX= p5-
diff --git a/devel/ptlib/Makefile b/devel/ptlib/Makefile
index 2b2a832fc460..778ce5bcbff2 100644
--- a/devel/ptlib/Makefile
+++ b/devel/ptlib/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ptlib
PORTVERSION= 2.10.10
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= GNOME
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 897f3cff0f0c..94dc9fec6528 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pwlib
PORTVERSION= 1.12.0
-PORTREVISION= 8
+PORTREVISION= 9
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= SF/openh323/${PORTNAME}/${PORTVERSION}
diff --git a/dns/bind910/Makefile b/dns/bind910/Makefile
index dcd86460e71d..086d82e95d4f 100644
--- a/dns/bind910/Makefile
+++ b/dns/bind910/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bind
PORTVERSION= ${ISCVERSION:S/-P/P/}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= dns net ipv6
MASTER_SITES= ISC/bind9/${ISCVERSION}
PKGNAMESUFFIX?= 910
diff --git a/dns/bind98/Makefile b/dns/bind98/Makefile
index af7e6ee3de23..c8455037a2d0 100644
--- a/dns/bind98/Makefile
+++ b/dns/bind98/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bind
PORTVERSION= ${ISCVERSION:S/-P/P/}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= dns net ipv6
MASTER_SITES= ISC/bind9/${ISCVERSION}
PKGNAMESUFFIX= 98
diff --git a/dns/bind99/Makefile b/dns/bind99/Makefile
index d64f1487a4a6..29648301efbd 100644
--- a/dns/bind99/Makefile
+++ b/dns/bind99/Makefile
@@ -2,7 +2,7 @@
PORTNAME= bind
PORTVERSION= ${ISCVERSION:S/-P/P/}
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= dns net ipv6
MASTER_SITES= ISC/bind9/${ISCVERSION}
PKGNAMESUFFIX= 99
diff --git a/dns/ldapdns/Makefile b/dns/ldapdns/Makefile
index 5f279a75d506..c42273fdfd68 100644
--- a/dns/ldapdns/Makefile
+++ b/dns/ldapdns/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ldapdns
PORTVERSION= 2.07
+PORTREVISION= 1
CATEGORIES= dns
MASTER_SITES= http://bsdforge.com/projects/source/dns/ldapdns/
diff --git a/dns/powerdns-devel/Makefile b/dns/powerdns-devel/Makefile
index 146470b4db53..3fc55a446956 100644
--- a/dns/powerdns-devel/Makefile
+++ b/dns/powerdns-devel/Makefile
@@ -2,7 +2,7 @@
PORTNAME= powerdns
PORTVERSION= 3.3.1
-PORTREVISION?= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= dns ipv6
PKGNAMESUFFIX= -devel
@@ -25,13 +25,11 @@ GH_COMMIT= 8e1c18b
CONFLICTS= powerdns-[2-3].[0-9]*
-NO_LATEST_LINK= YES
-
-USES= bison gmake lua:51 pkgconfig
+USES= bison gmake libtool lua:51 pkgconfig
USE_SUBMAKE= YES
-USE_AUTOTOOLS= autoconf:env automake:env libtool:env
-USE_LDCONFIG= YES
+USE_AUTOTOOLS= autoconf:env automake:env libtoolize:env
GNU_CONFIGURE= YES
+INSTALL_TARGET= install-strip
CXXFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ARGS= --with-modules="" \
@@ -227,12 +225,5 @@ post-install:
.for i in pdns.conf
${INSTALL_DATA} ${FILESDIR}/$i ${STAGEDIR}${EXAMPLESDIR}/
.endfor
-.for j in libtinydnsbackend.so libremotebackend.so libmydnsbackend.so libgpgsqlbackend.so \
- libgmysqlbackend.so libgsqlite3backend.so libldapbackend.so libopendbxbackend.so \
- libgeobackend.so libpipebackend.so
- @if ([ -f ${STAGEDIR}${PREFIX}/lib/$j ] && [ ! -f ${STAGEDIR}${PREFIX}/lib/$j.0 ]); then \
- ${LN} -sf ${PREFIX}/lib/$j ${STAGEDIR}${PREFIX}/lib/$j.0; \
- fi
-.endfor
.include <bsd.port.mk>
diff --git a/dns/powerdns-devel/pkg-plist b/dns/powerdns-devel/pkg-plist
index 67d8526daf84..fda11a6e22c7 100644
--- a/dns/powerdns-devel/pkg-plist
+++ b/dns/powerdns-devel/pkg-plist
@@ -12,46 +12,16 @@ sbin/pdns_server
%%TOOLS%%bin/dnswasher
%%TOOLS%%bin/nproxy
%%TOOLS%%bin/nsec3dig
-%%PGSQL%%lib/libgpgsqlbackend.a
-%%PGSQL%%lib/libgpgsqlbackend.la
%%PGSQL%%lib/libgpgsqlbackend.so
-%%PGSQL%%lib/libgpgsqlbackend.so.0
-%%MYSQL%%lib/libgmysqlbackend.a
-%%MYSQL%%lib/libgmysqlbackend.la
%%MYSQL%%lib/libgmysqlbackend.so
-%%MYSQL%%lib/libgmysqlbackend.so.0
-%%SQLITE3%%lib/libgsqlite3backend.a
-%%SQLITE3%%lib/libgsqlite3backend.la
%%SQLITE3%%lib/libgsqlite3backend.so
-%%SQLITE3%%lib/libgsqlite3backend.so.0
-%%OPENLDAP%%lib/libldapbackend.a
-%%OPENLDAP%%lib/libldapbackend.la
%%OPENLDAP%%lib/libldapbackend.so
-%%OPENLDAP%%lib/libldapbackend.so.0
-%%OPENDBX%%lib/libopendbxbackend.a
-%%OPENDBX%%lib/libopendbxbackend.la
%%OPENDBX%%lib/libopendbxbackend.so
-%%OPENDBX%%lib/libopendbxbackend.so.0
-%%GEO%%lib/libgeobackend.a
-%%GEO%%lib/libgeobackend.la
%%GEO%%lib/libgeobackend.so
-%%GEO%%lib/libgeobackend.so.0
-%%TINYDNS%%lib/libtinydnsbackend.a
-%%TINYDNS%%lib/libtinydnsbackend.la
%%TINYDNS%%lib/libtinydnsbackend.so
-%%TINYDNS%%lib/libtinydnsbackend.so.0
-%%REMOTE%%lib/libremotebackend.a
-%%REMOTE%%lib/libremotebackend.la
%%REMOTE%%lib/libremotebackend.so
-%%REMOTE%%lib/libremotebackend.so.0
-%%MYDNS%%lib/libmydnsbackend.a
-%%MYDNS%%lib/libmydnsbackend.la
%%MYDNS%%lib/libmydnsbackend.so
-%%MYDNS%%lib/libmydnsbackend.so.0
-lib/libpipebackend.a
-lib/libpipebackend.la
lib/libpipebackend.so
-lib/libpipebackend.so.0
%%TOOLS%%man/man1/dnstcpbench.1.gz
%%TOOLS%%man/man8/dnsreplay.8.gz
%%TOOLS%%man/man8/dnsscope.8.gz
diff --git a/dns/powerdns/Makefile b/dns/powerdns/Makefile
index 4ff6efb282e5..b273c6632850 100644
--- a/dns/powerdns/Makefile
+++ b/dns/powerdns/Makefile
@@ -2,7 +2,7 @@
PORTNAME= powerdns
PORTVERSION= 3.3.1
-PORTREVISION?= 2
+PORTREVISION= 3
CATEGORIES= dns ipv6
MASTER_SITES= http://downloads.powerdns.com/releases/
DISTNAME= pdns-${PORTVERSION}
@@ -16,13 +16,14 @@ LIB_DEPENDS= libboost_serialization.so:${PORTSDIR}/devel/boost-libs
CONFLICTS= powerdns-devel-[2-3].[0-9]*
-USES= gmake lua:51 pkgconfig
+USES= gmake libtool lua:51 pkgconfig
USE_SUBMAKE= YES
-USE_AUTOTOOLS= libtool
-USE_LDCONFIG= YES
+GNU_CONFIGURE= yes
+INSTALL_TARGET= install-strip
CXXFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-CONFIGURE_ARGS= --with-modules="" \
+CONFIGURE_ARGS= --disable-static \
+ --with-modules="" \
--with-dynmodules="pipe ${MODULES}" \
--sysconfdir="${PREFIX}/etc/pdns" \
--with-boost="${LOCALBASE}"
@@ -197,12 +198,5 @@ post-install:
.for i in pdns.conf
${INSTALL_DATA} ${FILESDIR}/$i ${STAGEDIR}${EXAMPLESDIR}/
.endfor
-.for j in libgpgsqlbackend.so libgmysqlbackend.so \
- libgsqlite3backend.so libldapbackend.so libopendbxbackend.so \
- libgeobackend.so libpipebackend.so
- @if ([ -f ${STAGEDIR}${PREFIX}/lib/$j ] && [ ! -f ${STAGEDIR}${PREFIX}/lib/$j.0 ]); then \
- ${LN} -sf ${PREFIX}/lib/$j ${STAGEDIR}${PREFIX}/lib/$j.0; \
- fi
-.endfor
.include <bsd.port.mk>
diff --git a/dns/powerdns/pkg-plist b/dns/powerdns/pkg-plist
index eda7fcc6ddfc..4e1b870a8ac1 100644
--- a/dns/powerdns/pkg-plist
+++ b/dns/powerdns/pkg-plist
@@ -12,34 +12,13 @@ sbin/pdns_server
%%TOOLS%%bin/dnswasher
%%TOOLS%%bin/nproxy
%%TOOLS%%bin/nsec3dig
-%%PGSQL%%lib/libgpgsqlbackend.a
-%%PGSQL%%lib/libgpgsqlbackend.la
%%PGSQL%%lib/libgpgsqlbackend.so
-%%PGSQL%%lib/libgpgsqlbackend.so.0
-%%MYSQL%%lib/libgmysqlbackend.a
-%%MYSQL%%lib/libgmysqlbackend.la
%%MYSQL%%lib/libgmysqlbackend.so
-%%MYSQL%%lib/libgmysqlbackend.so.0
-%%SQLITE3%%lib/libgsqlite3backend.a
-%%SQLITE3%%lib/libgsqlite3backend.la
%%SQLITE3%%lib/libgsqlite3backend.so
-%%SQLITE3%%lib/libgsqlite3backend.so.0
-%%OPENLDAP%%lib/libldapbackend.a
-%%OPENLDAP%%lib/libldapbackend.la
%%OPENLDAP%%lib/libldapbackend.so
-%%OPENLDAP%%lib/libldapbackend.so.0
-%%OPENDBX%%lib/libopendbxbackend.a
-%%OPENDBX%%lib/libopendbxbackend.la
%%OPENDBX%%lib/libopendbxbackend.so
-%%OPENDBX%%lib/libopendbxbackend.so.0
-%%GEO%%lib/libgeobackend.a
-%%GEO%%lib/libgeobackend.la
%%GEO%%lib/libgeobackend.so
-%%GEO%%lib/libgeobackend.so.0
-lib/libpipebackend.a
-lib/libpipebackend.la
lib/libpipebackend.so
-lib/libpipebackend.so.0
%%TOOLS%%man/man1/dnstcpbench.1.gz
%%TOOLS%%man/man8/dnsreplay.8.gz
%%TOOLS%%man/man8/dnsscope.8.gz
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 756417054f77..009ab50dc142 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -2,7 +2,7 @@
.include "${.CURDIR}/Makefile.common"
-PORTREVISION= 2
+PORTREVISION= 3
COMMENT= Full integrated office productivity suite
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 2c1766a07290..6af1202973f7 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wine
DISTVERSION= 1.7.22
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/Source \
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index e8be31203f21..82a6fb9159b0 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -3,7 +3,7 @@
PORTNAME= wine
DISTVERSION= 1.6.2
-PORTREVISION= 3
+PORTREVISION= 4
PORTEPOCH= 1
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/Source \
diff --git a/ftp/curl/Makefile b/ftp/curl/Makefile
index 8def49d531d3..9d7e276ca9a9 100644
--- a/ftp/curl/Makefile
+++ b/ftp/curl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= curl
PORTVERSION= 7.37.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= ftp www
MASTER_SITES= http://curl.haxx.se/download/ \
LOCAL/sunpoet
diff --git a/ftp/pure-ftpd/Makefile b/ftp/pure-ftpd/Makefile
index e1221149243a..855cbebf7818 100644
--- a/ftp/pure-ftpd/Makefile
+++ b/ftp/pure-ftpd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pure-ftpd
PORTVERSION= 1.0.36
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= ftp ipv6
MASTER_SITES= http://download.pureftpd.org/pub/pure-ftpd/releases/ \
ftp://ftp.pureftpd.org/pub/pure-ftpd/releases/ \
diff --git a/irc/atheme-services/Makefile b/irc/atheme-services/Makefile
index 63e2c4e7f265..8d366e611b8a 100644
--- a/irc/atheme-services/Makefile
+++ b/irc/atheme-services/Makefile
@@ -3,6 +3,7 @@
PORTNAME= atheme-services
PORTVERSION= 7.0.7
+PORTREVISION= 1
CATEGORIES= irc
MASTER_SITES= http://atheme.net/downloads/
diff --git a/irc/inspircd/Makefile b/irc/inspircd/Makefile
index a2752da9fcb0..31b342ccd296 100644
--- a/irc/inspircd/Makefile
+++ b/irc/inspircd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= inspircd
PORTVERSION= 2.0.14
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= irc
MAINTAINER= feld@FreeBSD.org
diff --git a/lang/hiphop-php/Makefile b/lang/hiphop-php/Makefile
index 790993841add..f8473d30faed 100644
--- a/lang/hiphop-php/Makefile
+++ b/lang/hiphop-php/Makefile
@@ -3,7 +3,7 @@
PORTNAME= hiphop-php
PORTVERSION= 2.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= lang devel www
MASTER_SITES= https://github.com/facebook/hiphop-php/archive/:main \
http://unicode.org/Public/UNIDATA/:unidata \
diff --git a/mail/alpine/Makefile b/mail/alpine/Makefile
index 65f001d6557d..b4fe78fe8714 100644
--- a/mail/alpine/Makefile
+++ b/mail/alpine/Makefile
@@ -2,7 +2,7 @@
PORTNAME?= alpine
PORTVERSION= 2.11
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES?= mail news ipv6
MASTER_SITES= http://patches.freeiz.com/alpine/release/src/
DIST_SUBDIR= alpine-${PORTVERSION}
diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index 17ce1d738363..6bca9bbfdeeb 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -4,7 +4,7 @@
PORTNAME= balsa
PORTVERSION= 2.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail gnome
MASTER_SITES= http://pawsa.fedorapeople.org/balsa/
@@ -46,9 +46,8 @@ GTKSV_DESC= GtkSourceview support
GPG_DESC= GnuPG support
GPG_CONFIGURE_WITH= gpgme
GPG_LIB_DEPENDS= libgpgme.so:${PORTSDIR}/security/gpgme
-LDAP_USE= OPENLDAP=yes
+LDAP_USE= OPENLDAP=yes
LDAP_CONFIGURE_WITH= ldap
-LDAP_LIB_DEPENDS= libldap.so:${PORTSDIR}/net/openldap24-client
GTKSPELL_CONFIGURE_WITH= gtkspell
GTKSPELL_LIB_DEPENDS= libgtkspell3-3.so:${PORTSDIR}/textproc/gtkspell3
GTKSV_USE= GNOME=gtksourceview3
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index e9214c8ce715..fa30c187aef2 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= claws-mail
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail news ipv6
COMMENT= Lightweight and featureful GTK+ based e-mail and news client
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index 34700b65e808..bd73001b7d10 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -3,7 +3,7 @@
PORTNAME= courier
PORTVERSION= 0.65.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail ipv6
MASTER_SITES= SF
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 311576a1c1fe..57eb10a528f6 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 2.3.18
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/
PKGNAMESUFFIX= 23
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 5af1d44ed23c..2c990a3c6510 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 2.4.17
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ \
http://cyrusimap.org/releases/
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index e1d0ce6dcde5..2e13d873ac54 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dbmail
PORTVERSION= 3.1.15
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail
MASTER_SITES= http://git.dbmail.eu/paul/dbmail/snapshot/
diff --git a/mail/dbmail22/Makefile b/mail/dbmail22/Makefile
index 0247cac925a9..be928c6f925f 100644
--- a/mail/dbmail22/Makefile
+++ b/mail/dbmail22/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dbmail
PORTVERSION= 2.2.18
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail
MASTER_SITES= http://www.dbmail.org/download/2.2/
PKGNAMESUFFIX= 22
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index f9cf22167967..2f7819fe1bc4 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dovecot
PORTVERSION= 1.2.17
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail ipv6
MASTER_SITES= http://www.dovecot.org/releases/${PORTVERSION:R}/ \
http://www.rename-it.nl/dovecot/${PORTVERSION:R}/
diff --git a/mail/dovecot2-pigeonhole/Makefile b/mail/dovecot2-pigeonhole/Makefile
index 55fe6dfa619a..f2a5640c5fbe 100644
--- a/mail/dovecot2-pigeonhole/Makefile
+++ b/mail/dovecot2-pigeonhole/Makefile
@@ -3,6 +3,7 @@
PORTNAME= dovecot-pigeonhole
PORTVERSION= 0.4.3
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
DISTNAME= ${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}
@@ -18,12 +19,13 @@ RUN_DEPENDS:= dovecot2>=${DOVECOTVERSION}:${PORTSDIR}/mail/dovecot2
DOVECOTVERSION= 2.2
GNU_CONFIGURE= yes
-CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --exec-prefix=${PREFIX} \
--without-dovecot-install-dirs \
--docdir=${DOCSDIR} \
--with-dovecot="${LOCALBASE}/lib/dovecot"
LDFLAGS+= -L${LOCALBASE}/lib
+INSTALL_TARGET= install-strip
+USES= libtool
USE_LDCONFIG= ${PREFIX}/lib/dovecot
PORTDOCS= doc/extensions/* doc/plugins/* doc/rfc/*
@@ -34,7 +36,4 @@ post-patch:
s!^(uninstall-am:) uninstall-sieve_docDATA!\1!;' \
${WRKSRC}/doc/Makefile.in
-post-install:
- ${FIND} ${STAGEDIR}${PREFIX}/lib/ -name \*.so | ${XARGS} ${STRIP_CMD}
-
.include <bsd.port.mk>
diff --git a/mail/dovecot2-pigeonhole/pkg-plist b/mail/dovecot2-pigeonhole/pkg-plist
index c57f6de719e0..a5a654bf7825 100644
--- a/mail/dovecot2-pigeonhole/pkg-plist
+++ b/mail/dovecot2-pigeonhole/pkg-plist
@@ -54,23 +54,18 @@ include/dovecot-2.2-pigeonhole/sieve/sieve-types.h
include/dovecot-2.2-pigeonhole/sieve/sieve-validator.h
include/dovecot-2.2-pigeonhole/sieve/sieve.h
lib/dovecot-2.2-pigeonhole/libdovecot-sieve.a
-lib/dovecot-2.2-pigeonhole/libdovecot-sieve.la
lib/dovecot-2.2-pigeonhole/libdovecot-sieve.so
lib/dovecot-2.2-pigeonhole/libdovecot-sieve.so.0
+lib/dovecot-2.2-pigeonhole/libdovecot-sieve.so.0.0.0
lib/dovecot/doveadm/lib10_doveadm_sieve_plugin.a
-lib/dovecot/doveadm/lib10_doveadm_sieve_plugin.la
lib/dovecot/doveadm/lib10_doveadm_sieve_plugin.so
lib/dovecot/lib90_sieve_plugin.a
-lib/dovecot/lib90_sieve_plugin.la
lib/dovecot/lib90_sieve_plugin.so
lib/dovecot/settings/libmanagesieve_login_settings.a
-lib/dovecot/settings/libmanagesieve_login_settings.la
lib/dovecot/settings/libmanagesieve_login_settings.so
lib/dovecot/settings/libmanagesieve_settings.a
-lib/dovecot/settings/libmanagesieve_settings.la
lib/dovecot/settings/libmanagesieve_settings.so
lib/dovecot/sieve/lib90_sieve_extprograms_plugin.a
-lib/dovecot/sieve/lib90_sieve_extprograms_plugin.la
lib/dovecot/sieve/lib90_sieve_extprograms_plugin.so
libexec/dovecot/managesieve
libexec/dovecot/managesieve-login
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index 8072688ebbdb..db5e27669c8a 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dovecot
PORTVERSION= 2.2.13
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail ipv6
MASTER_SITES= http://www.dovecot.org/releases/${PORTVERSION:R}/
PKGNAMESUFFIX= 2
@@ -27,7 +27,7 @@ CONFLICTS= dovecot-1.[0-9]*
# port before updating this one. #
######################################################################
-USES= iconv
+USES= iconv libtool
USE_RC_SUBR= dovecot
GNU_CONFIGURE= yes
diff --git a/mail/dovecot2/pkg-plist b/mail/dovecot2/pkg-plist
index e292b4bebaa9..ed63c8fd6285 100644
--- a/mail/dovecot2/pkg-plist
+++ b/mail/dovecot2/pkg-plist
@@ -424,114 +424,86 @@ include/dovecot/var-expand.h
include/dovecot/wildcard-match.h
include/dovecot/write-full.h
lib/dovecot/auth/libauthdb_imap.a
-lib/dovecot/auth/libauthdb_imap.la
lib/dovecot/auth/libauthdb_imap.so
lib/dovecot/doveadm/lib10_doveadm_acl_plugin.a
-lib/dovecot/doveadm/lib10_doveadm_acl_plugin.la
lib/dovecot/doveadm/lib10_doveadm_acl_plugin.so
lib/dovecot/doveadm/lib10_doveadm_expire_plugin.a
-lib/dovecot/doveadm/lib10_doveadm_expire_plugin.la
lib/dovecot/doveadm/lib10_doveadm_expire_plugin.so
lib/dovecot/doveadm/lib10_doveadm_quota_plugin.a
-lib/dovecot/doveadm/lib10_doveadm_quota_plugin.la
lib/dovecot/doveadm/lib10_doveadm_quota_plugin.so
lib/dovecot/doveadm/lib20_doveadm_fts_plugin.a
-lib/dovecot/doveadm/lib20_doveadm_fts_plugin.la
lib/dovecot/doveadm/lib20_doveadm_fts_plugin.so
lib/dovecot/dovecot-config
lib/dovecot/lib01_acl_plugin.a
-lib/dovecot/lib01_acl_plugin.la
lib/dovecot/lib01_acl_plugin.so
lib/dovecot/lib02_imap_acl_plugin.a
-lib/dovecot/lib02_imap_acl_plugin.la
lib/dovecot/lib02_imap_acl_plugin.so
lib/dovecot/lib02_lazy_expunge_plugin.a
-lib/dovecot/lib02_lazy_expunge_plugin.la
lib/dovecot/lib02_lazy_expunge_plugin.so
lib/dovecot/lib05_pop3_migration_plugin.a
-lib/dovecot/lib05_pop3_migration_plugin.la
lib/dovecot/lib05_pop3_migration_plugin.so
lib/dovecot/lib05_snarf_plugin.a
-lib/dovecot/lib05_snarf_plugin.la
lib/dovecot/lib05_snarf_plugin.so
lib/dovecot/lib10_mail_filter_plugin.a
-lib/dovecot/lib10_mail_filter_plugin.la
lib/dovecot/lib10_mail_filter_plugin.so
lib/dovecot/lib10_quota_plugin.a
-lib/dovecot/lib10_quota_plugin.la
lib/dovecot/lib10_quota_plugin.so
lib/dovecot/lib11_imap_quota_plugin.a
-lib/dovecot/lib11_imap_quota_plugin.la
lib/dovecot/lib11_imap_quota_plugin.so
lib/dovecot/lib11_trash_plugin.a
-lib/dovecot/lib11_trash_plugin.la
lib/dovecot/lib11_trash_plugin.so
lib/dovecot/lib15_notify_plugin.a
-lib/dovecot/lib15_notify_plugin.la
lib/dovecot/lib15_notify_plugin.so
lib/dovecot/lib20_autocreate_plugin.a
-lib/dovecot/lib20_autocreate_plugin.la
lib/dovecot/lib20_autocreate_plugin.so
lib/dovecot/lib20_expire_plugin.a
-lib/dovecot/lib20_expire_plugin.la
lib/dovecot/lib20_expire_plugin.so
lib/dovecot/lib20_fts_plugin.a
-lib/dovecot/lib20_fts_plugin.la
lib/dovecot/lib20_fts_plugin.so
lib/dovecot/lib20_listescape_plugin.a
-lib/dovecot/lib20_listescape_plugin.la
lib/dovecot/lib20_listescape_plugin.so
lib/dovecot/lib20_mail_log_plugin.a
-lib/dovecot/lib20_mail_log_plugin.la
lib/dovecot/lib20_mail_log_plugin.so
lib/dovecot/lib20_mailbox_alias_plugin.a
-lib/dovecot/lib20_mailbox_alias_plugin.la
lib/dovecot/lib20_mailbox_alias_plugin.so
lib/dovecot/lib20_replication_plugin.a
-lib/dovecot/lib20_replication_plugin.la
lib/dovecot/lib20_replication_plugin.so
lib/dovecot/lib20_virtual_plugin.a
-lib/dovecot/lib20_virtual_plugin.la
lib/dovecot/lib20_virtual_plugin.so
lib/dovecot/lib20_zlib_plugin.a
-lib/dovecot/lib20_zlib_plugin.la
lib/dovecot/lib20_zlib_plugin.so
lib/dovecot/lib21_fts_squat_plugin.a
-lib/dovecot/lib21_fts_squat_plugin.la
lib/dovecot/lib21_fts_squat_plugin.so
lib/dovecot/lib30_imap_zlib_plugin.a
-lib/dovecot/lib30_imap_zlib_plugin.la
lib/dovecot/lib30_imap_zlib_plugin.so
lib/dovecot/lib90_stats_plugin.a
-lib/dovecot/lib90_stats_plugin.la
lib/dovecot/lib90_stats_plugin.so
lib/dovecot/lib95_imap_stats_plugin.a
-lib/dovecot/lib95_imap_stats_plugin.la
lib/dovecot/lib95_imap_stats_plugin.so
lib/dovecot/libdovecot-compression.a
-lib/dovecot/libdovecot-compression.la
lib/dovecot/libdovecot-compression.so
lib/dovecot/libdovecot-compression.so.0
+lib/dovecot/libdovecot-compression.so.0.0.0
lib/dovecot/libdovecot-lda.a
-lib/dovecot/libdovecot-lda.la
lib/dovecot/libdovecot-lda.so
lib/dovecot/libdovecot-lda.so.0
+lib/dovecot/libdovecot-lda.so.0.0.0
lib/dovecot/libdovecot-login.a
-lib/dovecot/libdovecot-login.la
lib/dovecot/libdovecot-login.so
lib/dovecot/libdovecot-login.so.0
+lib/dovecot/libdovecot-login.so.0.0.0
lib/dovecot/libdovecot-sql.a
-lib/dovecot/libdovecot-sql.la
lib/dovecot/libdovecot-sql.so
lib/dovecot/libdovecot-sql.so.0
+lib/dovecot/libdovecot-sql.so.0.0.0
lib/dovecot/libdovecot-storage.a
-lib/dovecot/libdovecot-storage.la
lib/dovecot/libdovecot-storage.so
lib/dovecot/libdovecot-storage.so.0
+lib/dovecot/libdovecot-storage.so.0.0.0
lib/dovecot/libdovecot.a
-lib/dovecot/libdovecot.la
lib/dovecot/libdovecot.so
lib/dovecot/libdovecot.so.0
+lib/dovecot/libdovecot.so.0.0.0
libexec/dovecot/aggregator
libexec/dovecot/anvil
libexec/dovecot/auth
@@ -615,15 +587,11 @@ share/aclocal/dovecot.m4
%%PORTDOCS%%@dirrmtry %%ETCDIR%%
%%LIBWRAP%%libexec/dovecot/tcpwrap
%%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.a
-%%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.la
%%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.so
%%LUCENE%%lib/dovecot/lib21_fts_lucene_plugin.a
-%%LUCENE%%lib/dovecot/lib21_fts_lucene_plugin.la
%%LUCENE%%lib/dovecot/lib21_fts_lucene_plugin.so
%%SOLR%%lib/dovecot/lib21_fts_solr_plugin.a
-%%SOLR%%lib/dovecot/lib21_fts_solr_plugin.la
%%SOLR%%lib/dovecot/lib21_fts_solr_plugin.so
%%SSL%%lib/dovecot/libssl_iostream_openssl.a
-%%SSL%%lib/dovecot/libssl_iostream_openssl.la
%%SSL%%lib/dovecot/libssl_iostream_openssl.so
@unexec echo "If you are removing dovecot2 permanently, you should 'rm -rf /var/db/dovecot' to clear out any remaining data."
diff --git a/mail/dspam-devel/Makefile b/mail/dspam-devel/Makefile
index ae3b52c6e907..9ecfddd96c9f 100644
--- a/mail/dspam-devel/Makefile
+++ b/mail/dspam-devel/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dspam
PORTVERSION= ${PORTVER_MAJ}${SNAP_DATE}
-PORTREVISION= 4
+PORTREVISION= 5
PORTEPOCH= 1
CATEGORIES= mail
MASTER_SITES= # set later
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index dcd37ad18d9e..80136bcb29b9 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -7,7 +7,7 @@
PORTNAME= dspam
PORTVERSION= 3.9.0
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= mail
MASTER_SITES= SF \
http://T32.TecNik93.com/FreeBSD/ports/${PORTNAME}/sources/
diff --git a/mail/evolution-exchange/Makefile b/mail/evolution-exchange/Makefile
index cff03dec16e4..5b84192505bb 100644
--- a/mail/evolution-exchange/Makefile
+++ b/mail/evolution-exchange/Makefile
@@ -4,7 +4,7 @@
PORTNAME= evolution-exchange
PORTVERSION= 2.32.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index c5088a2f2b7a..6acb9e852aab 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -4,7 +4,7 @@
PORTNAME= evolution
PORTVERSION= 2.32.1
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 0a738b24bae7..f0161a3c4237 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -3,7 +3,7 @@
PORTNAME= exim
PORTVERSION?= ${EXIM_VERSION}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail ipv6
MASTER_SITES= ${MASTER_SITE_EXIM:S/$/:exim/}
MASTER_SITE_SUBDIR= exim4/:exim
diff --git a/mail/gnarwl/Makefile b/mail/gnarwl/Makefile
index 05e5942f83f6..3817925a672e 100644
--- a/mail/gnarwl/Makefile
+++ b/mail/gnarwl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnarwl
PORTVERSION= 3.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= mail
MASTER_SITES= http://www.onyxbits.de/sites/default/files/
EXTRACT_SUFX= .tgz
diff --git a/mail/milter-greylist-devel/Makefile b/mail/milter-greylist-devel/Makefile
index ae01d634da1b..815adcd9e939 100644
--- a/mail/milter-greylist-devel/Makefile
+++ b/mail/milter-greylist-devel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= milter-greylist
PORTVERSION= 4.5.7
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= ftp://ftp.espci.fr/pub/milter-greylist/ \
http://fossies.org/unix/privat/
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index 4858ea51c1a8..2b419759eb48 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -3,6 +3,7 @@
PORTNAME= milter-greylist
PORTVERSION= 4.4.3
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= ftp://ftp.espci.fr/pub/milter-greylist/ \
http://fossies.org/unix/privat/
diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index b8c8d1f58eb7..3b18bd21a5de 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -3,7 +3,7 @@
PORTNAME= opendkim
PORTVERSION= 2.9.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail security
MASTER_SITES= SF
MASTER_SITE_SUBDIR= ${PORTNAME} \
diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index 7a8cc1885865..c7a2e563ff1c 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -3,7 +3,7 @@
PORTNAME= perdition
PORTVERSION= 1.18
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail net security
MASTER_SITES= http://horms.net/projects/perdition/download/${PORTVERSION}/
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 9f584b3b64f7..c32dea4dea05 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -3,6 +3,7 @@
PORTNAME= postfix
DISTVERSION= 2.12-20140709
+PORTREVISION= 1
PORTEPOCH= 4
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 3ea2495c4c00..5ab6c8affaf0 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -3,7 +3,7 @@
PORTNAME= postfix
PORTVERSION= 2.11.1
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix210/Makefile b/mail/postfix210/Makefile
index a0e9edb191c4..c5347168157d 100644
--- a/mail/postfix210/Makefile
+++ b/mail/postfix210/Makefile
@@ -3,7 +3,7 @@
PORTNAME= postfix
PORTVERSION= 2.10.3
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index cec70ab5b889..ce2bca619aef 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -3,6 +3,7 @@
PORTNAME= postfix
PORTVERSION= 2.7.16
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile
index 1869f2b2817c..45fe94eaee16 100644
--- a/mail/postfix28/Makefile
+++ b/mail/postfix28/Makefile
@@ -3,7 +3,7 @@
PORTNAME= postfix
PORTVERSION= 2.8.17
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/postfix29/Makefile b/mail/postfix29/Makefile
index 08b57cf8bad7..c7dc9304002f 100644
--- a/mail/postfix29/Makefile
+++ b/mail/postfix29/Makefile
@@ -3,7 +3,7 @@
PORTNAME= postfix
PORTVERSION= 2.9.9
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index 1ee04e419545..765b25e7150e 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -2,7 +2,7 @@
PORTNAME= prayer
PORTVERSION= 1.3.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail www
MASTER_SITES= ftp://ftp.csx.cam.ac.uk/pub/software/email/prayer/
diff --git a/mail/qmail-activedir/Makefile b/mail/qmail-activedir/Makefile
index 84b6c6d34c53..abdcee0bca28 100644
--- a/mail/qmail-activedir/Makefile
+++ b/mail/qmail-activedir/Makefile
@@ -3,7 +3,7 @@
PORTNAME= qmail-activedir
PORTVERSION= 0.17
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail
MASTER_SITES= http://fo2k.com/qmail-activedir/
diff --git a/mail/qmail-ldap/Makefile b/mail/qmail-ldap/Makefile
index c334e8d8ce39..2cae97036bbf 100644
--- a/mail/qmail-ldap/Makefile
+++ b/mail/qmail-ldap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= qmail
PORTVERSION= ${QMAIL_VERSION}.${LDAP_PATCH_DATE}
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= mail
PKGNAMESUFFIX= -ldap
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index 2dce2aa8a3a8..d9cd96754326 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -2,6 +2,7 @@
PORTNAME= sendmail
PORTVERSION= 8.14.9
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.sendmail.org/pub/sendmail/ \
${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/sendmail/&,}
diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile
index 958ab1a0d40b..cd5efdcf7343 100644
--- a/mail/spamass-milter/Makefile
+++ b/mail/spamass-milter/Makefile
@@ -3,6 +3,7 @@
PORTNAME= spamass-milter
PORTVERSION= 0.3.2
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= spamass-milt
diff --git a/mail/spmfilter/Makefile b/mail/spmfilter/Makefile
index e86aa005210a..be3fc4dc44d3 100644
--- a/mail/spmfilter/Makefile
+++ b/mail/spmfilter/Makefile
@@ -2,6 +2,7 @@
PORTNAME= spmfilter
PORTVERSION= 0.6.7
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= http://www.${PORTNAME}.org/files/
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index f931d833d9c7..120772ea0565 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sylpheed
PORTVERSION= 3.4.2
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= http://sylpheed.sraoss.jp/sylpheed/v${PORTVERSION:C/\.[^\.]*$//}/ \
CRITICAL
diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile
index 8c5acc81f897..2c6a76e2303a 100644
--- a/mail/tpop3d/Makefile
+++ b/mail/tpop3d/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tpop3d
PORTVERSION= 1.5.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SAVANNAH}
MASTER_SITE_SUBDIR= tpop3d
diff --git a/mail/vpopmail/Makefile b/mail/vpopmail/Makefile
index c917c6912cbc..56a0a3c19b23 100644
--- a/mail/vpopmail/Makefile
+++ b/mail/vpopmail/Makefile
@@ -3,6 +3,7 @@
PORTNAME= vpopmail
PORTVERSION= 5.4.33
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION} \
SF/${PORTNAME}/${PORTNAME}-devel/${PORTVERSION}
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index e7fb4d067db9..bdbc2893895e 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -4,6 +4,7 @@
PORTNAME= gnumeric
PORTVERSION= 1.12.11
+PORTREVISION= 1
CATEGORIES= math gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
@@ -19,9 +20,8 @@ LIB_DEPENDS= libgoffice-0.10.so:${PORTSDIR}/devel/goffice010 \
libpsiconv.so:${PORTSDIR}/converters/psiconv
RUN_DEPENDS= rarian-sk-config:${PORTSDIR}/textproc/rarian
-USE_XZ= yes
-USES= desktop-file-utils gettext gmake pathfix pkgconfig \
- shebangfix
+USES= desktop-file-utils gettext gmake libtool pathfix pkgconfig \
+ shebangfix tar:xz
USE_GNOME= gnomehier gnomeprefix intlhack libgsf pygobject3
USE_PYTHON= 2
INSTALLS_OMF= yes
diff --git a/math/gnumeric/pkg-plist b/math/gnumeric/pkg-plist
index 602795669d5d..17b522fc2e03 100644
--- a/math/gnumeric/pkg-plist
+++ b/math/gnumeric/pkg-plist
@@ -140,82 +140,56 @@ include/libspreadsheet-%%SHORT_VER%%/spreadsheet/workbook-view.h
include/libspreadsheet-%%SHORT_VER%%/spreadsheet/workbook.h
include/libspreadsheet-%%SHORT_VER%%/spreadsheet/xml-io-version.h
include/libspreadsheet-%%SHORT_VER%%/spreadsheet/xml-sax.h
-lib/gnumeric/%%VERSION%%/plugins/applix/applix.la
lib/gnumeric/%%VERSION%%/plugins/applix/applix.so
lib/gnumeric/%%VERSION%%/plugins/applix/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/dif/dif.la
lib/gnumeric/%%VERSION%%/plugins/dif/dif.so
lib/gnumeric/%%VERSION%%/plugins/dif/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/excel/excel.la
lib/gnumeric/%%VERSION%%/plugins/excel/excel.so
lib/gnumeric/%%VERSION%%/plugins/excel/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/excelplugins/plugin.la
lib/gnumeric/%%VERSION%%/plugins/excelplugins/plugin.so
lib/gnumeric/%%VERSION%%/plugins/excelplugins/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/excelplugins/xlcall32.la
lib/gnumeric/%%VERSION%%/plugins/excelplugins/xlcall32.so
-lib/gnumeric/%%VERSION%%/plugins/fn-christian-date/plugin.la
lib/gnumeric/%%VERSION%%/plugins/fn-christian-date/plugin.so
lib/gnumeric/%%VERSION%%/plugins/fn-christian-date/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/fn-complex/plugin.la
lib/gnumeric/%%VERSION%%/plugins/fn-complex/plugin.so
lib/gnumeric/%%VERSION%%/plugins/fn-complex/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/fn-database/plugin.la
lib/gnumeric/%%VERSION%%/plugins/fn-database/plugin.so
lib/gnumeric/%%VERSION%%/plugins/fn-database/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/fn-date/plugin.la
lib/gnumeric/%%VERSION%%/plugins/fn-date/plugin.so
lib/gnumeric/%%VERSION%%/plugins/fn-date/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/fn-derivatives/plugin.la
lib/gnumeric/%%VERSION%%/plugins/fn-derivatives/plugin.so
lib/gnumeric/%%VERSION%%/plugins/fn-derivatives/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/fn-eng/plugin.la
lib/gnumeric/%%VERSION%%/plugins/fn-eng/plugin.so
lib/gnumeric/%%VERSION%%/plugins/fn-eng/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/fn-erlang/erlang.la
lib/gnumeric/%%VERSION%%/plugins/fn-erlang/erlang.so
lib/gnumeric/%%VERSION%%/plugins/fn-erlang/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/fn-financial/plugin.la
lib/gnumeric/%%VERSION%%/plugins/fn-financial/plugin.so
lib/gnumeric/%%VERSION%%/plugins/fn-financial/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/fn-hebrew-date/plugin.la
lib/gnumeric/%%VERSION%%/plugins/fn-hebrew-date/plugin.so
lib/gnumeric/%%VERSION%%/plugins/fn-hebrew-date/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/fn-info/plugin.la
lib/gnumeric/%%VERSION%%/plugins/fn-info/plugin.so
lib/gnumeric/%%VERSION%%/plugins/fn-info/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/fn-logical/plugin.la
lib/gnumeric/%%VERSION%%/plugins/fn-logical/plugin.so
lib/gnumeric/%%VERSION%%/plugins/fn-logical/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/fn-lookup/plugin.la
lib/gnumeric/%%VERSION%%/plugins/fn-lookup/plugin.so
lib/gnumeric/%%VERSION%%/plugins/fn-lookup/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/fn-math/plugin.la
lib/gnumeric/%%VERSION%%/plugins/fn-math/plugin.so
lib/gnumeric/%%VERSION%%/plugins/fn-math/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/fn-numtheory/plugin.la
lib/gnumeric/%%VERSION%%/plugins/fn-numtheory/plugin.so
lib/gnumeric/%%VERSION%%/plugins/fn-numtheory/plugin.xml
lib/gnumeric/%%VERSION%%/plugins/fn-r/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/fn-r/rstat.la
lib/gnumeric/%%VERSION%%/plugins/fn-r/rstat.so
-lib/gnumeric/%%VERSION%%/plugins/fn-random/plugin.la
lib/gnumeric/%%VERSION%%/plugins/fn-random/plugin.so
lib/gnumeric/%%VERSION%%/plugins/fn-random/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/fn-stat/plugin.la
lib/gnumeric/%%VERSION%%/plugins/fn-stat/plugin.so
lib/gnumeric/%%VERSION%%/plugins/fn-stat/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/fn-string/plugin.la
lib/gnumeric/%%VERSION%%/plugins/fn-string/plugin.so
lib/gnumeric/%%VERSION%%/plugins/fn-string/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/fn-tsa/plugin.la
lib/gnumeric/%%VERSION%%/plugins/fn-tsa/plugin.so
lib/gnumeric/%%VERSION%%/plugins/fn-tsa/plugin.xml
-%%GDA%%lib/gnumeric/%%VERSION%%/plugins/gdaif/gdaif.la
%%GDA%%lib/gnumeric/%%VERSION%%/plugins/gdaif/gdaif.so
%%GDA%%lib/gnumeric/%%VERSION%%/plugins/gdaif/plugin.xml
%%GDA%%lib/gnumeric/%%VERSION%%/plugins/gdaif/ui.xml
-lib/gnumeric/%%VERSION%%/plugins/glpk/glpk.la
lib/gnumeric/%%VERSION%%/plugins/glpk/glpk.so
lib/gnumeric/%%VERSION%%/plugins/glpk/plugin.xml
lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/glossary-po-header
@@ -223,70 +197,51 @@ lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.py
lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.pyc
lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/gnome_glossary.pyo
lib/gnumeric/%%VERSION%%/plugins/gnome-glossary/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/html/html.la
lib/gnumeric/%%VERSION%%/plugins/html/html.so
lib/gnumeric/%%VERSION%%/plugins/html/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/lotus/lotus.la
lib/gnumeric/%%VERSION%%/plugins/lotus/lotus.so
lib/gnumeric/%%VERSION%%/plugins/lotus/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/lpsolve/lpsolve.la
lib/gnumeric/%%VERSION%%/plugins/lpsolve/lpsolve.so
lib/gnumeric/%%VERSION%%/plugins/lpsolve/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/mps/mps.la
lib/gnumeric/%%VERSION%%/plugins/mps/mps.so
lib/gnumeric/%%VERSION%%/plugins/mps/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/nlsolve/nlsolve.la
lib/gnumeric/%%VERSION%%/plugins/nlsolve/nlsolve.so
lib/gnumeric/%%VERSION%%/plugins/nlsolve/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/oleo/oleo.la
lib/gnumeric/%%VERSION%%/plugins/oleo/oleo.so
lib/gnumeric/%%VERSION%%/plugins/oleo/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/openoffice/openoffice.la
lib/gnumeric/%%VERSION%%/plugins/openoffice/openoffice.so
lib/gnumeric/%%VERSION%%/plugins/openoffice/plugin.xml
%%PERL%%lib/gnumeric/%%VERSION%%/plugins/perl-func/perl_func.pl
%%PERL%%lib/gnumeric/%%VERSION%%/plugins/perl-func/plugin.xml
-%%PERL%%lib/gnumeric/%%VERSION%%/plugins/perl-loader/perl_loader.la
%%PERL%%lib/gnumeric/%%VERSION%%/plugins/perl-loader/perl_loader.so
%%PERL%%lib/gnumeric/%%VERSION%%/plugins/perl-loader/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/plan_perfect/plan_perfect.la
lib/gnumeric/%%VERSION%%/plugins/plan_perfect/plan_perfect.so
lib/gnumeric/%%VERSION%%/plugins/plan_perfect/plugin.xml
lib/gnumeric/%%VERSION%%/plugins/psiconv/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/psiconv/psiconv.la
lib/gnumeric/%%VERSION%%/plugins/psiconv/psiconv.so
lib/gnumeric/%%VERSION%%/plugins/py-func/plugin.xml
lib/gnumeric/%%VERSION%%/plugins/py-func/py_func.py
lib/gnumeric/%%VERSION%%/plugins/py-func/py_func.pyc
lib/gnumeric/%%VERSION%%/plugins/py-func/py_func.pyo
lib/gnumeric/%%VERSION%%/plugins/python-loader/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/python-loader/python_loader.la
lib/gnumeric/%%VERSION%%/plugins/python-loader/python_loader.so
lib/gnumeric/%%VERSION%%/plugins/python-loader/ui-console-menu.xml
lib/gnumeric/%%VERSION%%/plugins/qpro/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/qpro/qpro.la
lib/gnumeric/%%VERSION%%/plugins/qpro/qpro.so
lib/gnumeric/%%VERSION%%/plugins/sample_datasource/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/sample_datasource/sample_datasource.la
lib/gnumeric/%%VERSION%%/plugins/sample_datasource/sample_datasource.so
lib/gnumeric/%%VERSION%%/plugins/sc/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/sc/sc.la
lib/gnumeric/%%VERSION%%/plugins/sc/sc.so
lib/gnumeric/%%VERSION%%/plugins/sylk/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/sylk/sylk.la
lib/gnumeric/%%VERSION%%/plugins/sylk/sylk.so
lib/gnumeric/%%VERSION%%/plugins/uihello/hello.xml
-lib/gnumeric/%%VERSION%%/plugins/uihello/plugin.la
lib/gnumeric/%%VERSION%%/plugins/uihello/plugin.so
lib/gnumeric/%%VERSION%%/plugins/uihello/plugin.xml
lib/gnumeric/%%VERSION%%/plugins/xbase/plugin.xml
-lib/gnumeric/%%VERSION%%/plugins/xbase/xbase.la
lib/gnumeric/%%VERSION%%/plugins/xbase/xbase.so
-lib/goffice/%%GOFFICE%%/plugins/gnumeric/gnumeric.la
lib/goffice/%%GOFFICE%%/plugins/gnumeric/gnumeric.so
lib/goffice/%%GOFFICE%%/plugins/gnumeric/plugin.xml
lib/libspreadsheet-%%VERSION%%.so
-lib/libspreadsheet.la
lib/libspreadsheet.so
libdata/pkgconfig/libspreadsheet-%%SHORT_VER%%.pc
man/man1/gnumeric.1.gz
diff --git a/misc/libhome/Makefile b/misc/libhome/Makefile
index ff9143e02228..9d9b889c7225 100644
--- a/misc/libhome/Makefile
+++ b/misc/libhome/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libhome
PORTVERSION= 0.10.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= misc
MASTER_SITES= ftp://ftp.oav.net/pll/ SF/pll/${PORTNAME}/${PORTVERSION}
diff --git a/net-im/ekiga/Makefile b/net-im/ekiga/Makefile
index 5e171ab5d1ef..9d13605a7d9a 100644
--- a/net-im/ekiga/Makefile
+++ b/net-im/ekiga/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ekiga
PORTVERSION= 4.0.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= net-im
MASTER_SITES= GNOME
#MASTER_SITES= http://www.ekiga.org/admin/downloads/latest/sources/ekiga_${PORTVERSION}/
diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index 4688eddd54cf..bd321bac2233 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= jabberd
DISTVERSION= 2.3.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net-im
MASTER_SITES= https://github.com/jabberd2/jabberd2/releases/download/${PORTNAME}-${DISTVERSION}/ \
LOCAL/matthew/${PORTNAME}
diff --git a/net-mgmt/monitoring-plugins/Makefile b/net-mgmt/monitoring-plugins/Makefile
index cf262dc538ee..4cff99f915d4 100644
--- a/net-mgmt/monitoring-plugins/Makefile
+++ b/net-mgmt/monitoring-plugins/Makefile
@@ -3,6 +3,7 @@
PORTNAME= monitoring-plugins
PORTVERSION= 1.5.99.20140721
+PORTREVISION= 1
CATEGORIES= net-mgmt
MASTER_SITES= LOCAL/mat/${PORTNAME} GH GHC
diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile
index 76fe9a4fd4cf..8f37d9467e7b 100644
--- a/net-mgmt/nagios-plugins/Makefile
+++ b/net-mgmt/nagios-plugins/Makefile
@@ -3,6 +3,7 @@
PORTNAME= nagios-plugins
PORTVERSION= 2.0.3
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net-mgmt
MASTER_SITES= https://www.nagios-plugins.org/download/ \
diff --git a/net-mgmt/nefu/Makefile b/net-mgmt/nefu/Makefile
index da4ba1476557..701daacecc2e 100644
--- a/net-mgmt/nefu/Makefile
+++ b/net-mgmt/nefu/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nefu
PORTVERSION= 1.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt
MASTER_SITES= http://rsug.itd.umich.edu/software/nefu/files/
EXTRACT_SUFX= .tgz
diff --git a/net-mgmt/xymon-server/Makefile b/net-mgmt/xymon-server/Makefile
index 9fb95e6bd15c..39a5f433bdaa 100644
--- a/net-mgmt/xymon-server/Makefile
+++ b/net-mgmt/xymon-server/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xymon
PORTVERSION= 4.3.17
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net-mgmt www
MASTER_SITES= SF/xymon/Xymon/${PORTVERSION}
PKGNAMESUFFIX= -server${PKGNAMESUFFIX2}
diff --git a/net-mgmt/zabbix2-server/Makefile b/net-mgmt/zabbix2-server/Makefile
index 348b7c6a463e..1ef9fc7ff6a6 100644
--- a/net-mgmt/zabbix2-server/Makefile
+++ b/net-mgmt/zabbix2-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME= zabbix2
PORTVERSION= 2.0.12
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES= net-mgmt
MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
PKGNAMESUFFIX?= -server
diff --git a/net-mgmt/zabbix22-server/Makefile b/net-mgmt/zabbix22-server/Makefile
index 988cbe60b8b8..1cf0277ef7b9 100644
--- a/net-mgmt/zabbix22-server/Makefile
+++ b/net-mgmt/zabbix22-server/Makefile
@@ -3,6 +3,7 @@
PORTNAME= zabbix22
PORTVERSION= 2.2.4
+PORTREVISION= 1
CATEGORIES= net-mgmt
MASTER_SITES= SF/zabbix/ZABBIX%20Latest%20Stable/${PORTVERSION}
PKGNAMESUFFIX?= -server
diff --git a/net/asterisk/Makefile b/net/asterisk/Makefile
index 567a3aa89003..65ba3b5fc9ea 100644
--- a/net/asterisk/Makefile
+++ b/net/asterisk/Makefile
@@ -3,7 +3,7 @@
PORTNAME= asterisk
PORTVERSION= 1.8.28.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
diff --git a/net/asterisk11/Makefile b/net/asterisk11/Makefile
index b25c7ebd8e5d..9e003f7ab998 100644
--- a/net/asterisk11/Makefile
+++ b/net/asterisk11/Makefile
@@ -2,7 +2,7 @@
PORTNAME= asterisk
PORTVERSION= 11.10.2
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= http://downloads.asterisk.org/pub/telephony/asterisk/ \
http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/
diff --git a/net/courier-authlib-ldap/Makefile b/net/courier-authlib-ldap/Makefile
index 3911d4cb5235..3bce294e5334 100644
--- a/net/courier-authlib-ldap/Makefile
+++ b/net/courier-authlib-ldap/Makefile
@@ -1,6 +1,7 @@
# Created by: Yarema <yds@CoolRat.org>
# $FreeBSD$
+PORTREVISION= 1
PKGNAMESUFFIX= -ldap
COMMENT= LDAP support for the Courier authentication library
diff --git a/net/echoping/Makefile b/net/echoping/Makefile
index 56b76b59a950..02ae5af56401 100644
--- a/net/echoping/Makefile
+++ b/net/echoping/Makefile
@@ -3,7 +3,7 @@
PORTNAME= echoping
PORTVERSION= 6.0.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net ipv6
MASTER_SITES= SF
diff --git a/net/fpc-ldap/Makefile b/net/fpc-ldap/Makefile
index 9061a7c11fd9..ae67c0a53862 100644
--- a/net/fpc-ldap/Makefile
+++ b/net/fpc-ldap/Makefile
@@ -1,7 +1,7 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= net lang
PKGNAMESUFFIX= -ldap
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index a20c9a4e8b4b..ba94feb1a292 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= freeradius
DISTVERSION= 2.2.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile
index 0e9a6ec7c46e..31737c6b763f 100644
--- a/net/freeradius3/Makefile
+++ b/net/freeradius3/Makefile
@@ -3,7 +3,7 @@
PORTNAME= freeradius
DISTVERSION= 3.0.3
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \
diff --git a/net/gnu-dico/Makefile b/net/gnu-dico/Makefile
index cfd3124f5dab..f7e416c2a01a 100644
--- a/net/gnu-dico/Makefile
+++ b/net/gnu-dico/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dico
PORTVERSION= 2.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= net textproc
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff --git a/net/gq/Makefile b/net/gq/Makefile
index 8075664b332a..5a77480f0f0b 100644
--- a/net/gq/Makefile
+++ b/net/gq/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gq
PORTVERSION= 1.3.4
-PORTREVISION= 9
+PORTREVISION= 10
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}client/GQ%20Unstable/${PORTVERSION}
diff --git a/net/isc-dhcp41-server/Makefile b/net/isc-dhcp41-server/Makefile
index c6690f36633b..e17019914dd8 100644
--- a/net/isc-dhcp41-server/Makefile
+++ b/net/isc-dhcp41-server/Makefile
@@ -17,7 +17,7 @@ COMMENT?= The ISC Dynamic Host Configuration Protocol server
LICENSE= ISCL
PATCHLEVEL= R7
-PORTREVISION_SERVER= 8
+PORTREVISION_SERVER= 9
PORTREVISION_CLIENT= 2
PORTREVISION_RELAY= 5
diff --git a/net/isc-dhcp42-server/Makefile b/net/isc-dhcp42-server/Makefile
index 239da3812e33..ffed0202c003 100644
--- a/net/isc-dhcp42-server/Makefile
+++ b/net/isc-dhcp42-server/Makefile
@@ -19,7 +19,7 @@ LICENSE= ISCL
USES= gmake
PATCHLEVEL= P1
-PORTREVISION_SERVER= 1
+PORTREVISION_SERVER= 2
PORTREVISION_CLIENT= 0
PORTREVISION_RELAY= 0
diff --git a/net/isc-dhcp43-server/Makefile b/net/isc-dhcp43-server/Makefile
index 40ea27a4b2a4..04660c24d791 100644
--- a/net/isc-dhcp43-server/Makefile
+++ b/net/isc-dhcp43-server/Makefile
@@ -19,7 +19,7 @@ LICENSE= ISCL
USES= gmake
#PATCHLEVEL= P1
-PORTREVISION_SERVER= 1
+PORTREVISION_SERVER= 2
PORTREVISION_CLIENT= 0
PORTREVISION_RELAY= 0
diff --git a/net/ldap2dns/Makefile b/net/ldap2dns/Makefile
index 24dfca4be4a8..7b1292a64e43 100644
--- a/net/ldap2dns/Makefile
+++ b/net/ldap2dns/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ldap2dns
PORTVERSION= 0.4.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= GHC
diff --git a/net/ldapdiff/Makefile b/net/ldapdiff/Makefile
index dc27df12b926..98f92afb73bf 100644
--- a/net/ldapdiff/Makefile
+++ b/net/ldapdiff/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ldapdiff
PORTVERSION= 1.4.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://launchpadlibrarian.net/20391352/
DISTNAME= ${PORTNAME}-${PORTVERSION}_src
diff --git a/net/ldapscripts/Makefile b/net/ldapscripts/Makefile
index afd2eec46da7..c19fcbeab2b1 100644
--- a/net/ldapscripts/Makefile
+++ b/net/ldapscripts/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ldapscripts
PORTVERSION= 2.0.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
http://contribs.martymac.org/ldapscripts/
diff --git a/net/lualdap/Makefile b/net/lualdap/Makefile
index 4e2def439e39..ded44831da71 100644
--- a/net/lualdap/Makefile
+++ b/net/lualdap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= lualdap
PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://files.luaforge.net/releases/${PORTNAME}/${PORTNAME}/LuaLDAP${PORTVERSION}/
PKGNAMEPREFIX= ${LUA_PKGNAMEPREFIX}
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 2a67cd53a789..10e97315b55f 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -3,7 +3,7 @@
PORTNAME= netatalk
PORTVERSION= 2.2.5
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= net print
MASTER_SITES= SF
diff --git a/net/netatalk3/Makefile b/net/netatalk3/Makefile
index 8ec4ddc97f48..0ee1ce1df674 100644
--- a/net/netatalk3/Makefile
+++ b/net/netatalk3/Makefile
@@ -3,6 +3,7 @@
PORTNAME= netatalk
PORTVERSION= 3.1.2
+PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= net
MASTER_SITES= SF
diff --git a/net/nss-pam-ldapd/Makefile b/net/nss-pam-ldapd/Makefile
index 03ec62797809..7e3b69d12874 100644
--- a/net/nss-pam-ldapd/Makefile
+++ b/net/nss-pam-ldapd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nss-pam-ldapd
PORTVERSION= 0.8.14
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://arthurdejong.org/nss-pam-ldapd/ \
http://mirrors.rit.edu/zi/
diff --git a/net/nss_ldap/Makefile b/net/nss_ldap/Makefile
index 6a5c0b424f5c..6b5b05a5313a 100644
--- a/net/nss_ldap/Makefile
+++ b/net/nss_ldap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nss_ldap
PORTVERSION= 1.${NSS_LDAP_VERSION}
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= net
MASTER_SITES= http://www.padl.com/download/ \
LOCAL/martymac
diff --git a/net/ohphone/Makefile b/net/ohphone/Makefile
index 905e826e8fad..5911564b3133 100644
--- a/net/ohphone/Makefile
+++ b/net/ohphone/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ohphone
PORTVERSION= 1.4.5
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= net
MASTER_SITES= ftp://ftp.frm2.tum.de/pub/jpulz/FreeBSD/distfiles/
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index 059df6b74159..2cb1d166d54c 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openh323
PORTVERSION= 1.19.0.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net
MASTER_SITES= SF
DISTNAME= ${PORTNAME}-v${PORTVERSION:S/./_/g}-src
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 9db60f057c6c..13499cabc4fa 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -3,7 +3,6 @@
PORTNAME= openldap
DISTVERSION= 2.4.39
-PORTREVISION= 1
PORTREVISION= ${OPENLDAP_PORTREVISION}
CATEGORIES= net databases
MASTER_SITES= ftp://ftp.OpenLDAP.org/pub/OpenLDAP/%SUBDIR%/ \
@@ -43,11 +42,11 @@ LICENSE_NAME= OpenLDAP Public License
LICENSE_FILE= ${WRKSRC}/LICENSE
LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-LATEST_LINK?= ${PKGNAMEPREFIX}openldap24${PKGNAMESUFFIX}
+GNU_CONFIGURE= yes
+# :keepla because port uses lt_dlopen
+USES= libtool:keepla
USE_OPENSSL= yes
-USE_AUTOTOOLS= libtool
.if !defined(CLIENT_ONLY)
-USE_AUTOTOOLS+= autoconf
USERS= ldap
GROUPS= ldap
LDAP_USER?= ldap
@@ -59,9 +58,9 @@ WANT_OPENLDAP_VER?= 24
BROKEN= incompatible OpenLDAP version: ${WANT_OPENLDAP_VER}
.endif
-PORTREVISION_CLIENT= 0
-PORTREVISION_SERVER= 1
-OPENLDAP_SHLIB_MAJOR= 8
+PORTREVISION_CLIENT= 1
+PORTREVISION_SERVER= 2
+OPENLDAP_SHLIB_MAJOR= 2
OPENLDAP_MAJOR= ${DISTVERSION:R}
OPTIONS_DEFINE= FETCH GSSAPI
@@ -128,7 +127,7 @@ OPENLDAP_PORTREVISION= ${PORTREVISION_SERVER}
OPENLDAP_PKGFILESUFX=
.endif
-CONFIGURE_SED= -e 's,-kthread,${PTHREAD_LIBS},g' -e 's,uuid/uuid.h,xxuuid/uuid.h,g'
+CONFIGURE_SED= -e 's,uuid/uuid.h,xxuuid/uuid.h,g'
.include <bsd.port.pre.mk>
@@ -374,6 +373,7 @@ PLIST_SUB+= BACK_BDB="@comment " \
.endif
CPPFLAGS+= -I${BDB_INCLUDE_DIR}
+LDFLAGS+= -L${BDB_LIB_DIR}
CONFIGURE_SED+= -e 's,ol_DB_LIB=$$,&-l${BDB_LIB_NAME:R},' \
-e 's,(ol_cv_lib_db=)yes$$,\1-l${BDB_LIB_NAME:R},'
.endif
@@ -520,18 +520,18 @@ pre-configure:
.if !defined(CLIENT_ONLY)
test: build
- @cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} \
- ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test
+ @(cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} \
+ ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test)
post-build:
@${DO_NADA}
.if ${PORT_OPTIONS:MSMBPWD}
- @cd ${BUILD_WRKSRC}/contrib/slapd-modules/smbk5pwd; ${SETENV} ${MAKE_ENV} \
- ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} DEFS="-DDO_SAMBA" all
+ @(cd ${BUILD_WRKSRC}/contrib/slapd-modules/smbk5pwd && ${SETENV} ${MAKE_ENV} \
+ ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} DEFS="-DDO_SAMBA" all)
.endif
.if ${PORT_OPTIONS:MSHA2}
- @cd ${BUILD_WRKSRC}/contrib/slapd-modules/passwd/sha2; ${SETENV} ${MAKE_ENV} \
- ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all
+ @(cd ${BUILD_WRKSRC}/contrib/slapd-modules/passwd/sha2 && ${SETENV} ${MAKE_ENV} \
+ ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} all)
.endif
.endif
diff --git a/net/openldap24-server/files/patch-build::top.mk b/net/openldap24-server/files/patch-build::top.mk
deleted file mode 100644
index 105af6b35122..000000000000
--- a/net/openldap24-server/files/patch-build::top.mk
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/top.mk.orig Mon Apr 12 20:21:07 2004
-+++ build/top.mk Wed May 5 12:49:13 2004
-@@ -196,6 +196,8 @@
- SLAPD_LIBS = @SLAPD_LIBS@ @SLAPD_PERL_LDFLAGS@ @SLAPD_SQL_LDFLAGS@ @SLAPD_SQL_LIBS@ @SLAPD_SLP_LIBS@ @SLAPD_GMP_LIBS@
- SLURPD_LIBS = @SLURPD_LIBS@
-
-+SLAPI_LIBS = @SLAPI_LIBS@
-+
- # Our Defaults
- CC = $(AC_CC)
- DEFS = $(LDAP_INCPATH) $(XINCPATH) $(XDEFS) $(AC_DEFS) $(DEFINES)
diff --git a/net/openldap24-server/files/patch-shlib-version b/net/openldap24-server/files/patch-shlib-version
deleted file mode 100644
index e208734aeabd..000000000000
--- a/net/openldap24-server/files/patch-shlib-version
+++ /dev/null
@@ -1,15 +0,0 @@
-# I have checked all headers and don't think the shared library
-# bump is a needed one. We patch it back to prevent large
-# rebuild need.
---- build/version.var.orig 2014-01-25 05:36:15.000000000 -0800
-+++ build/version.var 2014-03-19 15:28:33.000000000 -0700
-@@ -17,7 +17,7 @@
- ol_minor=4
- ol_patch=39
- ol_api_inc=20439
--ol_api_current=12
-+ol_api_current=8
- ol_api_revision=2
--ol_api_age=10
-+ol_api_age=8
- ol_release_date="2014/01/26"
diff --git a/net/openldap24-server/files/patch-smbk5pwd-Makefile b/net/openldap24-server/files/patch-smbk5pwd-Makefile
index 6c04b74398be..9eedd8552020 100644
--- a/net/openldap24-server/files/patch-smbk5pwd-Makefile
+++ b/net/openldap24-server/files/patch-smbk5pwd-Makefile
@@ -1,12 +1,6 @@
--- contrib/slapd-modules/smbk5pwd/Makefile.orig 2013-03-03 13:17:30.000000000 -0800
+++ contrib/slapd-modules/smbk5pwd/Makefile 2013-03-14 10:54:56.917578861 -0700
-@@ -24,13 +24,12 @@
- HEIMDAL_INC = -I/usr/heimdal/include
- HEIMDAL_LIB = -L/usr/heimdal/lib -lkrb5 -lkadm5srv
-
--LIBTOOL = $(LDAP_BUILD)/libtool
- CC = gcc
- OPT = -g -O2 -Wall
+@@ -30,7 +30,7 @@
# Omit DO_KRB5, DO_SAMBA or DO_SHADOW if you don't want to support it.
DEFS = -DDO_KRB5 -DDO_SAMBA -DDO_SHADOW
INCS = $(LDAP_INC) $(HEIMDAL_INC) $(SSL_INC)
diff --git a/net/openldap24-server/pkg-plist b/net/openldap24-server/pkg-plist
index f505a5d08e2e..4427f0695e1a 100644
--- a/net/openldap24-server/pkg-plist
+++ b/net/openldap24-server/pkg-plist
@@ -19,74 +19,76 @@ etc/openldap/schema/corba.ldif
etc/openldap/schema/collective.ldif
etc/openldap/schema/README
%%BACK_BDB%%etc/openldap/DB_CONFIG.example
+%%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
%%SLAPI%%lib/libslapi.a
%%SLAPI%%lib/libslapi.la
%%SLAPI%%lib/libslapi.so
-%%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so
-%%SLAPI%%lib/libslapi-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
%%MODULES%%@exec mkdir -p %D/libexec/openldap
-%%BACK_BDB%%libexec/openldap/back_bdb-%%OPENLDAP_MAJOR%%.so
%%BACK_BDB%%libexec/openldap/back_bdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACK_BDB%%libexec/openldap/back_bdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
%%BACK_BDB%%libexec/openldap/back_bdb.la
%%BACK_BDB%%libexec/openldap/back_bdb.so
-%%BACK_HDB%%libexec/openldap/back_hdb-%%OPENLDAP_MAJOR%%.so
%%BACK_HDB%%libexec/openldap/back_hdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACK_HDB%%libexec/openldap/back_hdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
%%BACK_HDB%%libexec/openldap/back_hdb.la
%%BACK_HDB%%libexec/openldap/back_hdb.so
-%%BACKEND%%libexec/openldap/back_ldap-%%OPENLDAP_MAJOR%%.so
%%BACKEND%%libexec/openldap/back_ldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACKEND%%libexec/openldap/back_ldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
%%BACKEND%%libexec/openldap/back_ldap.la
%%BACKEND%%libexec/openldap/back_ldap.so
-%%BACKEND%%libexec/openldap/back_meta-%%OPENLDAP_MAJOR%%.so
%%BACKEND%%libexec/openldap/back_meta-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACKEND%%libexec/openldap/back_meta-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
%%BACKEND%%libexec/openldap/back_meta.la
%%BACKEND%%libexec/openldap/back_meta.so
-%%BACKEND%%libexec/openldap/back_monitor-%%OPENLDAP_MAJOR%%.so
%%BACKEND%%libexec/openldap/back_monitor-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACKEND%%libexec/openldap/back_monitor-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
%%BACKEND%%libexec/openldap/back_monitor.la
%%BACKEND%%libexec/openldap/back_monitor.so
-%%BACKEND%%libexec/openldap/back_null-%%OPENLDAP_MAJOR%%.so
%%BACKEND%%libexec/openldap/back_null-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACKEND%%libexec/openldap/back_null-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
%%BACKEND%%libexec/openldap/back_null.la
%%BACKEND%%libexec/openldap/back_null.so
-%%BACK_DNSSRV%%libexec/openldap/back_dnssrv-%%OPENLDAP_MAJOR%%.so
%%BACK_DNSSRV%%libexec/openldap/back_dnssrv-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACK_DNSSRV%%libexec/openldap/back_dnssrv-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
%%BACK_DNSSRV%%libexec/openldap/back_dnssrv.la
%%BACK_DNSSRV%%libexec/openldap/back_dnssrv.so
-%%BACK_MDB%%libexec/openldap/back_mdb-%%OPENLDAP_MAJOR%%.so
%%BACK_MDB%%libexec/openldap/back_mdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACK_MDB%%libexec/openldap/back_mdb-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
%%BACK_MDB%%libexec/openldap/back_mdb.la
%%BACK_MDB%%libexec/openldap/back_mdb.so
-%%BACK_PASSWD%%libexec/openldap/back_passwd-%%OPENLDAP_MAJOR%%.so
%%BACK_PASSWD%%libexec/openldap/back_passwd-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACK_PASSWD%%libexec/openldap/back_passwd-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
%%BACK_PASSWD%%libexec/openldap/back_passwd.la
%%BACK_PASSWD%%libexec/openldap/back_passwd.so
-%%BACK_PERL%%libexec/openldap/back_perl-%%OPENLDAP_MAJOR%%.so
%%BACK_PERL%%libexec/openldap/back_perl-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACK_PERL%%libexec/openldap/back_perl-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
%%BACK_PERL%%libexec/openldap/back_perl.la
%%BACK_PERL%%libexec/openldap/back_perl.so
-%%BACK_RELAY%%libexec/openldap/back_relay-%%OPENLDAP_MAJOR%%.so
%%BACK_RELAY%%libexec/openldap/back_relay-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACK_RELAY%%libexec/openldap/back_relay-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
%%BACK_RELAY%%libexec/openldap/back_relay.la
%%BACK_RELAY%%libexec/openldap/back_relay.so
-%%BACK_SHELL%%libexec/openldap/back_shell-%%OPENLDAP_MAJOR%%.so
%%BACK_SHELL%%libexec/openldap/back_shell-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACK_SHELL%%libexec/openldap/back_shell-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
%%BACK_SHELL%%libexec/openldap/back_shell.la
%%BACK_SHELL%%libexec/openldap/back_shell.so
-%%BACK_SOCK%%libexec/openldap/back_sock-%%OPENLDAP_MAJOR%%.so
%%BACK_SOCK%%libexec/openldap/back_sock-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACK_SOCK%%libexec/openldap/back_sock-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
%%BACK_SOCK%%libexec/openldap/back_sock.la
%%BACK_SOCK%%libexec/openldap/back_sock.so
-%%BACK_SQL%%libexec/openldap/back_sql-%%OPENLDAP_MAJOR%%.so
%%BACK_SQL%%libexec/openldap/back_sql-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+%%BACK_SQL%%libexec/openldap/back_sql-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
%%BACK_SQL%%libexec/openldap/back_sql.la
%%BACK_SQL%%libexec/openldap/back_sql.so
%%SHA2%%libexec/openldap/pw-sha2.la
%%SHA2%%libexec/openldap/pw-sha2.so
%%SHA2%%libexec/openldap/pw-sha2.so.0
+%%SHA2%%libexec/openldap/pw-sha2.so.0.0.0
%%SMBPWD%%libexec/openldap/smbk5pwd.la
%%SMBPWD%%libexec/openldap/smbk5pwd.so
%%SMBPWD%%libexec/openldap/smbk5pwd.so.0
+%%SMBPWD%%libexec/openldap/smbk5pwd.so.0.0.0
libexec/slapd
%%MODULES%%@dirrmtry libexec/openldap
sbin/slapacl
diff --git a/net/openldap24-server/pkg-plist.client b/net/openldap24-server/pkg-plist.client
index 5d945d0bbf35..2d6a2db0b784 100644
--- a/net/openldap24-server/pkg-plist.client
+++ b/net/openldap24-server/pkg-plist.client
@@ -21,18 +21,18 @@ include/ldap_schema.h
include/ldap_utf8.h
include/ldif.h
include/slapi-plugin.h
-lib/liblber-%%OPENLDAP_MAJOR%%.so
lib/liblber-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+lib/liblber-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
lib/liblber.a
lib/liblber.la
lib/liblber.so
-lib/libldap-%%OPENLDAP_MAJOR%%.so
lib/libldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+lib/libldap-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
lib/libldap.a
lib/libldap.la
lib/libldap.so
-lib/libldap_r-%%OPENLDAP_MAJOR%%.so
lib/libldap_r-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%
+lib/libldap_r-%%OPENLDAP_MAJOR%%.so.%%SHLIB_MAJOR%%.10.2
lib/libldap_r.a
lib/libldap_r.la
lib/libldap_r.so
diff --git a/net/openradius/Makefile b/net/openradius/Makefile
index 6a8ccb0b387d..79939a75fbfb 100644
--- a/net/openradius/Makefile
+++ b/net/openradius/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openradius
PORTVERSION= 0.9.12c
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://evbergen.home.xs4all.nl/openradius/download/ \
http://www.mirrors.wiretapped.net/security/authentication/radius/openradius/
diff --git a/net/php5-ldap/Makefile b/net/php5-ldap/Makefile
index 5a619643363a..75e0ee0400e6 100644
--- a/net/php5-ldap/Makefile
+++ b/net/php5-ldap/Makefile
@@ -1,6 +1,7 @@
# Created by: Alex Dupre <ale@FreeBSD.org>
# $FreeBSD$
+PORTREVISION= 1
CATEGORIES= net
MASTERDIR= ${.CURDIR}/../../lang/php5
diff --git a/net/php53-ldap/Makefile b/net/php53-ldap/Makefile
index 8dc461d238db..3e452726a40c 100644
--- a/net/php53-ldap/Makefile
+++ b/net/php53-ldap/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PORTREVISION= 4
CATEGORIES= net
MASTERDIR= ${.CURDIR}/../../lang/php53
diff --git a/net/php55-ldap/Makefile b/net/php55-ldap/Makefile
index 784bef55a0f0..a6b3e6c78f24 100644
--- a/net/php55-ldap/Makefile
+++ b/net/php55-ldap/Makefile
@@ -1,6 +1,7 @@
# Created by: Alex Dupre <ale@FreeBSD.org>
# $FreeBSD$
+PORTREVISION= 1
CATEGORIES= net
MASTERDIR= ${.CURDIR}/../../lang/php55
diff --git a/net/proftpd-mod_ldap/Makefile b/net/proftpd-mod_ldap/Makefile
index 8834aa60f725..82271e0b6b09 100644
--- a/net/proftpd-mod_ldap/Makefile
+++ b/net/proftpd-mod_ldap/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= mod_ldap
+PORTREVISION= 3
CATEGORIES= net ftp
PKGNAMEPREFIX= proftpd-
diff --git a/net/proxy-suite/Makefile b/net/proxy-suite/Makefile
index 248925c2c41a..942fb9ff65d3 100644
--- a/net/proxy-suite/Makefile
+++ b/net/proxy-suite/Makefile
@@ -3,7 +3,7 @@
PORTNAME= proxy-suite
PORTVERSION= 1.9.2.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= net
MASTER_SITES= ftp://ftp.suse.com/pub/projects/proxy-suite/src/
diff --git a/net/py-ldap2/Makefile b/net/py-ldap2/Makefile
index 92265d4b87ca..7998bac1e866 100644
--- a/net/py-ldap2/Makefile
+++ b/net/py-ldap2/Makefile
@@ -2,6 +2,7 @@
PORTNAME= ldap2
PORTVERSION= 2.4.15
+PORTREVISION= 1
CATEGORIES= net python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/net/ruby-ldap/Makefile b/net/ruby-ldap/Makefile
index 66f701438746..22932d0b9a44 100644
--- a/net/ruby-ldap/Makefile
+++ b/net/ruby-ldap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ldap
PORTVERSION= 0.9.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net ruby
MASTER_SITES= RF
MASTER_SITE_SUBDIR= ruby-${PORTNAME}
diff --git a/net/samba36/Makefile b/net/samba36/Makefile
index 809226b9dd63..54836f13e9fd 100644
--- a/net/samba36/Makefile
+++ b/net/samba36/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ${SAMBA_BASENAME}36
PORTVERSION= 3.6.24
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SAMBA}
MASTER_SITE_SUBDIR= samba samba/stable samba/pre
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index c22c9530aa4a..ce3afe9d4f41 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= ${SAMBA4_BASENAME}4
PORTVERSION?= ${SAMBA4_VERSION}
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SAMBA}
MASTER_SITE_SUBDIR= samba/stable samba/rc
diff --git a/net/samba41/Makefile b/net/samba41/Makefile
index 6cb324213827..0370677e560e 100644
--- a/net/samba41/Makefile
+++ b/net/samba41/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= ${SAMBA4_BASENAME}41
PORTVERSION?= ${SAMBA4_VERSION}
-PORTREVISION?= 1
+PORTREVISION?= 2
CATEGORIES?= net
MASTER_SITES= ${MASTER_SITE_SAMBA}
MASTER_SITE_SUBDIR= samba/stable samba/rc
diff --git a/net/ss5/Makefile b/net/ss5/Makefile
index 0208ee2b84d8..8d3f342db79f 100644
--- a/net/ss5/Makefile
+++ b/net/ss5/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ss5
PORTVERSION= 3.8.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net security
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-1
DISTNAME= ${PORTNAME}-${PORTVERSION}-1
diff --git a/net/x2goclient/Makefile b/net/x2goclient/Makefile
index 99eaf75d49ae..2a3779981cbe 100644
--- a/net/x2goclient/Makefile
+++ b/net/x2goclient/Makefile
@@ -3,6 +3,7 @@
PORTNAME= x2goclient
PORTVERSION= 4.0.2.0
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://code.x2go.org/releases/source/x2goclient/
diff --git a/net/xbone/Makefile b/net/xbone/Makefile
index 1511ad6f3b7c..90bf80293f1d 100644
--- a/net/xbone/Makefile
+++ b/net/xbone/Makefile
@@ -3,7 +3,7 @@
PORTNAME= XBone
PORTVERSION= 3.2
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net perl5
MASTER_SITES= http://www.isi.edu/xbone/software/xbone/
diff --git a/net/yptransitd/Makefile b/net/yptransitd/Makefile
index d2244f2dd491..7aa3ae16103e 100644
--- a/net/yptransitd/Makefile
+++ b/net/yptransitd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= yptransitd
PORTVERSION= 0.5
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= net
MASTER_SITES= SF
diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index 04d4262d8c3a..8a8de4416a6e 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nntpcache
PORTVERSION= 3.0.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= news
MASTER_SITES= http://www.xs4all.nl/~suelette/
diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 6b609d919f6a..997310b0a555 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -3,6 +3,7 @@
PORTNAME= clamav
PORTVERSION= 0.98.4
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= SF
diff --git a/security/cyrus-sasl2-ldapdb/Makefile b/security/cyrus-sasl2-ldapdb/Makefile
index ebcfe091137e..69d6e479969d 100644
--- a/security/cyrus-sasl2-ldapdb/Makefile
+++ b/security/cyrus-sasl2-ldapdb/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ldapdb
PORTVERSION= 2.1.26
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security ipv6
MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ \
http://cyrusimap.org/releases/
diff --git a/security/cyrus-sasl2-saslauthd/Makefile b/security/cyrus-sasl2-saslauthd/Makefile
index 72c22b96c05d..fc4b2fba22f6 100644
--- a/security/cyrus-sasl2-saslauthd/Makefile
+++ b/security/cyrus-sasl2-saslauthd/Makefile
@@ -2,7 +2,7 @@
PORTNAME= saslauthd
PORTVERSION= 2.1.26
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= security ipv6
MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-sasl/ \
http://cyrusimap.org/releases/
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 6a82e522aff0..78b9a67f1c68 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dirmngr
PORTVERSION= 1.1.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= dirmngr
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 8bf5a3dfe7b7..0362c8f93a99 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gnupg
PORTVERSION= 2.0.25
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= gnupg
diff --git a/security/gnupg1/Makefile b/security/gnupg1/Makefile
index 792830a74298..442bf3e7ad77 100644
--- a/security/gnupg1/Makefile
+++ b/security/gnupg1/Makefile
@@ -2,6 +2,7 @@
PORTNAME= gnupg
PORTVERSION= 1.4.18
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GNUPG}
MASTER_SITE_SUBDIR= gnupg
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 2317303ad07c..15d595aa9501 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -3,7 +3,7 @@
PORTNAME= heimdal
PORTVERSION= 1.5.2
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= security ipv6
MASTER_SITES= http://www.h5l.org/dist/src/ \
http://ftp.pdc.kth.se/pub/heimdal/src/ \
diff --git a/security/ike/Makefile b/security/ike/Makefile
index 8ea30c0f2561..accc67ec45e8 100644
--- a/security/ike/Makefile
+++ b/security/ike/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ike
PORTVERSION= 2.2.1
+PORTREVISION= 1
CATEGORIES= security net
MASTER_SITES= https://www.shrew.net/download/ike/
DISTNAME= ${PORTNAME}-${PORTVERSION}-release
diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile
index 9a065511e6bb..741c8e0c13b9 100644
--- a/security/ipsec-tools/Makefile
+++ b/security/ipsec-tools/Makefile
@@ -8,7 +8,7 @@
PORTNAME= ipsec-tools
PORTVERSION= 0.8.1
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= security
MASTER_SITES= SF
diff --git a/security/krb5-maint/Makefile b/security/krb5-maint/Makefile
index d2b35eebaee9..cab99e4ae9a8 100644
--- a/security/krb5-maint/Makefile
+++ b/security/krb5-maint/Makefile
@@ -3,7 +3,7 @@
PORTNAME= krb5-maint
PORTVERSION= 1.11.5
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= http://web.mit.edu/kerberos/dist/krb5/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
DISTNAME= krb5-${PORTVERSION}-signed
diff --git a/security/krb5/Makefile b/security/krb5/Makefile
index e22bf9cd554e..f449d1cf639b 100644
--- a/security/krb5/Makefile
+++ b/security/krb5/Makefile
@@ -3,7 +3,7 @@
PORTNAME= krb5
PORTVERSION= 1.12.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= security
MASTER_SITES= http://web.mit.edu/kerberos/dist/${PORTNAME}/${PORTVERSION:C/^[0-9]*\.[0-9]*/&X/:C/X\.[0-9]*$//:C/X//}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-signed
diff --git a/security/openscep/Makefile b/security/openscep/Makefile
index 26fae423f3ec..ea991948aef1 100644
--- a/security/openscep/Makefile
+++ b/security/openscep/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openscep
PORTVERSION= 0.4.2
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= security
MASTER_SITES= http://openscep.othello.ch/download/
diff --git a/security/openssh-portable/Makefile b/security/openssh-portable/Makefile
index dc951a456adb..5e2a15d2da83 100644
--- a/security/openssh-portable/Makefile
+++ b/security/openssh-portable/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openssh
DISTVERSION= 6.6p1
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= security ipv6
MASTER_SITES= ${MASTER_SITE_OPENBSD}
diff --git a/security/openvpn-auth-ldap/Makefile b/security/openvpn-auth-ldap/Makefile
index a0035cdc24ea..9edcfdba70f9 100644
--- a/security/openvpn-auth-ldap/Makefile
+++ b/security/openvpn-auth-ldap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openvpn-auth-ldap
PORTVERSION= 2.0.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= auth-ldap-${PORTVERSION}
diff --git a/security/pam_ldap/Makefile b/security/pam_ldap/Makefile
index a4853044df45..94d6b24e8fb0 100644
--- a/security/pam_ldap/Makefile
+++ b/security/pam_ldap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pam_ldap
PORTVERSION= 1.8.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= security net
MASTER_SITES= http://www.padl.com/download/ \
ftp://ftp.padl.com/pub/
diff --git a/security/pam_yubico/Makefile b/security/pam_yubico/Makefile
index 1728f6a3f77c..c6d120da382c 100644
--- a/security/pam_yubico/Makefile
+++ b/security/pam_yubico/Makefile
@@ -2,7 +2,7 @@
PORTNAME= pam_yubico
PORTVERSION= 2.16
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= http://opensource.yubico.com/yubico-pam/releases/
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index fc7c5b59e81d..d245e6ad5225 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -4,7 +4,7 @@
PORTNAME= seahorse
PORTVERSION= 2.32.0
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= security gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome2
diff --git a/security/sssd/Makefile b/security/sssd/Makefile
index 8b3f4aec8f7c..f3533700eb52 100644
--- a/security/sssd/Makefile
+++ b/security/sssd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sssd
DISTVERSION= 1.9.6
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= security
MASTER_SITES= https://fedorahosted.org/released/${PORTNAME}/ \
http://mirrors.rit.edu/zi/
diff --git a/security/strongswan/Makefile b/security/strongswan/Makefile
index 93a0148e89c9..019dff9615a7 100644
--- a/security/strongswan/Makefile
+++ b/security/strongswan/Makefile
@@ -3,7 +3,7 @@
PORTNAME= strongswan
PORTVERSION= 5.1.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= security
MASTER_SITES= http://download.strongswan.org/ \
http://download2.strongswan.org/
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 188f668b4677..42405916f197 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sudo
DISTVERSION= 1.8.10p3
+PORTREVISION= 1
CATEGORIES= security
MASTER_SITES= ${MASTER_SITE_SUDO}
diff --git a/sysutils/adtool/Makefile b/sysutils/adtool/Makefile
index c7980c9c8c90..14c362ca4a1a 100644
--- a/sysutils/adtool/Makefile
+++ b/sysutils/adtool/Makefile
@@ -3,6 +3,7 @@
PORTNAME= adtool
PORTVERSION= 1.3.3
+PORTREVISION= 1
CATEGORIES= sysutils
MASTER_SITES= http://gp2x.org/adtool/
diff --git a/sysutils/am-utils/Makefile b/sysutils/am-utils/Makefile
index 8dd6971a3dc0..d80e8e5c39b8 100644
--- a/sysutils/am-utils/Makefile
+++ b/sysutils/am-utils/Makefile
@@ -3,7 +3,7 @@
PORTNAME= am-utils
PORTVERSION= 6.1.5
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= sysutils net
MASTER_SITES= ftp://ftp.am-utils.org/pub/am-utils/ \
diff --git a/sysutils/cpu/Makefile b/sysutils/cpu/Makefile
index 831145b90194..1b7c94741f70 100644
--- a/sysutils/cpu/Makefile
+++ b/sysutils/cpu/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cpu
PORTVERSION= 1.4.3
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/sysutils/ldapenter/Makefile b/sysutils/ldapenter/Makefile
index 50ef4357dbde..af7d6e6c9f9a 100644
--- a/sysutils/ldapenter/Makefile
+++ b/sysutils/ldapenter/Makefile
@@ -3,6 +3,7 @@
PORTNAME= ldapenter
PORTVERSION= 0.2.0
+PORTREVISION= 1
CATEGORIES= sysutils editors net
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
diff --git a/sysutils/ldapvi/Makefile b/sysutils/ldapvi/Makefile
index 8538b4657529..0b3e0d5a6de8 100644
--- a/sysutils/ldapvi/Makefile
+++ b/sysutils/ldapvi/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ldapvi
PORTVERSION= 1.7
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= sysutils net
MASTER_SITES= http://www.lichteblau.com/download/ \
LOCAL/sbz
diff --git a/sysutils/lookupd_ldap/Makefile b/sysutils/lookupd_ldap/Makefile
index 59d4fda805e8..756285e00a6e 100644
--- a/sysutils/lookupd_ldap/Makefile
+++ b/sysutils/lookupd_ldap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= lookupd_ldap
PORTVERSION= 0.1.a
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils net
MASTER_SITES= http://www.rsu.ru/~bushman/lookupd/ldap/downloads/
diff --git a/sysutils/msktutil/Makefile b/sysutils/msktutil/Makefile
index 4b11acdd6433..4cb47a9af901 100644
--- a/sysutils/msktutil/Makefile
+++ b/sysutils/msktutil/Makefile
@@ -3,7 +3,7 @@
PORTNAME= msktutil
PORTVERSION= 0.5.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= sysutils
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
http://mirrors.rit.edu/zi/
diff --git a/www/aws/Makefile b/www/aws/Makefile
index 44716fc225dd..c43da3864b0e 100644
--- a/www/aws/Makefile
+++ b/www/aws/Makefile
@@ -3,7 +3,7 @@
PORTNAME= aws
PORTVERSION= 3.2.0.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://downloads.dragonlace.net/src/
diff --git a/www/c-icap/Makefile b/www/c-icap/Makefile
index 5a7a5d94206d..2de4a3806e5d 100644
--- a/www/c-icap/Makefile
+++ b/www/c-icap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= c-icap
PORTVERSION= 0.3.3
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/0.3.x/
diff --git a/www/cacheboy16/Makefile b/www/cacheboy16/Makefile
index a0eef350d37c..81201351f61c 100644
--- a/www/cacheboy16/Makefile
+++ b/www/cacheboy16/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cacheboy
DISTVERSION= 1.6
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= cacheboy-1.6-r13601
diff --git a/www/cherokee/Makefile b/www/cherokee/Makefile
index ff028c823356..4a5d8a776172 100644
--- a/www/cherokee/Makefile
+++ b/www/cherokee/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cherokee
PORTVERSION= 1.2.101
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_SAMBA}
MASTER_SITE_SUBDIR=cherokee/1.2/${PORTVERSION}
diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index 48d178c1921e..67b95e4498cf 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= lighttpd
PORTVERSION= 1.4.35
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES?= www
MASTER_SITES?= http://download.lighttpd.net/lighttpd/releases-1.4.x/
diff --git a/www/lusca-head/Makefile b/www/lusca-head/Makefile
index 1c1f003de789..1a7335efd073 100644
--- a/www/lusca-head/Makefile
+++ b/www/lusca-head/Makefile
@@ -76,7 +76,7 @@ NO_STAGE= yes
PORTNAME= lusca
DISTVERSION= r14809
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
PROJECTHOST= lusca-cache
diff --git a/www/mod_cfg_ldap/Makefile b/www/mod_cfg_ldap/Makefile
index bcb4f01a34ec..bf4e58de1b23 100644
--- a/www/mod_cfg_ldap/Makefile
+++ b/www/mod_cfg_ldap/Makefile
@@ -3,7 +3,7 @@
PORTNAME= mod_cfg_ldap
PORTVERSION= 1.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= www
MASTER_SITES= SF/modcfgldap/${PORTNAME}/${PORTVERSION}
DIST_SUBDIR= apache2
diff --git a/www/mod_vhost_ldap/Makefile b/www/mod_vhost_ldap/Makefile
index a3946071acb3..3eb628033eb5 100644
--- a/www/mod_vhost_ldap/Makefile
+++ b/www/mod_vhost_ldap/Makefile
@@ -3,6 +3,7 @@
PORTNAME= mod_vhost_ldap
PORTVERSION= 2.0.8
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITE_SUBDIR=pool/main/m/mod-vhost-ldap
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 7c865895de42..381f26db33d6 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.7.3
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://nginx.org/download/
MASTER_SITES+= ${MASTER_SITE_LOCAL}
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 50da1ffb3906..267bd3cf7cea 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -3,7 +3,7 @@
PORTNAME= nginx
PORTVERSION= 1.6.0
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 2
CATEGORIES= www
MASTER_SITES= http://nginx.org/download/
diff --git a/www/sarg/Makefile b/www/sarg/Makefile
index 55da35f1e20b..27888d54d2f4 100644
--- a/www/sarg/Makefile
+++ b/www/sarg/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sarg
PORTVERSION= 2.3.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= www
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/www/squid/Makefile b/www/squid/Makefile
index dae846b77e46..76de3e69854b 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -75,7 +75,7 @@ NO_STAGE= yes
PORTNAME= squid
PORTVERSION= 2.7.${SQUID_STABLE_VER}
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= www
MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
http://mirrors.ccs.neu.edu/Squid/ \
diff --git a/www/squid32/Makefile b/www/squid32/Makefile
index 74b637cb8ff0..83102d08ecbb 100644
--- a/www/squid32/Makefile
+++ b/www/squid32/Makefile
@@ -3,7 +3,7 @@
PORTNAME= squid
PORTVERSION= 3.2.${SQUID_STABLE_VER}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www ipv6
MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
http://mirrors.ccs.neu.edu/Squid/ \
diff --git a/www/squid33/Makefile b/www/squid33/Makefile
index 71f891005718..a2a5344b385d 100644
--- a/www/squid33/Makefile
+++ b/www/squid33/Makefile
@@ -3,7 +3,7 @@
PORTNAME= squid
PORTVERSION= 3.3.${SQUID_STABLE_VER}
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www ipv6
MASTER_SITES= ftp://ftp.squid-cache.org/pub/%SUBDIR%/ \
http://mirrors.ccs.neu.edu/Squid/ \
diff --git a/www/squidguard/Makefile b/www/squidguard/Makefile
index ee1c29ce5c5f..7135cde94d8f 100644
--- a/www/squidguard/Makefile
+++ b/www/squidguard/Makefile
@@ -2,7 +2,7 @@
PORTNAME= squidGuard
PORTVERSION= 1.4
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= www
MASTER_SITES= http://www.squidguard.org/Downloads/:a \
http://www.squidguard.org/Downloads/Contrib/:b
diff --git a/www/tengine/Makefile b/www/tengine/Makefile
index b80b499e36c0..1cdc3fc45a98 100644
--- a/www/tengine/Makefile
+++ b/www/tengine/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tengine
PORTVERSION= 2.0.3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= GH
diff --git a/www/xshttpd-devel/Makefile b/www/xshttpd-devel/Makefile
index c9ddaf18393a..43bf93d4568a 100644
--- a/www/xshttpd-devel/Makefile
+++ b/www/xshttpd-devel/Makefile
@@ -3,6 +3,7 @@
PORTNAME= xshttpd
DISTVERSION= 3.7b30
+PORTREVISION= 1
CATEGORIES= www ipv6
MASTER_SITES= ftp://ftp.stack.nl/pub/xs-httpd/release/ \
ftp://mud.stack.nl/pub/xs-httpd/release/
diff --git a/www/xshttpd/Makefile b/www/xshttpd/Makefile
index 52190d417d6c..59101ed35a8b 100644
--- a/www/xshttpd/Makefile
+++ b/www/xshttpd/Makefile
@@ -3,7 +3,7 @@
PORTNAME= xshttpd
DISTVERSION= 3.6g01
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= www ipv6
MASTER_SITES= ftp://ftp.stack.nl/pub/xs-httpd/release/ \
ftp://mud.stack.nl/pub/xs-httpd/release/
diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile
index e4f212dc29e3..5d55a998f1dc 100644
--- a/x11-toolkits/py-gnome-extras/Makefile
+++ b/x11-toolkits/py-gnome-extras/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gnome-extras
PORTVERSION= 2.25.3
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= x11-toolkits python gnome
MASTER_SITES= GNOME
MASTER_SITE_SUBDIR= sources/gnome-python-extras/${PORTVERSION:C/..$//}
@@ -22,7 +22,7 @@ LIB_DEPENDS= libgtkspell.so:${PORTSDIR}/textproc/gtkspell \
libgksu2.so:${PORTSDIR}/sysutils/libgksu \
# gdl-1.2:${PORTSDIR}/x11-toolkits/gdl
-USES= gmake libtool:keepla pathfix pkgconfig tar:bzip2
+USES= gmake libtool pathfix pkgconfig tar:bzip2
USE_PYTHON= yes
USE_GNOME= libgtkhtml pygnome2 libgda4
GNU_CONFIGURE= yes
diff --git a/x11-toolkits/py-gnome-extras/pkg-plist b/x11-toolkits/py-gnome-extras/pkg-plist
index ccb1d0a4426e..d43ac1125111 100644
--- a/x11-toolkits/py-gnome-extras/pkg-plist
+++ b/x11-toolkits/py-gnome-extras/pkg-plist
@@ -2,20 +2,14 @@ include/pygda-4.0/pygdavalue_conversions.h
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/recent.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/recent.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/egg/trayicon.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gda.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gda.so
%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu2/__init__.py
%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu2/__init__.pyc
%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu2/__init__.pyo
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu2/_gksu2.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gksu2/_gksu2.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkhtml2.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkhtml2.so
-%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.la
%%PYTHON_SITELIBDIR%%/gtk-2.0/gtkspell.so
libdata/pkgconfig/gnome-python-extras-2.0.pc
libdata/pkgconfig/pygda-4.0.pc