ports/176486: [patch] x11/idesk: trim header, adopt optionsNG, cleanup

[Jason Helfman]

>Number:         176486
>Category:       ports
>Synopsis:       [patch] x11/idesk: trim header, adopt optionsNG, cleanup
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Feb 27 22:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>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 at 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 at root-login.org>
-#
+# Created by: Sascha Holzleiter <sascha at root-login.org>
 # $FreeBSD$
-#
 
 PORTNAME=	idesk
 PORTVERSION=	0.7.5
@@ -14,43 +10,47 @@
 MAINTAINER=	acm at 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:
>Unformatted: