Date: Tue, 26 Jun 2012 02:45:50 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/169417: games/xteddy: Update to version 2.2 Message-ID: <20120626024550.ccacf78a.tkato432@yahoo.com> Resent-Message-ID: <201206251810.q5PIADPd073919@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 169417 >Category: ports >Synopsis: games/xteddy: Update to version 2.2 >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: Mon Jun 25 18:10:12 UTC 2012 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 7.4-RELEASE-p9 i386 >Organization: >Environment: >Description: - Update to version 2.2 New file: files/patch-xtoys Remove file: files/patch-Makefile.in files/patch-xteddy.c pkg-plist >How-To-Repeat: >Fix: diff -urN /usr/ports/games/xteddy/Makefile games/xteddy/Makefile --- /usr/ports/games/xteddy/Makefile 2012-06-20 20:34:31.000000000 +0900 +++ games/xteddy/Makefile 2012-06-21 16:01:34.000000000 +0900 @@ -6,26 +6,41 @@ # $MCom: ports/games/xteddy/Makefile,v 1.1 2006/10/04 13:16:56 ahze Exp $ PORTNAME= xteddy -PORTVERSION= 2.0.2 -PORTREVISION= 8 +PORTVERSION= 2.2 CATEGORIES= games -MASTER_SITES= http://staffwww.itn.liu.se/~stegu/xteddy/ +MASTER_SITES= http://webstaff.itn.liu.se/~stegu/xteddy/ MAINTAINER= ports@FreeBSD.org COMMENT= A cuddlesome teddy for the X desktop -NO_CDROM= Can only be distributed for free +LICENSE= GPLv2 +USE_EFL= imlib2 GNU_CONFIGURE= yes + CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -USE_GNOME= imlib MAN6= xteddy.6 +PLIST_FILES= bin/xteddy bin/xteddy_test bin/xtoys \ + %%DATADIR%%/teddy.png %%DATADIR%%/xalex.png \ + %%DATADIR%%/xbobo.png %%DATADIR%%/xbrummi.png \ + %%DATADIR%%/xcherubino.png %%DATADIR%%/xduck.png \ + %%DATADIR%%/xhedgehog.png %%DATADIR%%/xklitze.png \ + %%DATADIR%%/xnamu.png %%DATADIR%%/xorca.png \ + %%DATADIR%%/xpenguin.png %%DATADIR%%/xpuppy.png \ + %%DATADIR%%/xruessel.png %%DATADIR%%/xteddy.png \ + %%DATADIR%%/xtrouble.png %%DATADIR%%/xtuxxy.png +PLIST_DIRS= %%DATADIR%% post-patch: -.for f in xteddy.c Makefile.in xteddy_test - @${REINPLACE_CMD} -e 's,%%DATADIR%%,${DATADIR},g' ${WRKSRC}/${f} +.for f in configure xteddy.c + @${REINPLACE_CMD} -e \ + 's|/usr/share/xteddy|${DATADIR}|' ${WRKSRC}/${f} +.endfor +.for f in xteddy_test xtoys + @${REINPLACE_CMD} -e \ + 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/${f} .endfor .include <bsd.port.mk> diff -urN /usr/ports/games/xteddy/distinfo games/xteddy/distinfo --- /usr/ports/games/xteddy/distinfo 2011-07-03 23:25:32.000000000 +0900 +++ games/xteddy/distinfo 2012-06-21 01:37:26.000000000 +0900 @@ -1,2 +1,2 @@ -SHA256 (xteddy-2.0.2.tar.gz) = 4c137049c94a827c642a11711c101b241c203a97dad5eb6917387a6465078363 -SIZE (xteddy-2.0.2.tar.gz) = 355490 +SHA256 (xteddy-2.2.tar.gz) = d8885a1e2e08787cb469857a9404619cadab9bddcae7fa398a565d53633291e2 +SIZE (xteddy-2.2.tar.gz) = 867005 diff -urN /usr/ports/games/xteddy/files/patch-Makefile.in games/xteddy/files/patch-Makefile.in --- /usr/ports/games/xteddy/files/patch-Makefile.in 2005-11-14 21:36:41.000000000 +0900 +++ games/xteddy/files/patch-Makefile.in 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- Makefile.in.orig Mon Aug 2 16:11:08 1999 -+++ Makefile.in Mon Nov 14 23:31:25 2005 -@@ -73,7 +73,7 @@ - man_MANS = xteddy.1 - bin_SCRIPTS = xtoys xteddy_test - --DEFS = -DPIXMAP_PATH=\"@PIXMAP_PATH@\" -Wall -+DEFS = -DPIXMAP_PATH=\"%%DATADIR%%\" -Wall - - SUBDIRS = html images - EXTRA_DIST = $(man_MANS) $(bin_SCRIPTS) README xteddy.README xtuxxy.credit configure autogen.sh diff -urN /usr/ports/games/xteddy/files/patch-xteddy.c games/xteddy/files/patch-xteddy.c --- /usr/ports/games/xteddy/files/patch-xteddy.c 2005-11-14 21:36:41.000000000 +0900 +++ games/xteddy/files/patch-xteddy.c 1970-01-01 09:00:00.000000000 +0900 @@ -1,11 +0,0 @@ ---- xteddy.c.orig Mon Nov 14 23:21:26 2005 -+++ xteddy.c Mon Nov 14 23:22:09 2005 -@@ -17,7 +17,7 @@ - /* Changes: use Imlib instead of libxpm and load * - * different image formats */ - --#define DEFAULT_IMAGE_DIR "/usr/share/xteddy" -+#define DEFAULT_IMAGE_DIR "%%DATADIR%%" - - #include <X11/Xlib.h> - #include <X11/Xutil.h> diff -urN /usr/ports/games/xteddy/files/patch-xteddy_test games/xteddy/files/patch-xteddy_test --- /usr/ports/games/xteddy/files/patch-xteddy_test 2005-11-14 21:36:41.000000000 +0900 +++ games/xteddy/files/patch-xteddy_test 2012-06-21 16:04:18.000000000 +0900 @@ -1,15 +1,21 @@ ---- xteddy_test.orig Mon Nov 14 23:33:19 2005 -+++ xteddy_test Mon Nov 14 23:33:37 2005 -@@ -1,9 +1,9 @@ +--- xteddy_test.orig 2009-02-08 05:48:26.000000000 +0900 ++++ xteddy_test 2012-06-21 16:03:21.000000000 +0900 +@@ -1,15 +1,9 @@ #!/bin/sh i=0 -if [ -d /usr/share/xteddy ] ; then - for img in `ls /usr/share/xteddy` ; do -+if [ -d %%DATADIR%% ] ; then -+ for img in `ls %%DATADIR%%` ; do ++if [ -d %%PREFIX%%/share/xteddy ] ; then ++ for img in `ls %%PREFIX%%/share/xteddy` ; do i=`expr $i + 50` - xteddy -F/usr/share/xteddy/$img -geometry +$i+$i & -+ xteddy -F%%DATADIR%%/$img -geometry +$i+$i & +- done +-fi +-if [ -d /usr/local/share/xteddy ] ; then +- for img in `ls /usr/local/share/xteddy` ; do +- i=`expr $i + 50` +- xteddy -F/usr/local/share/xteddy/$img -geometry +$i+$i & ++ xteddy -F%%PREFIX%%/share/xteddy/$img -geometry +$i+$i & done fi - if [ -d /usr/local/share/xteddy ] ; then + diff -urN /usr/ports/games/xteddy/files/patch-xtoys games/xteddy/files/patch-xtoys --- /usr/ports/games/xteddy/files/patch-xtoys 1970-01-01 09:00:00.000000000 +0900 +++ games/xteddy/files/patch-xtoys 2012-06-21 16:04:30.000000000 +0900 @@ -0,0 +1,29 @@ +--- xtoys.orig 2009-02-08 05:48:26.000000000 +0900 ++++ xtoys 2012-06-21 16:03:49.000000000 +0900 +@@ -1,17 +1,16 @@ +-#!/bin/bash ++#!/bin/sh + # +-# /usr/bin/X11/xtoys -- puts a random cuddly toy onto desktop ++# %%PREFIX%%/bin/xtoys -- puts a random cuddly toy onto desktop + # + # Thanks to Andrew Stribblehill <a.d.stribblehill@dur.ac.uk> + # who supported this script + # +-if [ -d /usr/local/share/xteddy ] ; then +- images=(`ls /usr/share/xteddy` `ls /usr/local/share/xteddy 2> /dev/null`) +-else +- images=(`ls /usr/share/xteddy`) +-fi ++i=0 ++for img in `ls %%PREFIX%%/share/xteddy`; do ++ images[$i]=$img ++ i=`expr $i + 1` ++done + +-num=${#images[*]} +-choice=`expr $RANDOM % $num` ++choice=`expr $RANDOM % $i` + +-/usr/games/xteddy -F${images[choice]} $* ++%%PREFIX%%/bin/xteddy -F${images[choice]} $* diff -urN /usr/ports/games/xteddy/pkg-descr games/xteddy/pkg-descr --- /usr/ports/games/xteddy/pkg-descr 2005-10-21 06:02:08.000000000 +0900 +++ games/xteddy/pkg-descr 2012-06-21 01:33:16.000000000 +0900 @@ -1,4 +1,4 @@ This is _the_ toy for the X desktop, a must for all plush lovers: a very, very cuddlesome teddy. -WWW: http://www.itn.liu.se/~stegu/xteddy/ +WWW: http://webstaff.itn.liu.se/~stegu/xteddy/ diff -urN /usr/ports/games/xteddy/pkg-plist games/xteddy/pkg-plist --- /usr/ports/games/xteddy/pkg-plist 2005-11-14 21:36:41.000000000 +0900 +++ games/xteddy/pkg-plist 1970-01-01 09:00:00.000000000 +0900 @@ -1,16 +0,0 @@ -bin/xteddy -bin/xtoys -bin/xteddy_test -%%DATADIR%%/teddy.png -%%DATADIR%%/xteddy.png -%%DATADIR%%/xpenguin.png -%%DATADIR%%/xduck.png -%%DATADIR%%/xtuxxy.png -%%DATADIR%%/xalex.png -%%DATADIR%%/xbobo.png -%%DATADIR%%/xklitze.png -%%DATADIR%%/xruessel.png -%%DATADIR%%/xnamu.png -%%DATADIR%%/xbrummi.png -%%DATADIR%%/xorca.png -@dirrm %%DATADIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120626024550.ccacf78a.tkato432>