Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 02 Nov 2012 11:17:14 +0100
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        jgh@FreeBSD.org
Subject:   ports/173292: [PATCH] graphics/cbrpager: Makefile changed, OptionsNG, Desktop entries, take maintainership
Message-ID:  <20121102101724.2700C96D@hub.freebsd.org>
Resent-Message-ID: <201211021020.qA2AK0n2003431@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         173292
>Category:       ports
>Synopsis:       [PATCH] graphics/cbrpager: Makefile changed, OptionsNG, Desktop entries, take maintainership
>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:   Fri Nov 02 10:20:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:

- Take maintainership

Makefile changed:
+		http://jcoppens.com/soft/cbrpager/img/:icons
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+		snap.jpeg:icons
+BUILD_DEPENDS=	jpegtopnm:${PORTSDIR}/graphics/netpbm
+PLIST_FILES=
+DESKTOP_ENTRIES=
+OPTIONS_DEFINE=	NLS
+.include <bsd.port.options.mk>
+.if ${PORT_OPTIONS:MNLS}
+post-configure:
+post-build:

Generated and tested manually, tested with port test and with RedPorts (all RELEASES, CLANG), sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:

portlint -A
looks fine.

port test: clean

Build log

https://redports.org/buildarchive/20121101234940-61752/

>Fix:

--- cbrpager-0.9.22_3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/graphics/cbrpager/Makefile ./Makefile
--- /usr/ports/graphics/cbrpager/Makefile	2012-06-01 07:19:39.000000000 +0200
+++ ./Makefile	2012-11-02 01:52:17.000000000 +0100
@@ -8,26 +8,59 @@
 
 PORTNAME=	cbrpager
 PORTVERSION=	0.9.22
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
+		http://jcoppens.com/soft/cbrpager/img/:icons
+DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} \
+		snap.jpeg:icons
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A viewer for cbr (comic book archive) files
+MAINTAINER=	nemysis@gmx.ch
+COMMENT=	Viewer for cbr (comic book archive) files
 
 LICENSE=	GPLv3
 
+BUILD_DEPENDS=	jpegtopnm:${PORTSDIR}/graphics/netpbm
+
 USE_GNOME=	libgnomeui
 GNU_CONFIGURE=	yes
+MAKE_JOBS_SAFE=	yes
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
-MAKE_JOBS_SAFE=	yes
 
-DESKTOP_ENTRIES=	"cbrPager" "Comic book files viewer" "" \
-			"cbrpager" "Application;Graphics;Viewer;" true
+PLIST_FILES=	bin/${PORTNAME} \
+		share/pixmaps/${PORTNAME}.png
+
+DESKTOP_ENTRIES="cbrPager" "${COMMENT}" "${PORTNAME}" \
+		"${PORTNAME}" "Application;Graphics;Viewer;" true
+
+OPTIONS_DEFINE=	NLS
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USE_GETTEXT=	yes
+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}
+	@${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)
 
-PLIST_FILES=	bin/cbrpager \
-		share/locale/es/LC_MESSAGES/cbrpager.mo \
-		share/locale/fr/LC_MESSAGES/cbrpager.mo
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.png ${PREFIX}/share/pixmaps
 
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/graphics/cbrpager/distinfo ./distinfo
--- /usr/ports/graphics/cbrpager/distinfo	2010-10-30 17:51:40.000000000 +0200
+++ ./distinfo	2012-11-01 23:14:00.000000000 +0100
@@ -1,2 +1,4 @@
-SHA256 (cbrpager-0.9.22.tar.gz) = 1852303374d7777f2a5f395fda97d78f970fa87c854ee048495a901922b7dd84
-SIZE (cbrpager-0.9.22.tar.gz) = 146216
+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
--- cbrpager-0.9.22_3.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121102101724.2700C96D>