From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 22 18:20:16 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F1E2D10656DC for ; Tue, 22 Mar 2011 18:20:16 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D11658FC16 for ; Tue, 22 Mar 2011 18:20:16 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p2MIKG1I037667 for ; Tue, 22 Mar 2011 18:20:16 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p2MIKGx6037659; Tue, 22 Mar 2011 18:20:16 GMT (envelope-from gnats) Resent-Date: Tue, 22 Mar 2011 18:20:16 GMT Resent-Message-Id: <201103221820.p2MIKGx6037659@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, KATO Tsuguru Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 23B8110656A7 for ; Tue, 22 Mar 2011 18:12:58 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from msa106lp.auone-net.jp (msa106lp.auone-net.jp [222.3.140.169]) by mx1.freebsd.org (Postfix) with ESMTP id CAB578FC1E for ; Tue, 22 Mar 2011 18:12:57 +0000 (UTC) Received: from msa106lp.auone-net.jp (MSA106lp [172.27.12.184]) by msa106lp.auone-net.jp (au one net msa) with ESMTP id 2583050026F for ; Wed, 23 Mar 2011 03:04:13 +0900 (JST) Received: from localhost.localdomain (ZT048080.ppp.dion.ne.jp [59.128.48.80]) by msa106lp.auone-net.jp (au one net msa) with ESMTP id 5001723C036 for ; Wed, 23 Mar 2011 03:04:09 +0900 (JST) Message-Id: <20110323030221.79458cec.tkato432@yahoo.com> Date: Wed, 23 Mar 2011 03:02:21 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/155832: Update port: emulators/nonpareil to 0.79 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 22 Mar 2011 18:20:17 -0000 >Number: 155832 >Category: ports >Synopsis: Update port: emulators/nonpareil to 0.79 >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: Tue Mar 22 18:20:16 UTC 2011 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.3-RELEASE-p3 i386 >Organization: >Environment: >Description: - Update to version 0.79 >How-To-Repeat: >Fix: diff -urN /usr/ports/emulators/nonpareil/Makefile emulators/nonpareil/Makefile --- /usr/ports/emulators/nonpareil/Makefile 2010-10-26 19:30:36.000000000 +0900 +++ emulators/nonpareil/Makefile 2011-03-20 05:38:09.000000000 +0900 @@ -6,53 +6,46 @@ # PORTNAME= nonpareil -PORTVERSION= 0.78 -PORTREVISION= 8 +PORTVERSION= 0.79 CATEGORIES= emulators MASTER_SITES= http://nonpareil.brouhaha.com/download/ MAINTAINER= ports@FreeBSD.org COMMENT= Simulator for many HP calculators -BUILD_DEPENDS= pnmtopng:${PORTSDIR}/graphics/netpbm +LICENSE= GPLv2 +LICENSE_FILE= ${WRKSRC}/COPYING USE_BISON= build -USE_SCONS= yes USE_GNOME= gtk20 libxml2 -USE_SDL= mixer - -SCONS_ARGS+= prefix="${PREFIX}" +USE_SDL= sdl +USE_SCONS= yes +SCONS_ARGS= prefix="${PREFIX}" -PLIST_EXECS= bin/uasm bin/nonpareil bin/modutil -PLIST_DATA= lib/nonpareil/21.obj lib/nonpareil/25.obj \ - lib/nonpareil/32e.obj lib/nonpareil/33c.obj \ - lib/nonpareil/34c.obj lib/nonpareil/37e.obj \ - lib/nonpareil/38c.obj lib/nonpareil/38e.obj \ - lib/nonpareil/41cv.mod lib/nonpareil/41cx.mod \ - lib/nonpareil/82143a.mod lib/nonpareil/82182a.mod \ - lib/nonpareil/11c.obj lib/nonpareil/12c.obj \ - lib/nonpareil/15c.obj lib/nonpareil/16c.obj \ - lib/nonpareil/35.kml lib/nonpareil/45.kml \ - lib/nonpareil/55.kml lib/nonpareil/80.kml \ - lib/nonpareil/21.kml lib/nonpareil/25.kml \ - lib/nonpareil/32e.kml lib/nonpareil/33c.kml \ - lib/nonpareil/34c.kml lib/nonpareil/37e.kml \ - lib/nonpareil/38c.kml lib/nonpareil/38e.kml \ - lib/nonpareil/41cv.kml lib/nonpareil/41cx.kml \ - lib/nonpareil/11c.kml lib/nonpareil/12c.kml \ - lib/nonpareil/15c.kml lib/nonpareil/16c.kml \ - lib/nonpareil/35.png lib/nonpareil/45.png \ - lib/nonpareil/55.png lib/nonpareil/80.png \ - lib/nonpareil/21.png lib/nonpareil/25.png \ - lib/nonpareil/32e.png lib/nonpareil/33c.png \ - lib/nonpareil/34c.png lib/nonpareil/37e.png \ - lib/nonpareil/38c.png lib/nonpareil/41cv.png \ - lib/nonpareil/11c.png lib/nonpareil/12c.png \ - lib/nonpareil/15c.png lib/nonpareil/16c.png \ - lib/nonpareil/35.obj lib/nonpareil/35.lst \ - lib/nonpareil/45.obj lib/nonpareil/45.lst \ - lib/nonpareil/55.obj lib/nonpareil/55.lst \ - lib/nonpareil/80.obj lib/nonpareil/80.lst +PLIST_EXECS= bin/modutil bin/nonpareil bin/uasm +PLIST_DATA= lib/nonpareil/21.kml lib/nonpareil/21.obj \ + lib/nonpareil/21.png lib/nonpareil/25.kml \ + lib/nonpareil/25.obj lib/nonpareil/25.png \ + lib/nonpareil/32e.kml lib/nonpareil/32e.obj \ + lib/nonpareil/32e.png lib/nonpareil/33c.kml \ + lib/nonpareil/33c.obj lib/nonpareil/33c.png \ + lib/nonpareil/34c.kml lib/nonpareil/34c.obj \ + lib/nonpareil/34c.png lib/nonpareil/35.kml \ + lib/nonpareil/35.lst lib/nonpareil/35.obj \ + lib/nonpareil/35.png lib/nonpareil/37e.kml \ + lib/nonpareil/37e.obj lib/nonpareil/37e.png \ + lib/nonpareil/38c.kml lib/nonpareil/38c.obj \ + lib/nonpareil/38c.png lib/nonpareil/38e.kml \ + lib/nonpareil/38e.obj lib/nonpareil/41cv.kml \ + lib/nonpareil/41cv.mod lib/nonpareil/41cv.png \ + lib/nonpareil/41cx.kml lib/nonpareil/41cx.mod \ + lib/nonpareil/45.kml lib/nonpareil/45.lst \ + lib/nonpareil/45.obj lib/nonpareil/45.png \ + lib/nonpareil/55.kml lib/nonpareil/55.lst \ + lib/nonpareil/55.obj lib/nonpareil/55.png \ + lib/nonpareil/80.kml lib/nonpareil/80.lst \ + lib/nonpareil/80.obj lib/nonpareil/80.png \ + lib/nonpareil/82143a.mod lib/nonpareil/82182a.mod PLIST_FILES= ${PLIST_EXECS} ${PLIST_DATA} PLIST_DIRS= lib/nonpareil @@ -61,22 +54,22 @@ .include post-patch: - @${REINPLACE_CMD} -e 's,%%CFLAGS%%,${CFLAGS},' \ - -e 's,%%CC%%,${CC},' \ - ${WRKSRC}/src/SConscript - @${REINPLACE_CMD} -E "s|('/usr/local')|\1,PathOption.PathAccept|" \ - ${WRKSRC}/SConstruct - @${REINPLACE_CMD} -e 's,,,g' \ - ${WRKSRC}/src/*.[cly] + @${REINPLACE_CMD} -e \ + 's|%%CFLAGS%%|${CFLAGS}| ; \ + s|%%CC%%|${CC}|' ${WRKSRC}/src/SConscript + @${REINPLACE_CMD} -E \ + "s|('/usr/local')|\1,PathOption.PathAccept|" ${WRKSRC}/SConstruct + @${REINPLACE_CMD} -e \ + 's|||g' ${WRKSRC}/src/*.[cly] post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} .endif - ${CHOWN} 0:0 ${PLIST_FILES:S|^|${PREFIX}/|} - ${TOUCH} ${PLIST_FILES:S|^|${PREFIX}/|} - ${CHMOD} 644 ${PLIST_DATA:S|^|${PREFIX}/|} - ${CHMOD} 755 ${PLIST_EXECS:S|^|${PREFIX}/|} + -${CHOWN} ${BINOWN}:${BINGRP} ${PLIST_FILES:S|^|${PREFIX}/|} + -${TOUCH} ${PLIST_FILES:S|^|${PREFIX}/|} + -${CHMOD} ${SHAREMODE} ${PLIST_DATA:S|^|${PREFIX}/|} + -${CHMOD} ${BINMODE} ${PLIST_EXECS:S|^|${PREFIX}/|} .include diff -urN /usr/ports/emulators/nonpareil/distinfo emulators/nonpareil/distinfo --- /usr/ports/emulators/nonpareil/distinfo 2007-03-22 01:39:30.000000000 +0900 +++ emulators/nonpareil/distinfo 2011-03-14 05:23:41.000000000 +0900 @@ -1,3 +1,2 @@ -MD5 (nonpareil-0.78.tar.gz) = 9de60072405a4f4e716131b18871954d -SHA256 (nonpareil-0.78.tar.gz) = 9f2ff73d1c3bd3f43f34be8446905b0971e1c2b58f1bcab28d1bf907df58fbd5 -SIZE (nonpareil-0.78.tar.gz) = 4911842 +SHA256 (nonpareil-0.79.tar.gz) = 3bcb2f9a829a4cad003f84a42c6f0e31a7bf527e634aea9cf13e370b6c175841 +SIZE (nonpareil-0.79.tar.gz) = 4761552 diff -urN /usr/ports/emulators/nonpareil/files/patch-src_SConscript emulators/nonpareil/files/patch-src_SConscript --- /usr/ports/emulators/nonpareil/files/patch-src_SConscript 2007-03-27 17:18:44.000000000 +0900 +++ emulators/nonpareil/files/patch-src_SConscript 2011-03-20 05:12:33.000000000 +0900 @@ -1,5 +1,5 @@ ---- src/SConscript.orig Tue Oct 31 07:26:16 2006 -+++ src/SConscript Mon Mar 26 23:12:06 2007 +--- src/SConscript.orig 2008-08-24 09:37:18.000000000 +0900 ++++ src/SConscript 2011-03-20 05:12:10.000000000 +0900 @@ -41,16 +41,11 @@ build_env.Append (CPPPATH = ['.']) @@ -19,21 +19,12 @@ build_env.Append (CCFLAGS = ['-mms-bitfields']) build_env.Append (CPPPATH = ['/usr/local/gtkwin/include']) # libpng build_env.Append (CPPPATH = ['/usr/local/gtkwin/SDL-1.2.8/include']) -@@ -91,7 +86,7 @@ - if build_env ['build_target_only'] == 0: - str2png_env = build_env.Copy () - -- str2png_env.Append (CPPDEFINES = {'DEFAULT_PATH': 'image'}) -+ str2png_env.Append (CPPDEFINES = ['DEFAULT_PATH=image']) - - str2png_srcs = Split ("""str2png.c""") - -@@ -287,7 +282,7 @@ +@@ -286,7 +281,7 @@ csim_env = nonpareil_env.Copy () if not ming: -- csim_env.Append (CPPDEFINES = {'DEFAULT_PATH': build_env ['libdir']}) -+ csim_env.Append (CPPDEFINES = ['DEFAULT_PATH=' + build_env ['libdir']]) +- csim_env.Append (CPPDEFINES = [('DEFAULT_PATH', build_env ['libdir'])]) ++ csim_env.Append (CPPDEFINES = [('DEFAULT_PATH' + build_env ['libdir'])]) if build_env ['target'] == 'win32': - csim_env.Append (CPPDEFINES = {'SHAPE_DEFAULT': "false"}) + csim_env.Append (CPPDEFINES = [('SHAPE_DEFAULT', "false")]) >Release-Note: >Audit-Trail: >Unformatted: