- Update to 1.12

PR:		ports/160112
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

5 files changed, 42 insertions, 19 deletions

diff --git a/games/xspringies/Makefile b/games/xspringies/Makefile
index b9db3af1e079..30e37c89b9ac 100644
--- a/games/xspringies/Makefile
+++ b/games/xspringies/Makefile
@@ -6,20 +6,36 @@
 #
 
 PORTNAME=	xspringies
-PORTVERSION=	1.1
-PORTREVISION=	2
+PORTVERSION=	1.12
 CATEGORIES=	games
-MASTER_SITES=	ftp://aixpdslib.seas.ucla.edu/pub/xspringies/RISC/3.2/src/
-DISTFILES=	xspringies.1.1.tar.Z
+MASTER_SITES=	ftp://ftp.cis.upenn.edu/pub/dmd/xspringies/ \
+		http://www.cs.rutgers.edu/~decarlo/software/
+EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A mass and spring simulation system
 
-DEPRECATED=	No more public distfiles
-EXPIRATION_DATE=	2011-09-01
+LICENSE=	GPLv1 # (or later)
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_IMAKE=	yes
 USE_XORG=	x11 xext
+ALL_TARGET=	${PORTNAME}
+MAKE_JOBS_SAFE=	yes
+
 MAN1=		xspringies.1
 
+post-patch:
+	@cd ${WRKSRC} && ${SED} -e \
+		's|/usr/games/|${PREFIX}/| ; \
+		 s|lib/xspringies|lib/X11/xspringies| ; \
+		 s|CFLAGS = -O|CFLAGS += -I${LOCALBASE}/include| ; \
+		 s|LIBS = -lm|LIBS = -L${LOCALBASE}/lib -lm|' \
+			< Makefile.std > Makefile
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/xspringies ${PREFIX}/bin/xspringies
+	${INSTALL_MAN} ${WRKSRC}/xspringies.man ${MANPREFIX}/man/man1/xspringies.1
+	@${MKDIR} ${PREFIX}/lib/X11/xspringies
+	${INSTALL_DATA} ${WRKSRC}/lib/*.xsp ${PREFIX}/lib/X11/xspringies
+
 .include <bsd.port.mk>
diff --git a/games/xspringies/distinfo b/games/xspringies/distinfo
index 5e2a3ff29e5d..16148285491e 100644
--- a/games/xspringies/distinfo
+++ b/games/xspringies/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xspringies.1.1.tar.Z) = d42c1273b771fdeee66ad5b715a0cab9c77cbade931293c721f8fbcfaa11a63c
-SIZE (xspringies.1.1.tar.Z) = 245409
+SHA256 (xspringies-1.12.tar.Z) = 08a3e9f60d1f1e15d38d62dd62baab18f6ad57ee139b0ef41452be66e4ad6a28
+SIZE (xspringies-1.12.tar.Z) = 244989
diff --git a/games/xspringies/files/patch-widget.c b/games/xspringies/files/patch-widget.c
index 0ab99a96ecab..fa678229b422 100644
--- a/games/xspringies/files/patch-widget.c
+++ b/games/xspringies/files/patch-widget.c
@@ -1,16 +1,11 @@
---- widget.c.orig	Wed May 30 16:24:53 2007
-+++ widget.c	Wed May 30 16:28:12 2007
-@@ -124,11 +124,11 @@
+--- widget.c.orig	1995-11-11 12:47:22.000000000 +0900
++++ widget.c	2011-08-19 07:11:46.000000000 +0900
+@@ -124,7 +124,7 @@
  extern Pixmap acts_pm;
  void (*notify_func)();
  
+-Pixmap get_pixmap();
 +Pixmap get_pixmap(char *bits, int width, int height, boolean inv);
-+
+ 
  void init_widgets(notify)
  void (*notify)();
- {
--    extern Pixmap get_pixmap();
--
-     numb = nums = numc = numm = cur_type = cur_num = 0;
-     key_active = cur_but = -1;
-     scan_flag = FALSE;
diff --git a/games/xspringies/pkg-descr b/games/xspringies/pkg-descr
index 5191d465c319..b152c1b53c82 100644
--- a/games/xspringies/pkg-descr
+++ b/games/xspringies/pkg-descr
@@ -7,3 +7,5 @@ The animation in XSpringies is done using an off-screen Pixmap.  The next
 frame is drawn on this pixmap, then is blitted onto the screen.  Since the
 frame rate is about 30 frames per second, slower machines (or machines which
 have poorly written bit-blitting code) will be deathly slow and blinky.
+
+WWW: http://www.cs.rutgers.edu/~decarlo/software.html
diff --git a/games/xspringies/pkg-plist b/games/xspringies/pkg-plist
index ea9941d5924d..16d9dce8f8a9 100644
--- a/games/xspringies/pkg-plist
+++ b/games/xspringies/pkg-plist
@@ -8,8 +8,11 @@ lib/X11/xspringies/ball.xsp
 lib/X11/xspringies/belt-loop.xsp
 lib/X11/xspringies/belt-tire.xsp
 lib/X11/xspringies/belt.xsp
+lib/X11/xspringies/big-jello.xsp
 lib/X11/xspringies/bike.xsp
+lib/X11/xspringies/billiard.xsp
 lib/X11/xspringies/blanket.xsp
+lib/X11/xspringies/bowl.xsp
 lib/X11/xspringies/bridge.xsp
 lib/X11/xspringies/diamond-chain.xsp
 lib/X11/xspringies/hammer.xsp
@@ -27,11 +30,16 @@ lib/X11/xspringies/kalied1.xsp
 lib/X11/xspringies/kalied2.xsp
 lib/X11/xspringies/lgrid.xsp
 lib/X11/xspringies/lissajous.xsp
+lib/X11/xspringies/loopy.xsp
 lib/X11/xspringies/mesh.xsp
 lib/X11/xspringies/nifty.xsp
 lib/X11/xspringies/nifty12.xsp
 lib/X11/xspringies/octanifty.xsp
+lib/X11/xspringies/orbit1.5.xsp
+lib/X11/xspringies/orbit2.xsp
 lib/X11/xspringies/pend.xsp
+lib/X11/xspringies/pend7x1.xsp
+lib/X11/xspringies/pend7x2.xsp
 lib/X11/xspringies/pendbees.xsp
 lib/X11/xspringies/pendwave.xsp
 lib/X11/xspringies/person1.xsp
@@ -39,11 +47,13 @@ lib/X11/xspringies/person2.xsp
 lib/X11/xspringies/plane.xsp
 lib/X11/xspringies/psycho.xsp
 lib/X11/xspringies/serp.xsp
+lib/X11/xspringies/slide.xsp
 lib/X11/xspringies/snake.xsp
 lib/X11/xspringies/square.xsp
 lib/X11/xspringies/stretchmesh.xsp
 lib/X11/xspringies/super-jello.xsp
 lib/X11/xspringies/tire.xsp
+lib/X11/xspringies/transpend.xsp
 lib/X11/xspringies/tri4.xsp
 lib/X11/xspringies/trimesh.xsp
 lib/X11/xspringies/urchin.xsp