From d199756acf5bf01eef79f2b92e472816893a5fac Mon Sep 17 00:00:00 2001
From: marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Mon, 20 Feb 2006 06:42:27 +0000
Subject: Use new ldconfig world order, and add USE_GETTEXT to appease
 portlint.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@5714 df743ca5-7f9a-e211-a948-0013205c9059
---
 mail/evolution/Makefile         | 18 +++++++++---------
 mail/evolution/files/evolibs.sh | 15 ---------------
 mail/evolution/pkg-plist        |  1 -
 3 files changed, 9 insertions(+), 25 deletions(-)
 delete mode 100644 mail/evolution/files/evolibs.sh

(limited to 'mail/evolution')

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 763a5d653..73d104ec5 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,11 +3,12 @@
 # Whom:					Ade Lovett <ade@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/mail/evolution/Makefile,v 1.88 2006/01/31 20:36:50 marcus Exp $
+#   $MCom: ports/mail/evolution/Makefile,v 1.89 2006/02/14 18:02:16 marcus Exp $
 #
 
 PORTNAME=	evolution
 PORTVERSION=	2.5.91
+PORTREVISION=	1
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.5
@@ -22,11 +23,14 @@ RUN_DEPENDS=	${X11BASE}/lib/gnome-spell/libgnome-spell-component-0.3.so:${PORTSD
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
+USE_GETTEXT=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack evolutiondataserver \
 		gtkhtml3 desktopfileutils
 USE_AUTOTOOLS=	libtool:15
 INSTALLS_OMF=	yes
+INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS=	%%PREFIX%%/lib/evolution/%%VERSION%%
 CONFIGURE_ARGS=	--enable-nss=yes \
 		--with-nss-includes=${LOCALBASE}/include/nss/nss \
 		--with-nss-libs=${LOCALBASE}/lib \
@@ -53,6 +57,9 @@ OPTIONS=	PILOT "Enable Palm Pilot sync support" off \
 
 .include <bsd.port.pre.mk>
 
+USE_LDCONFIG=	${PREFIX}/lib/evolution/${EVO_VERSION}
+.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
+
 .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
 WITH_GSTREAMER=	yes
 WITH_DBUS=	yes
@@ -112,16 +119,9 @@ CONFIGURE_ARGS+=	--with-krb5=${LOCALBASE}
 .endif
 .endif
 
-post-patch:
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}| ; \
-		s|%%EVO_VERSION%%|${EVO_VERSION}|' \
-		${FILESDIR}/evolibs.sh > ${WRKDIR}/evolibs.sh
-
-post-install:
+post-install: install-ldconfig-file
 	@${LN} -sf ${PREFIX}/bin/evolution-${EVO_VERSION} \
 		${PREFIX}/bin/evolution
-	@${INSTALL_SCRIPT} -m 555 ${WRKDIR}/evolibs.sh \
-		${PREFIX}/etc/rc.d/000.evolibs.sh
 	-@update-desktop-database
 
 .include <bsd.port.post.mk>
diff --git a/mail/evolution/files/evolibs.sh b/mail/evolution/files/evolibs.sh
deleted file mode 100644
index e191b9c41..000000000
--- a/mail/evolution/files/evolibs.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-case "$1" in
-    start)
-    	/sbin/ldconfig -m %%PREFIX%%/lib/evolution/%%EVO_VERSION%%
-	;;
-    stop)
-    	;;
-    *)
-    	echo ""
-	echo "Usage: `basename $0` { start | stop }"
-	echo ""
-	exit 64
-	;;
-esac
diff --git a/mail/evolution/pkg-plist b/mail/evolution/pkg-plist
index 1eb215fe2..cdb6daf2e 100644
--- a/mail/evolution/pkg-plist
+++ b/mail/evolution/pkg-plist
@@ -1,6 +1,5 @@
 bin/evolution
 bin/evolution-%%VERSION%%
-etc/rc.d/000.evolibs.sh
 include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-popup.h
 include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-registry.h
 include/evolution-%%VERSION%%/a11y/e-table/gal-a11y-e-cell-text.h
-- 
cgit v1.2.3