* Update to 2.5.7

* Clean up the KDE menus, and add a new KDE sub-menu for storing all the
  KDE desktop icons.  Big thanks to Jeremy Messenger <mezz7@cox.net> for
  providing this.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@1812 df743ca5-7f9a-e211-a948-0013205c9059

1 files changed, 15 insertions, 2 deletions

diff --git a/devel/gnomevfs2/Makefile b/devel/gnomevfs2/Makefile
index e10ad2ba6..1b584b55c 100644
--- a/devel/gnomevfs2/Makefile
+++ b/devel/gnomevfs2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomevfs2
-PORTVERSION=	2.5.6
-PORTREVISION=	4
+PORTVERSION=	2.5.7
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-vfs/2.5
@@ -27,6 +26,7 @@ USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack gnomemimedata gconf2 \
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
+CONFIGURE_ARGS=	--disable-openssl
 CONFIGURE_ENV=	CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		BSD_PTHREAD_LIBS=${PTHREAD_LIBS}
@@ -44,6 +44,9 @@ WITH_SAMBA=		yes
 
 .if !defined(WITHOUT_KDE_MENUS)
 EXTRA_PATCHES=	${FILESDIR}/modules_vfolder_applications-all-users.vfolder-info.in
+PLIST_SUB+=	KDEMENUS=""
+.else
+PLIST_SUB+=	KDEMENUS="@comment "
 .endif
 
 .if exists(${LOCALBASE}/lib/libcdda_paranoia.a)
@@ -79,7 +82,17 @@ post-patch:
 		${WRKSRC}/libgnomevfs/Makefile.in \
 		${WRKSRC}/libgnomevfs/xdgmime.c \
 		${WRKSRC}/modules/vfolder/applications-all-users.vfolder-info.in
+.if !defined(WITHOUT_KDE_MENUS)
+	@${SED} -e 's|/usr/local|${LOCALBASE}|g' \
+		< ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
+.endif
 	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/test//" \
 		${WRKSRC}/Makefile.in
 
+post-install:
+	@${MKDIR} ${PREFIX}/share/gnome/vfolders
+.if !defined(WITHOUT_KDE_MENUS)
+	@${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/vfolders
+.endif
+
 .include <bsd.port.post.mk>