From owner-svn-ports-all@FreeBSD.ORG  Thu Jan  2 07:20:47 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 69B22B31;
 Thu,  2 Jan 2014 07:20:47 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 3BE851D6B;
 Thu,  2 Jan 2014 07:20:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s027Kl2m067804;
 Thu, 2 Jan 2014 07:20:47 GMT (envelope-from nemysis@svn.freebsd.org)
Received: (from nemysis@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id s027KlqD067803;
 Thu, 2 Jan 2014 07:20:47 GMT (envelope-from nemysis@svn.freebsd.org)
Message-Id: <201401020720.s027KlqD067803@svn.freebsd.org>
From: Rusmir Dusko <nemysis@FreeBSD.org>
Date: Thu, 2 Jan 2014 07:20:47 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r338420 - head/graphics/cbviewer
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.17
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: Thu, 02 Jan 2014 07:20:47 -0000

Author: nemysis
Date: Thu Jan  2 07:20:46 2014
New Revision: 338420
URL: http://svnweb.freebsd.org/changeset/ports/338420

Log:
  - Change Makefile header
  - Change master sites
  - Remove -FETCH_ARGS?=-Fpr
  - Add DOCS Option
  - Change Desktop entry file
  - Support STAGEDIR
  
  Approved by:	pawel / wg (mentors, implicit)

Modified:
  head/graphics/cbviewer/Makefile

Modified: head/graphics/cbviewer/Makefile
==============================================================================
--- head/graphics/cbviewer/Makefile	Thu Jan  2 07:08:14 2014	(r338419)
+++ head/graphics/cbviewer/Makefile	Thu Jan  2 07:20:46 2014	(r338420)
@@ -1,4 +1,4 @@
-# Created by: nemysis@gmx.ch
+# Created by: nemysis <nemysis@gmx.ch>
 # $FreeBSD$
 
 PORTNAME=	cbviewer
@@ -6,7 +6,7 @@ PORTVERSION=	0.8
 PORTREVISION=	1
 CATEGORIES=	graphics java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/CBViewer%200.8/ \
-		SF/nemysisfreebsdp/:icons
+		SF/nemysisfreebsdp/graphics/:icons
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
 		${PORTNAME}.png:icons
 DIST_SUBDIR=	${PORTNAME}
@@ -20,41 +20,37 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar \
 		unzip:${PORTSDIR}/archivers/unzip
 
-FETCH_ARGS?=	-Fpr
-
 USE_ZIP=	yes
 USE_JAVA=	yes
 JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+
 PLIST_FILES=	bin/${PORTNAME} \
 		share/java/cbviewer/CBViewer.jar \
 		share/pixmaps/${PORTNAME}.png
 PLIST_DIRSTRY=	share/java/cbviewer
 
 PORTDOCS=	CREDITS
-DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 
-SUB_FILES=	${PORTNAME}
+OPTIONS_DEFINE=	DOCS
 
-DESKTOP_ENTRIES="CBViewer" "Comic book viewer" \
-		"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
-		"${PORTNAME}" "Graphics;Viewer;Java;" true
+SUB_FILES=	${PORTNAME}
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+DESKTOP_ENTRIES="CBViewer" "Comic book viewer" "${PORTNAME}" \
+		"${PORTNAME}" "Graphics;Viewer;Java;" ""
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/*.jar ${DATADIR}
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.jar ${STAGEDIR}${DATADIR}
 
 post-install:
-	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png ${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
 
-.if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>