From owner-svn-ports-all@FreeBSD.ORG  Wed Jul  3 12:41:29 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 481BBBE0;
 Wed,  3 Jul 2013 12:41:29 +0000 (UTC) (envelope-from wg@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 200DB198C;
 Wed,  3 Jul 2013 12:41:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r63CfTTM065006;
 Wed, 3 Jul 2013 12:41:29 GMT (envelope-from wg@svn.freebsd.org)
Received: (from wg@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r63CfS6m065005;
 Wed, 3 Jul 2013 12:41:28 GMT (envelope-from wg@svn.freebsd.org)
Message-Id: <201307031241.r63CfS6m065005@svn.freebsd.org>
From: William Grzybowski <wg@FreeBSD.org>
Date: Wed, 3 Jul 2013 12:41:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r322226 - head/x11/libfm
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 03 Jul 2013 12:41:29 -0000

Author: wg
Date: Wed Jul  3 12:41:28 2013
New Revision: 322226
URL: http://svnweb.freebsd.org/changeset/ports/322226

Log:
  x11/libfm: preserve conf files
  
  - Fix preservation of conf files
  - Fix dependencies
  
  PR:		ports/180110
  Submitted by:	nemysis <nemysis@gmx.ch> (maintainer)

Modified:
  head/x11/libfm/Makefile

Modified: head/x11/libfm/Makefile
==============================================================================
--- head/x11/libfm/Makefile	Wed Jul  3 12:38:31 2013	(r322225)
+++ head/x11/libfm/Makefile	Wed Jul  3 12:41:28 2013	(r322226)
@@ -12,8 +12,8 @@ COMMENT=	The libFM backend library to PC
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	startup-notification-1:${PORTSDIR}/x11/startup-notification \
-		menu-cache:${PORTSDIR}/x11/menu-cache
+BUILD_DEPENDS=	valac:${PORTSDIR}/lang/vala
+LIB_DEPENDS=	menu-cache:${PORTSDIR}/x11/menu-cache
 
 USES=		pkgconfig
 USE_GNOME=	gnomehack gtk20
@@ -36,8 +36,6 @@ NLS_USES=	gettext
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|^VALAC.*|VALAC=""|' \
-		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|-DG_DISABLE_DEPRECATED||g' \
 		${WRKSRC}/src/Makefile.in
 	@${REINPLACE_CMD} -e \
@@ -54,14 +52,11 @@ pre-install:
 	@(cd ${WRKDIR}/libfm-${PORTVERSION} && ${CHMOD} 755 install-sh)
 
 post-install:
-	${MKDIR} ${PREFIX}/etc/xdg/libfm
+	@${MKDIR} ${PREFIX}/etc/xdg/libfm
 	${INSTALL_DATA} ${WRKSRC}/data/libfm.conf ${PREFIX}/etc/xdg/libfm/libfm.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/data/pref-apps.conf ${PREFIX}/etc/xdg/libfm/pref-apps.conf.sample
-.if ! exists(${PREFIX}/etc/xdg/libfm/libfm.conf)
-	${INSTALL_DATA} ${WRKSRC}/data/libfm.conf ${PREFIX}/etc/xdg/libfm/libfm.conf
-.endif
-.if ! exists(${PREFIX}/etc/xdg/libfm/pref-apps.conf)
-	${INSTALL_DATA} ${WRKSRC}/data/pref-apps.conf ${PREFIX}/etc/xdg/libfm/pref-apps.conf
-.endif
-
+	@[ -f ${PREFIX}/etc/xdg/libfm/libfm.conf ] || \
+		${INSTALL_DATA} ${WRKSRC}/data/libfm.conf ${PREFIX}/etc/xdg/libfm/libfm.conf
+	@[ -f ${PREFIX}/etc/xdg/libfm/pref-apps.conf ] || \
+		${INSTALL_DATA} ${WRKSRC}/data/pref-apps.conf ${PREFIX}/etc/xdg/libfm/pref-apps.conf
 .include <bsd.port.mk>