svn commit: r338402 - head/graphics/cbrpager

[Rusmir Dusko]

Author: nemysis
Date: Wed Jan  1 23:40:47 2014
New Revision: 338402
URL: http://svnweb.freebsd.org/changeset/ports/338402

Log:
  - Change master sites, icon
  - Remove dependency for graphics/netpbm
  - Add NLS Option
  - Simplify Option NLS handling
  - Change Desktop entry file
  - Support STAGEDIR and add OPTIONS_SUB
  
  Approved by:	pawel / wg (mentors, implicit)

Modified:
  head/graphics/cbrpager/Makefile
  head/graphics/cbrpager/distinfo   (contents, props changed)

Modified: head/graphics/cbrpager/Makefile
==============================================================================
--- head/graphics/cbrpager/Makefile	Wed Jan  1 23:13:57 2014	(r338401)
+++ head/graphics/cbrpager/Makefile	Wed Jan  1 23:40:47 2014	(r338402)
@@ -6,10 +6,9 @@ PORTVERSION=	0.9.22
 PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
-		http://jcoppens.com/soft/cbrpager/img/:icons
+		SF/nemysisfreebsdp/${CATEGORIES}/:icons
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
-		snap.jpeg:icons
-DIST_SUBDIR=	${PORTNAME}
+		${PORTNAME}.png:icons
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	nemysis at FreeBSD.org
@@ -17,45 +16,35 @@ COMMENT=	Viewer for cbr (comic book arch
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	jpegtopnm:${PORTSDIR}/graphics/netpbm
-
-GNU_CONFIGURE=	yes
 USES=		pkgconfig
+GNU_CONFIGURE=	yes
 USE_GNOME=	libgnomeui
 
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
+
+NLS_USES=	gettext
+
 PLIST_FILES=	bin/${PORTNAME} \
-		share/pixmaps/${PORTNAME}.png
+		share/pixmaps/${PORTNAME}.png \
+		%%NLS%%share/locale/es/LC_MESSAGES/${PORTNAME}.mo \
+		%%NLS%%share/locale/fr/LC_MESSAGES/${PORTNAME}.mo
 
-DESKTOP_ENTRIES="cbrPager" "Comic book viewer" \
-		"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
-		"${PORTNAME}" "Graphics;Viewer;GNOME;" true
+DESKTOP_ENTRIES="cbrPager" "Comic book viewer" "${PORTNAME}" \
+		"${PORTNAME}" "Graphics;Viewer;GNOME;" ""
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=		gettext
-PLIST_SUB+=	NLS=""
-PLIST_FILES+=	share/locale/es/LC_MESSAGES/${PORTNAME}.mo \
-		share/locale/fr/LC_MESSAGES/${PORTNAME}.mo
-.else
-PLIST_SUB+=	NLS="@comment "
-.endif
-
 post-configure:
-.if !${PORT_OPTIONS:MNLS}
+.if ! ${PORT_OPTIONS:MNLS}
 	@${REINPLACE_CMD} 's|src po|src|' ${WRKSRC}/Makefile
 .endif
 
-post-build:
-	@(cd ${WRKSRC} && \
-		${LOCALBASE}/bin/jpegtopnm ${DISTDIR}/${DIST_SUBDIR}/snap.jpeg | \
-		${LOCALBASE}/bin/pamscale .118 | ${LOCALBASE}/bin/pnmtopng > ${PORTNAME}.png)
-
 post-install:
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
 
 .include <bsd.port.mk>

Modified: head/graphics/cbrpager/distinfo
==============================================================================
--- head/graphics/cbrpager/distinfo	Wed Jan  1 23:13:57 2014	(r338401)
+++ head/graphics/cbrpager/distinfo	Wed Jan  1 23:40:47 2014	(r338402)
@@ -1,4 +1,4 @@
-SHA256 (cbrpager/cbrpager-0.9.22.tar.gz) = 1852303374d7777f2a5f395fda97d78f970fa87c854ee048495a901922b7dd84
-SIZE (cbrpager/cbrpager-0.9.22.tar.gz) = 146216
-SHA256 (cbrpager/snap.jpeg) = 3cc4264676c69d84620d6c136cfa87270ed214468553a94a64ea8ea1191b5877
-SIZE (cbrpager/snap.jpeg) = 60792
+SHA256 (cbrpager-0.9.22.tar.gz) = 1852303374d7777f2a5f395fda97d78f970fa87c854ee048495a901922b7dd84
+SIZE (cbrpager-0.9.22.tar.gz) = 146216
+SHA256 (cbrpager.png) = 9c0660c34361f3afb5e2ceb3361bf52ba1abf6740c3598c3cbfdbe185c00754b
+SIZE (cbrpager.png) = 3809