Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 25 Apr 2014 06:30:29 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r352087 - head/databases/evolution-data-server
Message-ID:  <201404250630.s3P6UTHW069406@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Fri Apr 25 06:30:28 2014
New Revision: 352087
URL: http://svnweb.freebsd.org/changeset/ports/352087
QAT: https://qat.redports.org/buildarchive/r352087/

Log:
  Switch to USES=libtool
  Use options helpers
  Use options sub
  strip binaries

Modified:
  head/databases/evolution-data-server/Makefile
  head/databases/evolution-data-server/pkg-plist

Modified: head/databases/evolution-data-server/Makefile
==============================================================================
--- head/databases/evolution-data-server/Makefile	Fri Apr 25 06:29:25 2014	(r352086)
+++ head/databases/evolution-data-server/Makefile	Fri Apr 25 06:30:28 2014	(r352087)
@@ -4,7 +4,7 @@
 
 PORTNAME=	evolution-data-server
 PORTVERSION=	2.32.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -20,20 +20,18 @@ LIB_DEPENDS=	libsoup-2.4.so:${PORTSDIR}/
 		libtasn1.so:${PORTSDIR}/security/libtasn1 \
 		libgnome-keyring.so:${PORTSDIR}/security/libgnome-keyring
 
-USE_BZIP2=	yes
-USE_GMAKE=	yes
-USES=		bison pathfix gettext pkgconfig
-USE_GNOME=	gnomeprefix intlhack ltverhack ltasneededhack gconf2 \
-		libxml2
+USES=		bison gettext gmake libtool pathfix pkgconfig tar:bzip2
+USE_GNOME=	gnomeprefix intlhack gconf2 libxml2
 USE_OPENLDAP=	yes
 USE_SQLITE=	3
-USE_AUTOTOOLS=	libtool
 USE_BDB=	41+
 USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static \
 		--enable-gnome-keyring=yes \
 		--with-openldap=yes \
 		--with-libdb=${LOCALBASE}
+INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${LOCALBASE}/include -I${BDB_INCLUDE_DIR} ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
@@ -41,22 +39,17 @@ PLIST_SUB=	VERSION="2.32" EVO_VERSION="1
 
 OPTIONS_DEFINE=	WEATHER KERBEROS
 OPTIONS_DEFAULT=WEATHER KERBEROS
+OPTIONS_SUB=	yes
 WEATHER_DESC=	Weather calendar backend
 
+WEATHER_LIB_DEPENDS=	libgweather.so:${PORTSDIR}/net/libgweather
+WEATHER_CONFIGURE_WITH=	weather
+KERBEROS_CONFIGURE_WITH=	--with-krb5=/usr
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MKERBEROS}
-CONFIGURE_ARGS+=	--with-krb5=/usr
-KRB5_LIB=		`/usr/bin/krb5-config gssapi --libs`
-.endif
-
-.if ${PORT_OPTIONS:MWEATHER}
-LIB_DEPENDS+=		libgweather.so:${PORTSDIR}/net/libgweather
-CONFIGURE_ARGS+=	--with-weather
-PLIST_SUB+=		WEATHER=""
-.else
-CONFIGURE_ARGS+=	--without-weather
-PLIST_SUB+=		WEATHER="@comment "
+KRB5_LIB=	`/usr/bin/krb5-config gssapi --libs`
 .endif
 
 EDS_BDB_MSG=	"!!!WARNING!!!: Berkeley Database version is ${BDB_VER}.  If this is an upgrade, you may experience problems if you or any other Evolution-data-server users were previously using BDB_VER 41."

Modified: head/databases/evolution-data-server/pkg-plist
==============================================================================
--- head/databases/evolution-data-server/pkg-plist	Fri Apr 25 06:29:25 2014	(r352086)
+++ head/databases/evolution-data-server/pkg-plist	Fri Apr 25 06:30:28 2014	(r352087)
@@ -207,113 +207,93 @@ include/evolution-data-server-%%VERSION%
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-tree-model-generator.h
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.a
-lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.la
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.so
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelgroupwise.urls
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.a
-lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.la
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.so
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimap.urls
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimapx.a
-lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimapx.la
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimapx.so
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelimapx.urls
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamellocal.a
-lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamellocal.la
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamellocal.so
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamellocal.urls
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelnntp.a
-lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelnntp.la
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelnntp.so
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelnntp.urls
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelpop3.a
-lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelpop3.la
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelpop3.so
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelpop3.urls
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsendmail.a
-lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsendmail.la
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsendmail.so
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsendmail.urls
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsmtp.a
-lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsmtp.la
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsmtp.so
 lib/evolution-data-server-%%EVO_VERSION%%/camel-providers/libcamelsmtp.urls
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendfile.a
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendfile.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendfile.so
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgoogle.a
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgoogle.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgoogle.so
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgroupwise.a
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgroupwise.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendgroupwise.so
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendldap.a
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendldap.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendldap.so
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendvcf.a
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendvcf.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendvcf.so
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendwebdav.a
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendwebdav.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libebookbackendwebdav.so
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcaldav.a
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcaldav.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcaldav.so
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcontacts.a
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcontacts.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendcontacts.so
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendfile.a
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendfile.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendfile.so
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.a
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendgroupwise.so
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendhttp.a
-lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendhttp.la
 lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendhttp.so
 %%WEATHER%%lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.a
-%%WEATHER%%lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.la
 %%WEATHER%%lib/evolution-data-server-%%EVO_VERSION%%/extensions/libecalbackendweather.so
 lib/libcamel-%%EVO_VERSION%%.a
-lib/libcamel-%%EVO_VERSION%%.la
 lib/libcamel-%%EVO_VERSION%%.so
 lib/libcamel-%%EVO_VERSION%%.so.19
+lib/libcamel-%%EVO_VERSION%%.so.19.0.0
 lib/libcamel-provider-%%EVO_VERSION%%.a
-lib/libcamel-provider-%%EVO_VERSION%%.la
 lib/libcamel-provider-%%EVO_VERSION%%.so
 lib/libcamel-provider-%%EVO_VERSION%%.so.19
+lib/libcamel-provider-%%EVO_VERSION%%.so.19.0.0
 lib/libebackend-%%EVO_VERSION%%.a
-lib/libebackend-%%EVO_VERSION%%.la
 lib/libebackend-%%EVO_VERSION%%.so
 lib/libebackend-%%EVO_VERSION%%.so.0
+lib/libebackend-%%EVO_VERSION%%.so.0.0.1
 lib/libebook-%%EVO_VERSION%%.a
-lib/libebook-%%EVO_VERSION%%.la
 lib/libebook-%%EVO_VERSION%%.so
 lib/libebook-%%EVO_VERSION%%.so.10
+lib/libebook-%%EVO_VERSION%%.so.10.3.1
 lib/libecal-%%EVO_VERSION%%.a
-lib/libecal-%%EVO_VERSION%%.la
 lib/libecal-%%EVO_VERSION%%.so
 lib/libecal-%%EVO_VERSION%%.so.8
+lib/libecal-%%EVO_VERSION%%.so.8.2.2
 lib/libedata-book-%%EVO_VERSION%%.a
-lib/libedata-book-%%EVO_VERSION%%.la
 lib/libedata-book-%%EVO_VERSION%%.so
 lib/libedata-book-%%EVO_VERSION%%.so.8
+lib/libedata-book-%%EVO_VERSION%%.so.8.0.0
 lib/libedata-cal-%%EVO_VERSION%%.a
-lib/libedata-cal-%%EVO_VERSION%%.la
 lib/libedata-cal-%%EVO_VERSION%%.so
 lib/libedata-cal-%%EVO_VERSION%%.so.10
+lib/libedata-cal-%%EVO_VERSION%%.so.10.0.0
 lib/libedataserver-%%EVO_VERSION%%.a
-lib/libedataserver-%%EVO_VERSION%%.la
 lib/libedataserver-%%EVO_VERSION%%.so
 lib/libedataserver-%%EVO_VERSION%%.so.14
+lib/libedataserver-%%EVO_VERSION%%.so.14.0.0
 lib/libedataserverui-%%EVO_VERSION%%.a
-lib/libedataserverui-%%EVO_VERSION%%.la
 lib/libedataserverui-%%EVO_VERSION%%.so
 lib/libedataserverui-%%EVO_VERSION%%.so.11
+lib/libedataserverui-%%EVO_VERSION%%.so.11.0.0
 lib/libegroupwise-%%EVO_VERSION%%.a
-lib/libegroupwise-%%EVO_VERSION%%.la
 lib/libegroupwise-%%EVO_VERSION%%.so
 lib/libegroupwise-%%EVO_VERSION%%.so.13
+lib/libegroupwise-%%EVO_VERSION%%.so.13.0.1
 libdata/pkgconfig/camel-%%EVO_VERSION%%.pc
 libdata/pkgconfig/camel-provider-%%EVO_VERSION%%.pc
 libdata/pkgconfig/evolution-data-server-%%EVO_VERSION%%.pc



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404250630.s3P6UTHW069406>