From nemysis@gmx.ch  Sat Jun 29 22:14:32 2013
Return-Path: <nemysis@gmx.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	by hub.freebsd.org (Postfix) with ESMTP id 88FA6AC5
	for <freebsd-gnats-submit@freebsd.org>; Sat, 29 Jun 2013 22:14:32 +0000 (UTC)
	(envelope-from nemysis@gmx.ch)
Received: from mout.gmx.net (mout.gmx.net [212.227.15.18])
	by mx1.freebsd.org (Postfix) with ESMTP id 0FC93181B
	for <freebsd-gnats-submit@freebsd.org>; Sat, 29 Jun 2013 22:14:31 +0000 (UTC)
Received: from mailout-de.gmx.net ([10.1.76.29]) by mrigmx.server.lan
 (mrigmx002) with ESMTP (Nemesis) id 0M7FLk-1U53aq2ecI-00x78k for
 <FreeBSD-gnats-submit@freebsd.org>; Sun, 30 Jun 2013 00:14:30 +0200
Received: (qmail invoked by alias); 29 Jun 2013 22:14:29 -0000
Received: from 5-80.77-83.cust.bluewin.ch (EHLO something.email.com) [83.77.80.5]
  by mail.gmx.net (mp029) with SMTP; 30 Jun 2013 00:14:29 +0200
Received: by something.email.com (sSMTP sendmail emulation); Sun, 30 Jun 2013 00:14:27 +0200
Message-Id: <20130629221432.88FA6AC5@hub.freebsd.org>
Date: Sun, 30 Jun 2013 00:14:27 +0200
From: nemysis <nemysis@gmx.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc: jpaetzel@FreeBSD.org
Subject: [MAINTAINER] x11/libfm: Fix preserve original *.conf files, adjust deps
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         180110
>Category:       ports
>Synopsis:       [MAINTAINER] x11/libfm: Fix preserve original *.conf files, adjust deps
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    wg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 29 22:20:00 UTC 2013
>Closed-Date:    Wed Jul 03 12:41:41 UTC 2013
>Last-Modified:  Wed Jul  3 12:50:01 UTC 2013
>Originator:     nemysis
>Release:        FreeBSD 9.1-RELEASE-p8 amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.1-RELEASE-p8 FreeBSD 9.1-RELEASE-p8 #0: Tue Jun 18 15:25:28 UTC 2013
>Description:

- Fix preserve original *.conf files
- Remove dependency for x11/startup-notification
- Add dependency for lang/vala
- Trim REINPLACE_CMD, remove for lang/vala

Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_8 (mode: change, diff: ports)
>How-To-Repeat:

These dependencies to change have me told Upstream.

>Fix:

--- libfm-1.1.0_1.patch begins here ---
diff -ruN /usr/ports/x11/libfm/Makefile ./Makefile
--- /usr/ports/x11/libfm/Makefile	2013-06-22 16:05:41.000000000 +0200
+++ ./Makefile	2013-06-29 23:07:58.000000000 +0200
@@ -12,8 +12,8 @@
 
 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 @@
 .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 @@
 	@(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>
--- libfm-1.1.0_1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->wg 
Responsible-Changed-By: wg 
Responsible-Changed-When: Wed Jul 3 01:32:51 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180110 
State-Changed-From-To: open->closed 
State-Changed-By: wg 
State-Changed-When: Wed Jul 3 12:41:41 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=180110 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/180110: commit references a PR
Date: Wed,  3 Jul 2013 12:41:36 +0000 (UTC)

 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>
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
