This update to 0.57 has been available since 2009, but I recall
there being some issue I was experiencing at the time that made me
opt to just leave it as is.  Now I've updated the port and patches,
it seems to be working great.  Perhaps it was a version between
the two I recalled having issues with, too long ago now ;)

It seems a kind soul submitted some of the patches upstream as
only half the main Makefile diff is now needed.  I am not sure
about all the other Makefile mods for removing the s flag from
the ar(1) lines, and changing it to ranlib.

Reading the manpage for ar, s is supposed to be the equivalent
of running ranlib file.a.  Do we still need all those extra
patches?  If we do well then just need an OK, otherwise I will
remove them and resubmit the diff.  tested on i386.

Cheers,

-ryan



? vitetris.diff
Index: Makefile
===================================================================
RCS file: /cvs/ports/games/vitetris/Makefile,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 Makefile
--- Makefile    16 Nov 2010 11:23:28 -0000      1.3
+++ Makefile    10 Nov 2012 01:09:13 -0000
@@ -1,8 +1,7 @@
 # $OpenBSD: Makefile,v 1.3 2010/11/16 11:23:28 espie Exp $
 
 COMMENT =      terminal-based tetris clone in vein of nintendo tetris
-DISTNAME =     vitetris-0.51
-REVISION =     0
+DISTNAME =     vitetris-0.57
 CATEGORIES =   games
 
 HOMEPAGE =     http://victornils.net/tetris/
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/vitetris/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo    22 Sep 2008 12:43:31 -0000      1.1.1.1
+++ distinfo    10 Nov 2012 01:09:13 -0000
@@ -1,5 +1,2 @@
-MD5 (vitetris-0.51.tar.gz) = dnS1NgIROcEAYA3bmS/i3A==
-RMD160 (vitetris-0.51.tar.gz) = 4RxfP5JGI+o3/GvEYaj0bvvD1EM=
-SHA1 (vitetris-0.51.tar.gz) = 3x3XIoAVMhcBX9n07D+rchbb2KI=
-SHA256 (vitetris-0.51.tar.gz) = 0zl3QhCrekHAwL3WTFuPoKxPeWoaIkiHT27ds1DmlvI=
-SIZE (vitetris-0.51.tar.gz) = 93522
+SHA256 (vitetris-0.57.tar.gz) = DJ+myLFuL4lo9l4WqH8bzTm4J9UQxu+wdx8EAKuRzcI=
+SIZE (vitetris-0.57.tar.gz) = 100660
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/games/vitetris/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile      1 Apr 2009 08:30:45 -0000       1.2
+++ patches/patch-Makefile      10 Nov 2012 01:09:13 -0000
@@ -1,6 +1,6 @@
 $OpenBSD: patch-Makefile,v 1.2 2009/04/01 08:30:45 martin Exp $
---- Makefile.orig      Sat Sep 13 11:45:37 2008
-+++ Makefile   Mon Mar 30 20:59:06 2009
+--- Makefile.orig      Wed Jun 17 16:46:00 2009
++++ Makefile   Fri Nov  9 17:08:44 2012
 @@ -1,11 +1,11 @@
  include config.mk
  
@@ -16,46 +16,12 @@ $OpenBSD: patch-Makefile,v 1.2 2009/04/0
  
  default: build
        @echo Done.
-@@ -15,13 +15,13 @@ $(PROGNAME):
-       $(MAKE) build
- 
- build: src/src-conf.mk
--      $(MAKE) -Csrc tetris
-+      cd src; $(MAKE) tetris
+@@ -18,7 +18,7 @@ build: src/src-conf.mk
+       cd src; $(MAKE) tetris
        mv -f src/tetris$(EXE) $(PROGNAME)
        @echo stripping symbols to reduce program size:
 -      -strip --strip-all $(PROGNAME)
 +      -strip $(PROGNAME)
  
  gameserver: src/netw/gameserver.c
--      $(MAKE) -Csrc/netw gameserver
-+      cd src/netw; $(MAKE) gameserver
-       mv -f src/netw/gameserver .
- 
- src/src-conf.mk: config.mk Makefile src-conf.sh
-@@ -54,12 +54,12 @@ src/src-conf.mk: config.mk Makefile src-conf.sh
-       ./src-conf.sh obj pctimer $(PCTIMER)
- 
- install: $(PROGNAME)
--      $(INSTALL) -d $(bindir) $(docdir)
--      $(INSTALL) -m755 $(PROGNAME) $(bindir)
--      $(INSTALL) -m644 README licence.txt $(docdir)
-+      $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(docdir)
-+      $(INSTALL) -m755 $(PROGNAME) $(DESTDIR)$(bindir)
-+      $(INSTALL) -m644 README licence.txt $(DESTDIR)$(docdir)
-       if [ -n "$(ALLEGRO)" ]; then \
--  $(INSTALL) -d $(datadir); \
--  $(INSTALL) -m644 pc8x16.fnt $(datadir); \
-+  $(INSTALL) -d $(DESTDIR)$(datadir); \
-+  $(INSTALL) -m644 pc8x16.fnt $(DESTDIR)$(datadir); \
- fi
-       @echo Done.
-       @echo You may also wish to create the system-wide highscore file
-@@ -84,6 +84,6 @@ uninstall:
-       -rmdir $(datadir)
- clean:
-       rm -f systest systest.exe
--      $(MAKE) -Csrc clean
-+      cd src; $(MAKE) clean
- 
- .PHONY: default build install install-hiscores uninstall clean
+       cd src/netw; $(MAKE) gameserver
Index: patches/patch-src_menu_Makefile
===================================================================
RCS file: /cvs/ports/games/vitetris/patches/patch-src_menu_Makefile,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_menu_Makefile
--- patches/patch-src_menu_Makefile     1 Apr 2009 08:30:45 -0000       1.1
+++ patches/patch-src_menu_Makefile     10 Nov 2012 01:09:13 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_menu_Makefile,v 1.1 2009/04/01 08:30:45 martin Exp $
---- src/menu/Makefile.orig     Tue Sep  9 23:42:23 2008
-+++ src/menu/Makefile  Mon Mar 30 20:54:27 2009
-@@ -11,11 +11,13 @@ HEADERS = menu.h ../input/input.h ../textgfx/textgfx.h
+--- src/menu/Makefile.orig     Sun Oct 12 16:13:11 2008
++++ src/menu/Makefile  Fri Nov  9 17:08:44 2012
+@@ -12,11 +12,13 @@ HEADERS = menu.h ../input/input.h ../textgfx/textgfx.h
  all: menu.a $(menuext_lib)
  
  menu.a: $(OBJS)
Index: patches/patch-src_netw_Makefile
===================================================================
RCS file: /cvs/ports/games/vitetris/patches/patch-src_netw_Makefile,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_netw_Makefile
--- patches/patch-src_netw_Makefile     1 Apr 2009 08:30:45 -0000       1.1
+++ patches/patch-src_netw_Makefile     10 Nov 2012 01:09:13 -0000
@@ -1,13 +1,19 @@
 $OpenBSD: patch-src_netw_Makefile,v 1.1 2009/04/01 08:30:45 martin Exp $
---- src/netw/Makefile.orig     Mon Mar 30 20:42:32 2009
-+++ src/netw/Makefile  Mon Mar 30 20:42:52 2009
-@@ -6,7 +6,8 @@ config_h = ../config.h ../config2.h
- all: $(netw_lib)
+--- src/netw/Makefile.orig     Thu Oct 16 11:39:35 2008
++++ src/netw/Makefile  Fri Nov  9 17:08:44 2012
+@@ -7,11 +7,13 @@ all: $(netw_lib)$(inet_obj)
  
- netw.a: $(OBJS) ../src-conf.mk
--      ar rs netw.a $(OBJS)
-+      ar r netw.a $(OBJS)
+ netw.ainet.o: $(OBJS) comm_inet.o
+       -ar dc netw.a no_inet.o
+-      ar rs netw.a $(OBJS) comm_inet.o
++      ar r netw.a $(OBJS) comm_inet.o
 +      ranlib netw.a
  
- socket.o: socket.c sock.h internal.h ../input/input.h ../timer.h $(config_h)
+ netw.a: $(OBJS) no_inet.o ../src-conf.mk
+       -ar dc netw.a inet.o comm_inet.o
+-      ar rs netw.a $(OBJS) no_inet.o
++      ar r netw.a $(OBJS) no_inet.o
++      ranlib netw.a
+ 
+ socket.o: socket.c sock.h internal.h ../input/input.h $(config_h)
  
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/vitetris/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   22 Sep 2008 12:43:31 -0000      1.1.1.1
+++ pkg/PLIST   10 Nov 2012 01:09:13 -0000
@@ -4,6 +4,8 @@
 @bin bin/vitetris
 @mode
 @group
+share/applications/
+share/applications/vitetris.desktop
 share/doc/vitetris/
 share/doc/vitetris/README
 share/doc/vitetris/licence.txt
@@ -12,3 +14,7 @@ share/examples/vitetris/
 @group games
 share/examples/vitetris/vitetris-hiscores
 @sample /var/games/vitetris-hiscores
+@mode
+@group
+share/pixmaps/
+share/pixmaps/vitetris.xpm

Reply via email to