From jgh@FreeBSD.org  Wed Feb 27 22:10:23 2013
Return-Path: <jgh@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 78CD1FDD
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 27 Feb 2013 22:10:23 +0000 (UTC)
	(envelope-from jgh@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87])
	by mx1.freebsd.org (Postfix) with ESMTP id 5CD045E4
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 27 Feb 2013 22:10:23 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.6/8.14.6) with ESMTP id r1RMANP6091028
	for <FreeBSD-gnats-submit@freebsd.org>; Wed, 27 Feb 2013 22:10:23 GMT
	(envelope-from jgh@freefall.freebsd.org)
Received: (from jgh@localhost)
	by freefall.freebsd.org (8.14.6/8.14.6/Submit) id r1RMANhP091027;
	Wed, 27 Feb 2013 22:10:23 GMT
	(envelope-from jgh)
Message-Id: <201302272210.r1RMANhP091027@freefall.freebsd.org>
Date: Wed, 27 Feb 2013 22:10:23 GMT
From: Jason Helfman <jgh@FreeBSD.org>
Reply-To: Jason Helfman <jgh@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] x11/idesk: trim header, adopt optionsNG, cleanup
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         176486
>Category:       ports
>Synopsis:       [patch] x11/idesk: trim header, adopt optionsNG, cleanup
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    jgh
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 27 22:20:00 UTC 2013
>Closed-Date:    Wed Mar 13 04:30:06 UTC 2013
>Last-Modified:  Wed Mar 13 04:40:00 UTC 2013
>Originator:     Jason Helfman
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD freefall.freebsd.org 10.0-CURRENT FreeBSD 10.0-CURRENT #2 r245102: Sun Jan 6 15:01:33 UTC 2013 root@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL amd64


	
>Description:
trim historical header
adoption of optionsNG
drop default WRKSRC assignment
add pkgconfig (build) requirement
trim abi versions for lib_depends (portlint)
drop pkg-plist in favor of plist_files and PORTDOCS
shift pkgmessage display into do-install target

buildlogs -> http://redports.org/buildarchive/20130227214801-47548/

>How-To-Repeat:
	
>Fix:

Index: Makefile
===================================================================
--- Makefile	(revision 313037)
+++ Makefile	(working copy)
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	idesk
-# Date created:		16 February 2003
-# Whom:			Sascha Holzleiter <sascha@root-login.org>
-#
+# Created by: Sascha Holzleiter <sascha@root-login.org>
 # $FreeBSD$
-#
 
 PORTNAME=	idesk
 PORTVERSION=	0.7.5
@@ -14,43 +10,47 @@
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Place launch icons and background directly on your desktop
 
-LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
+LIB_DEPENDS=	Xft:${PORTSDIR}/x11-fonts/libXft
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_EFL=	imlib2
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USE_PKGCONFIG=	build
 
+OPTIONS_DEFINE=	SHAPE SN
+SHAPE_DESC=	Enable support of the XShape extension
+SN_DESC=	Startup notification support
+OPTIONS_DEFAULT=	SHAPE
+
+.include <bsd.port.pre.mk>
+
 CXXFLAGS+=	`imlib2-config --cflags` `freetype-config --cflags`
 MAKE_ARGS=	cc="${CXX}" cflags="${CXXFLAGS}"
 SUB_FILES=	pkg-message
+PLIST_FILES=	bin/${PORTNAME}
+PORTDOCS=	README
 
-OPTIONS=	SHAPE	"Enable support of the XShape extension"	on \
-		SN	"Startup notification support"	off
+.include <bsd.port.options.mk>
 
-.include <bsd.port.pre.mk>
-
-.if !defined(WITHOUT_SHAPE)
+.if ${PORT_OPTIONS:MSHAPE}
 CONFIGURE_ARGS+=	--enable-shape
 .else
 CONFIGURE_ARGS+=	--disable-shape
 .endif
 
-.if defined(WITH_SN)
-LIB_DEPENDS+=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
+.if ${PORT_OPTIONS:MSN}
+LIB_DEPENDS+=	startup-notification:${PORTSDIR}/x11/startup-notification
 CONFIGURE_ARGS+=	--enable-libsn
 .endif
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/src/idesk ${PREFIX}/bin
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 		${MKDIR} ${DOCSDIR}
-		${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
+		${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
-
-post-install:
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 313037)
+++ pkg-plist	(working copy)
@@ -1,3 +0,0 @@
-bin/idesk
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->acm 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Wed Feb 27 22:20:21 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176486 
Responsible-Changed-From-To: acm->jgh 
Responsible-Changed-By: jgh 
Responsible-Changed-When: Wed Mar 13 03:15:11 UTC 2013 
Responsible-Changed-Why:  
maintainer timeout, 14days 

http://www.freebsd.org/cgi/query-pr.cgi?pr=176486 
State-Changed-From-To: open->closed 
State-Changed-By: jgh 
State-Changed-When: Wed Mar 13 04:30:06 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/176486: commit references a PR
Date: Wed, 13 Mar 2013 04:29:57 +0000 (UTC)

 Author: jgh
 Date: Wed Mar 13 04:29:50 2013
 New Revision: 314024
 URL: http://svnweb.freebsd.org/changeset/ports/314024
 
 Log:
   - trim historical header
   - adoption of optionsNG
   - standardize of shape description for options
   - drop default WRKSRC assignment
   - add pkgconfig (build) requirement
   - trim abi versions for lib_depends (portlint)
   - drop pkg-plist in favor of plist_files and PORTDOCS
   - shift pkgmessage display into do-install target
   
   PR:		176486
   Submitted by:	jgh@
   Approved by:	acm@, maintainer timeout (14 days)
 
 Deleted:
   head/x11/idesk/pkg-plist
 Modified:
   head/x11/idesk/Makefile
 
 Modified: head/x11/idesk/Makefile
 ==============================================================================
 --- head/x11/idesk/Makefile	Wed Mar 13 04:23:41 2013	(r314023)
 +++ head/x11/idesk/Makefile	Wed Mar 13 04:29:50 2013	(r314024)
 @@ -1,9 +1,5 @@
 -# New ports collection makefile for:	idesk
 -# Date created:		16 February 2003
 -# Whom:			Sascha Holzleiter <sascha@root-login.org>
 -#
 +# Created by: Sascha Holzleiter <sascha@root-login.org>
  # $FreeBSD$
 -#
  
  PORTNAME=	idesk
  PORTVERSION=	0.7.5
 @@ -14,43 +10,47 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}
  MAINTAINER=	acm@FreeBSD.org
  COMMENT=	Place launch icons and background directly on your desktop
  
 -LIB_DEPENDS=	Xft.2:${PORTSDIR}/x11-fonts/libXft
 +LIB_DEPENDS=	Xft:${PORTSDIR}/x11-fonts/libXft
  
  USE_BZIP2=	yes
  USE_GMAKE=	yes
  USE_EFL=	imlib2
  GNU_CONFIGURE=	yes
  USE_AUTOTOOLS=	autoconf
 -WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 +USE_PKGCONFIG=	build
 +
 +OPTIONS_DEFINE=	SHAPE SN
 +SHAPE_DESC=	Support of XShape extension
 +SN_DESC=	Startup notification support
 +OPTIONS_DEFAULT=	SHAPE
 +
 +.include <bsd.port.pre.mk>
  
  CXXFLAGS+=	`imlib2-config --cflags` `freetype-config --cflags`
  MAKE_ARGS=	cc="${CXX}" cflags="${CXXFLAGS}"
  SUB_FILES=	pkg-message
 +PLIST_FILES=	bin/${PORTNAME}
 +PORTDOCS=	README
  
 -OPTIONS=	SHAPE	"Enable support of the XShape extension"	on \
 -		SN	"Startup notification support"	off
 +.include <bsd.port.options.mk>
  
 -.include <bsd.port.pre.mk>
 -
 -.if !defined(WITHOUT_SHAPE)
 +.if ${PORT_OPTIONS:MSHAPE}
  CONFIGURE_ARGS+=	--enable-shape
  .else
  CONFIGURE_ARGS+=	--disable-shape
  .endif
  
 -.if defined(WITH_SN)
 -LIB_DEPENDS+=	startup-notification-1.0:${PORTSDIR}/x11/startup-notification
 +.if ${PORT_OPTIONS:MSN}
 +LIB_DEPENDS+=	startup-notification:${PORTSDIR}/x11/startup-notification
  CONFIGURE_ARGS+=	--enable-libsn
  .endif
  
  do-install:
  		${INSTALL_PROGRAM} ${WRKSRC}/src/idesk ${PREFIX}/bin
 -.if !defined(NOPORTDOCS)
 +.if ${PORT_OPTIONS:MDOCS}
  		${MKDIR} ${DOCSDIR}
 -		${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
 +		${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
  .endif
 -
 -post-install:
  	@${CAT} ${PKGMESSAGE}
  
  .include <bsd.port.post.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:
