From root@cyberbotx.com Sat Dec 23 02:09:23 2006 Return-Path: Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5CF1116A403 for ; Sat, 23 Dec 2006 02:09:23 +0000 (UTC) (envelope-from root@cyberbotx.com) Received: from samus.cyberbotx.com (c-68-62-97-217.hsd1.mi.comcast.net [68.62.97.217]) by mx1.freebsd.org (Postfix) with ESMTP id E812813C44E for ; Sat, 23 Dec 2006 02:09:22 +0000 (UTC) (envelope-from root@cyberbotx.com) Received: from localhost (localhost [127.0.0.1]) by samus.cyberbotx.com (Postfix) with ESMTP id 13789C464; Fri, 22 Dec 2006 20:43:04 -0500 (EST) Received: from samus.cyberbotx.com ([127.0.0.1]) by localhost (samus.cyberbotx.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hRo2A5U1-gVs; Fri, 22 Dec 2006 20:42:06 -0500 (EST) Received: from kirby.cyberbotx.com (unknown [192.168.2.2]) by samus.cyberbotx.com (Postfix) with ESMTP id AFE83C15D; Fri, 22 Dec 2006 20:42:05 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by kirby.cyberbotx.com (Postfix) with ESMTP id 16FFFC151; Fri, 22 Dec 2006 20:41:41 -0500 (EST) Received: from kirby.cyberbotx.com ([127.0.0.1]) by localhost (kirby.cyberbotx.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ByGI31Z+VMBf; Fri, 22 Dec 2006 20:41:16 -0500 (EST) Received: by kirby.cyberbotx.com (Postfix, from userid 0) id 3A8D7C14D; Fri, 22 Dec 2006 20:41:12 -0500 (EST) Message-Id: <20061223014112.3A8D7C14D@kirby.cyberbotx.com> Date: Fri, 22 Dec 2006 20:41:12 -0500 (EST) From: Naram Qashat To: FreeBSD-gnats-submit@freebsd.org Cc: freebsd-ports@stsp.in-berlin.de Subject: [PATCH] emulators/zsnes: update to 1.50 X-Send-Pr-Version: 3.113 X-GNATS-Notify: freebsd-ports@stsp.in-berlin.de >Number: 107125 >Category: ports >Synopsis: [PATCH] emulators/zsnes: update to 1.50 >Confidential: no >Severity: non-critical >Priority: low >Responsible: acm >State: closed >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Dec 23 02:10:09 GMT 2006 >Closed-Date: Tue Jan 16 23:34:52 GMT 2007 >Last-Modified: Tue Jan 16 23:40:12 GMT 2007 >Originator: Naram Qashat >Release: FreeBSD 6.2-RC1 i386 >Organization: >Environment: System: FreeBSD kirby.cyberbotx.com 6.2-RC1 FreeBSD 6.2-RC1 #4: Mon Dec 18 01:38:52 EST 2006 >Description: - Update to 1.50 - Added a few new OPTIONS knobs - Distfile is now a .tar.bz2 instead of a .tar.gz - Target ALL wasn't valid - Removed substitutions to configure because they were unnessacary - Added in check to look for zlib 1.2.3 or greater, now required by ZSNES - Patch to linux/zfilew.c no longer needed Removed file(s): - files/patch-linux-zfilew.c Port maintainer (freebsd-ports@stsp.in-berlin.de) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- zsnes-1.50,1.patch begins here --- diff -ruN --exclude=CVS /usr/ports/emulators/zsnes/Makefile /kirby/shared/zsnes/Makefile --- /usr/ports/emulators/zsnes/Makefile Wed Sep 20 21:00:52 2006 +++ /kirby/shared/zsnes/Makefile Fri Dec 22 20:11:51 2006 @@ -6,8 +6,7 @@ # PORTNAME= zsnes -PORTVERSION= 1.42 -PORTREVISION= 4 +PORTVERSION= 1.50 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -27,14 +26,16 @@ WRKSRC= ${WRKDIR}/${PORTNAME}_${PORTVERSION:S/./_/}/src OPTIONS= X11 "Enable X11 video driver" on \ - OPENGL "Enable OpenGL video driver" off + OPENGL "Enable OpenGL video driver" off \ + DEBUGGER "Enable ZSNES debugger" on \ + JMA "Enable JMA support" on +USE_BZIP2= yes USE_SDL= sdl USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -ALL_TARGET= ALL MAN1= zsnes.1 PLIST_FILES= bin/zsnes @@ -62,14 +63,34 @@ CONFIGURE_ARGS+=--disable-opengl .endif +.if defined(WITH_DEBUGGER) +CONFIGURE_ARGS+=--enable-debugger +.else +CONFIGURE_ARGS+=--disable-debugger +.endif + +.if defined(WITH_JMA) +CONFIGURE_ARGS+=--enable-jma +.else +CONFIGURE_ARGS+=--disable-jma +.endif + +.if defined(PACKAGE_BUILDING) +CONFIGURE_ARGS+=--enable-release --disable-cpucheck force_arch=i586 +.endif + +pre-everything:: + @${GREP} "#define ZLIB_VERSION" /usr/include/zlib.h | \ + ${AWK} '{print substr($$3, 2, length($$3) - 2)}' | \ + ${SED} 's/\./ /g' | \ + ${AWK} '{printf("%02d%02d%02d", $$1, $$2, $$3)}' | \ + ${AWK} '{if ($$1 > 010202) {exit 0} else {exit 1}}' + @if [ 0 -ne $$? ] ; then \ + @${ECHO} "This port requires zlib >= 1.2.3" ; \ + @${FALSE} ; \ + fi + post-patch: - @${REINPLACE_CMD} -e \ - 's| -pipe||g ; \ - s| -I/usr/local/include||g ; \ - s|^VERSION=1.41|VERSION=${PORTVERSION}|; \ - s| -D__FreeBSD__||g; \ - s| -I/usr/include||g ; \ - s| -O3 .* -s||g' ${WRKSRC}/configure @${REINPLACE_CMD} -e \ 's|@CXX@ @CFLAGS@ -o|@CXX@ @CXXFLAGS@ @CPPFLAGS@ -o|g ; \ s|@CC@ @CFLAGS@ -o|@CC@ @CFLAGS@ @CPPFLAGS@ -o|g' \ diff -ruN --exclude=CVS /usr/ports/emulators/zsnes/distinfo /kirby/shared/zsnes/distinfo --- /usr/ports/emulators/zsnes/distinfo Thu Nov 24 16:01:04 2005 +++ /kirby/shared/zsnes/distinfo Fri Dec 22 17:32:52 2006 @@ -1,3 +1,3 @@ -MD5 (zsnes142src.tar.gz) = e3fcc13061e169194ec31c27ace1b6e7 -SHA256 (zsnes142src.tar.gz) = f06ef14db8d3fdae9d7c12442a52e535a5feee1cb18c78b51a74ed282ed874be -SIZE (zsnes142src.tar.gz) = 1102840 +MD5 (zsnes150src.tar.bz2) = f0612e27b1c3dd821044525be5cf4450 +SHA256 (zsnes150src.tar.bz2) = 2ddaaff892d511c717d3e270cc035b208ba2eca04cdf3e749c5739df78ba9aba +SIZE (zsnes150src.tar.bz2) = 1058671 diff -ruN --exclude=CVS /usr/ports/emulators/zsnes/files/patch-linux-zfilew.c /kirby/shared/zsnes/files/patch-linux-zfilew.c --- /usr/ports/emulators/zsnes/files/patch-linux-zfilew.c Thu Jun 2 23:13:02 2005 +++ /kirby/shared/zsnes/files/patch-linux-zfilew.c Wed Dec 31 19:00:00 1969 @@ -1,21 +0,0 @@ -$FreeBSD: ports/emulators/zsnes/files/patch-linux-zfilew.c,v 1.1 2005/06/03 03:13:02 petef Exp $ - ---- linux/zfilew.c Fri Jan 14 06:11:19 2005 -+++ linux/zfilew.c.new Thu Jun 2 19:29:43 2005 -@@ -474,11 +474,12 @@ - - if ((homedir = (char *)getenv("HOME")) == 0) - { -- homedir = (char *)malloc(ZCFG_DIR_LEN); -- getcwd(homedir, ZCFG_DIR_LEN); -+ getcwd(zcfgdir, ZCFG_DIR_LEN); -+ } -+ else -+ { -+ strcpy(zcfgdir, homedir); - } -- strcpy(zcfgdir, homedir); -- free(homedir); - strcat(zcfgdir, ZCFG_DIR); - tmp = opendir(zcfgdir); - if (tmp == NULL) --- zsnes-1.50,1.patch ends here --- >Release-Note: >Audit-Trail: State-Changed-From-To: open->feedback State-Changed-By: edwin State-Changed-When: Sat Dec 23 02:10:21 UTC 2006 State-Changed-Why: Awaiting maintainers feedback http://www.freebsd.org/cgi/query-pr.cgi?pr=107125 From: Stefan Sperling To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/107125: [PATCH] emulators%2Fzsnes: update to 1.5.0 Date: Sat, 23 Dec 2006 03:48:23 +0100 --CE+1k2dSO48ffgeK Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > +pre-everything:: > + @${GREP} "#define ZLIB_VERSION" /usr/include/zlib.h | \ > + ${AWK} '{print substr($$3, 2, length($$3) - 2)}' | \ > + ${SED} 's/\./ /g' | \ > + ${AWK} '{printf("%02d%02d%02d", $$1, $$2, $$3)}' | \ > + ${AWK} '{if ($$1 > 010202) {exit 0} else {exit 1}}' > + @if [ 0 -ne $$? ] ; then \ > + @${ECHO} "This port requires zlib >=3D 1.2.3" ; \ > + @${FALSE} ; \ > + fi The pre-everything target causes the following here: [stsp@ted /usr/ports/emulators/zsnes]$ make *** Error code 1 Stop in /usr/ports/emulators/zsnes. It gives users no clue as to what is going on unless they look into the Makefile. When I change it to: pre-everything:: @${GREP} "#define ZLIB_VERSION" /usr/include/zlib.h | \ ${AWK} '{print substr($$3, 2, length($$3) - 2)}' | \ ${SED} 's/\./ /g' | \ ${AWK} '{printf("%02d%02d%02d", $$1, $$2, $$3)}' | \ ${AWK} '{if ($$1 > 010202) {exit 0} else {exit 1}}' \ || (${ECHO} "This port requires zlib >=3D 1.2.3"; ${FALSE};) it prints the message correctly: [stsp@ted /usr/ports/emulators/zsnes]$ make This port requires zlib >=3D 1.2.3 *** Error code 1 Stop in /usr/ports/emulators/zsnes. I have a 6.1 system only. According to CVS log, zlib-1.2.3 is in 6.2. I cannot test this properly until I've upgraded to 6.2. Apart from the small error in the pre-everything target described above, the patch looks very good. --=20 stefan http://stsp.in-berlin.de PGP Key: 0xF59D25F0 --CE+1k2dSO48ffgeK Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (FreeBSD) iD4DBQFFjJj35dMCc/WdJfARAkaWAJwMmj/mwoDduEeKf2LDQ4LhH5e5VwCXQLzd lspdUA8F+L58UYhvAuJQ2A== =B3W2 -----END PGP SIGNATURE----- --CE+1k2dSO48ffgeK-- Responsible-Changed-From-To: freebsd-ports-bugs->miwi Responsible-Changed-By: miwi Responsible-Changed-When: Sat Dec 23 10:18:00 UTC 2006 Responsible-Changed-Why: I'll take it. http://www.freebsd.org/cgi/query-pr.cgi?pr=107125 Responsible-Changed-From-To: miwi->acm Responsible-Changed-By: miwi Responsible-Changed-When: Tue Jan 16 20:35:49 UTC 2007 Responsible-Changed-Why: acm@ handel this :). Thanks http://www.freebsd.org/cgi/query-pr.cgi?pr=107125 State-Changed-From-To: feedback->closed State-Changed-By: acm State-Changed-When: Tue Jan 16 23:34:19 UTC 2007 State-Changed-Why: Committed with few modifications, thanks!!! :) http://www.freebsd.org/cgi/query-pr.cgi?pr=107125 From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/107125: commit references a PR Date: Tue, 16 Jan 2007 23:33:39 +0000 (UTC) acm 2007-01-16 23:33:33 UTC FreeBSD ports repository Modified files: emulators/zsnes Makefile distinfo Added files: emulators/zsnes/files patch-configure Removed files: emulators/zsnes/files patch-linux-zfilew.c Log: - Update to 1.50 - Added a few new OPTIONS knobs [1] - Distfile is now a .tar.bz2 instead of a .tar.gz - Target ALL wasn't valid - Removed substitutions to configure because they were unnessacary - Respect CFLAGS [1] - Mark IGNORE < 602000, It needs zlib 1.2.3 or greater [1] - Patch to linux/zfilew.c no longer needed PR: ports/107125 Submitted by: Naram Qashat (maintainer) Reviewed by: miwi and me [1] Revision Changes Path 1.31 +26 -14 ports/emulators/zsnes/Makefile 1.14 +3 -3 ports/emulators/zsnes/distinfo 1.1 +41 -0 ports/emulators/zsnes/files/patch-configure (new) 1.2 +0 -21 ports/emulators/zsnes/files/patch-linux-zfilew.c (dead) _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" >Unformatted: