- 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)

2 files changed, 18 insertions, 21 deletions

diff --git a/x11/idesk/Makefile b/x11/idesk/Makefile
index f4cd83883bfd..003ff531fee5 100644
--- a/x11/idesk/Makefile
+++ b/x11/idesk/Makefile
@@ -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}/${PORTNAME}-${PORTVERSION}
 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>
diff --git a/x11/idesk/pkg-plist b/x11/idesk/pkg-plist
deleted file mode 100644
index e07c8326af63..000000000000
--- a/x11/idesk/pkg-plist
+++ /dev/null
@@ -1,3 +0,0 @@
-bin/idesk
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%