From owner-svn-ports-all@FreeBSD.ORG  Sun Mar 10 05:47:06 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 E1F47B1F;
 Sun, 10 Mar 2013 05:47:06 +0000 (UTC)
 (envelope-from beech@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 BB719DB2;
 Sun, 10 Mar 2013 05:47:06 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2A5l6JC069926;
 Sun, 10 Mar 2013 05:47:06 GMT (envelope-from beech@svn.freebsd.org)
Received: (from beech@localhost)
 by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2A5l6hJ069923;
 Sun, 10 Mar 2013 05:47:06 GMT (envelope-from beech@svn.freebsd.org)
Message-Id: <201303100547.r2A5l6hJ069923@svn.freebsd.org>
From: Beech Rintoul <beech@FreeBSD.org>
Date: Sun, 10 Mar 2013 05:47:06 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r313805 - head/x11/fbpanel
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: Sun, 10 Mar 2013 05:47:07 -0000

Author: beech
Date: Sun Mar 10 05:47:05 2013
New Revision: 313805
URL: http://svnweb.freebsd.org/changeset/ports/313805

Log:
  - Makefile changed:
    Port is now safe with NOPORTDOCS=yes in /etc/make.conf
    LICENSE= MIT
    PORTDOCS= CHANGELOG CREDITS NOTES README
    OPTIONS_DEFINE= DOCS
    DESKTOP_ENTRIES=
    .include <bsd.port.options.mk>
    .if ${PORT_OPTIONS:MDOCS}
  - Changed and refined:
    post-install:
    pkg-plist
  - Pass maintainership to submitter
  
  PR:		ports/176797
  Submitted by:	nemysis <nemysis@gmx.ch>

Modified:
  head/x11/fbpanel/Makefile   (contents, props changed)
  head/x11/fbpanel/pkg-plist   (contents, props changed)

Modified: head/x11/fbpanel/Makefile
==============================================================================
--- head/x11/fbpanel/Makefile	Sun Mar 10 04:31:12 2013	(r313804)
+++ head/x11/fbpanel/Makefile	Sun Mar 10 05:47:05 2013	(r313805)
@@ -3,15 +3,15 @@
 
 PORTNAME=	fbpanel
 PORTVERSION=	6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	SF
 EXTRACT_SUFX=	.tbz2
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Lightweight, NETWM compliant X11 desktop panel
 
-LICENSE=	GPLv2
+LICENSE=	MIT
 
 USE_BZIP2=	yes
 HAS_CONFIGURE=	yes
@@ -22,12 +22,34 @@ USE_PKGCONFIG=	build
 
 MAN1=		${PORTNAME}.1
 
+PORTDOCS=	CHANGELOG CREDITS NOTES README
+
+OPTIONS_DEFINE=	DOCS
+
+DESKTOP_ENTRIES="${PORTNAME}" "${PORTNAME} NETWM compliant X11 desktop panel" \
+		"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
+		"${PORTNAME}" "System;" false
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDOCS}
+PLIST_SUB+=	PORTDOCS=""
+.else
+PLIST_SUB+=	PORTDOCS="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|bash|sh|' ${WRKSRC}/scripts/install.sh
 	@${REINPLACE_CMD} -e 's|@DATADIR@|${DATADIR}|' \
 		${WRKSRC}/data/man/${MAN1}.in
 
 post-install:
-	${INSTALL_MAN} ${WRKSRC}/data/man/${MAN1} ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/data/man/${MAN1} ${MAN1PREFIX}/man/man1/
+	${LN} -sf ${DATADIR}/images/logo.png ${PREFIX}/share/pixmaps/${PORTNAME}.png
+
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>

Modified: head/x11/fbpanel/pkg-plist
==============================================================================
--- head/x11/fbpanel/pkg-plist	Sun Mar 10 04:31:12 2013	(r313804)
+++ head/x11/fbpanel/pkg-plist	Sun Mar 10 05:47:05 2013	(r313805)
@@ -22,6 +22,10 @@ lib/fbpanel/tray.so
 lib/fbpanel/volume.so
 lib/fbpanel/wincmd.so
 libexec/fbpanel/make_profile
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/NOTES
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%DATADIR%%/default
 %%DATADIR%%/images/battery_0.png
 %%DATADIR%%/images/battery_1.png
@@ -48,7 +52,9 @@ libexec/fbpanel/make_profile
 %%DATADIR%%/images/gnome-session-reboot.png
 %%DATADIR%%/images/logo.png
 %%DATADIR%%/pager
+share/pixmaps/fbpanel.png
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm libexec/fbpanel
 @dirrm lib/fbpanel