Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 Dec 2012 16:57:09 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r308160 - in head/graphics/cbrpager: . files
Message-ID:  <201212031657.qB3Gv9Cw078940@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Mon Dec  3 16:57:09 2012
New Revision: 308160
URL: http://svnweb.freebsd.org/changeset/ports/308160

Log:
  - Install program's icon [1]
  - Respect NLS option [1]
  - Take maintainership [1]
  - Port needs pkg-config during build
  - Fix build with clang
  - Trim Makefile header
  
  PR:		ports/173292 [1]
  Submitted by:	nemysis <nemysis@gmx.ch> [1]
  Feature safe:	yes

Added:
  head/graphics/cbrpager/files/
  head/graphics/cbrpager/files/patch-src__global.c   (contents, props changed)
Modified:
  head/graphics/cbrpager/Makefile
  head/graphics/cbrpager/distinfo

Modified: head/graphics/cbrpager/Makefile
==============================================================================
--- head/graphics/cbrpager/Makefile	Mon Dec  3 16:55:43 2012	(r308159)
+++ head/graphics/cbrpager/Makefile	Mon Dec  3 16:57:09 2012	(r308160)
@@ -1,33 +1,60 @@
-# ex:ts=8
-# Ports collection makefile for:	cbrpager
-# Date created:			Oct 28, 2004
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 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
 
-USE_GNOME=	libgnomeui
+BUILD_DEPENDS=	jpegtopnm:${PORTSDIR}/graphics/netpbm
+
 GNU_CONFIGURE=	yes
+USE_PKGCONFIG=	build
+USE_GNOME=	libgnomeui
+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
+
+.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>

Modified: head/graphics/cbrpager/distinfo
==============================================================================
--- head/graphics/cbrpager/distinfo	Mon Dec  3 16:55:43 2012	(r308159)
+++ head/graphics/cbrpager/distinfo	Mon Dec  3 16:57:09 2012	(r308160)
@@ -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

Added: head/graphics/cbrpager/files/patch-src__global.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/cbrpager/files/patch-src__global.c	Mon Dec  3 16:57:09 2012	(r308160)
@@ -0,0 +1,11 @@
+--- ./src/global.c.orig	2012-12-03 17:33:00.000000000 +0100
++++ ./src/global.c	2012-12-03 17:33:17.000000000 +0100
+@@ -730,7 +730,7 @@
+ printf("Key1: %04x\n", event->keyval);
+ }
+ 
+-gboolean
++void
+ main_canvas_keypressed1(GdkEventKey *event)
+ {
+   GtkWidget *w;



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