diff -ruN xtrojka.orig/Makefile xtrojka/Makefile
--- xtrojka.orig/Makefile	2012-11-17 06:57:58.000000000 +0100
+++ xtrojka/Makefile	2013-09-17 10:33:53.000000000 +0200
@@ -1,22 +1,18 @@
-# New ports collection makefile for:	xtrojka
-# Date created:				22 march 2000
-# Whom:					Edwin Mons
-#
-# $FreeBSD: ports/games/xtrojka/Makefile,v 1.8 2012/11/17 05:57:58 svnexp Exp $
-#
+# $FreeBSD$
 
 PORTNAME=	xtrojka
-PORTVERSION=	1.1
-PORTREVISION=	3
+PORTVERSION=	1.2.3
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.funet.fi/pub/unix/games/
-DISTNAME=	${PORTNAME}
+MASTER_SITES=	${MASTER_SITE_SUNSITE}
+MASTER_SITE_SUBDIR=	games/arcade/tetris
+DISTNAME=	${PORTNAME}${PORTVERSION:C/\.//g}
 
-MAINTAINER=	e@ik.nu
+MAINTAINER=	ports@edwinm.ik.nu
 COMMENT=	Game of skill similar to T*tris
 
-USE_XORG=	x11 xt xproto xaw
-WRKSRC=		${WRKDIR}
+USE_XORG=	x11 xt xproto xaw xmu xext
+MAKE_JOBS_UNSAFE=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME}
 MAN6=		xtrojka.6
 MANCOMPRESSED=	yes
 
diff -ruN xtrojka.orig/distinfo xtrojka/distinfo
--- xtrojka.orig/distinfo	2011-07-03 16:25:33.000000000 +0200
+++ xtrojka/distinfo	2013-09-17 10:29:03.000000000 +0200
@@ -1,2 +1,2 @@
-SHA256 (xtrojka.tar.gz) = a94d3b2b1920a4b542ac6e4bc9f39de855a81991304015267975da1753550e93
-SIZE (xtrojka.tar.gz) = 27021
+SHA256 (xtrojka123.tar.gz) = dae9cb2094914060f00d6cb15842cd7ecd71a78347bf12b2e7539e9ba8d89932
+SIZE (xtrojka123.tar.gz) = 49446
diff -ruN xtrojka.orig/files/old-patch-Makefile xtrojka/files/old-patch-Makefile
--- xtrojka.orig/files/old-patch-Makefile	1970-01-01 01:00:00.000000000 +0100
+++ xtrojka/files/old-patch-Makefile	2013-09-17 10:28:57.000000000 +0200
@@ -0,0 +1,83 @@
+--- Makefile.orig	Sat Oct 21 22:38:22 1995
++++ Makefile	Wed Jul 12 08:50:34 2000
+@@ -8,7 +8,7 @@
+ 
+ #	your favorite C-compiler
+ #
+-CC=gcc
++CC?=gcc
+ #CC=cc
+ 
+ 
+@@ -22,13 +22,13 @@
+ #	Touch 'hiscore.c' and 'score_status_mgr.c' when you change
+ #	these variables!
+ #
+-HSFILE=/usr/local/games/lib/xtrojka.scores
++HSFILE=${PREFIX}/share/xtrojka/xtrojka.scores
+ #HSFILE=/tmp/xtrojka.scores
+ CFLAGS= -DSCOREFILE='"$(HSFILE)"' 
+ 
+ # add library search path
+ #
+-CFLAGS+=-L/usr/X11/lib
++CFLAGS+=-L${LOCALBASE}/lib
+ 
+ # on some systems you might add this line, because gcc starts wining
+ # about 'sizeof(Display)', since Display might be an empty struct;
+@@ -42,24 +42,28 @@
+ 
+ #	location of xtrojka game
+ #
+-TARGET_DIR=/usr/games
++TARGET_DIR=${PREFIX}/bin
+ 
+ 
+ #	location of the manualpage
+ #
+-MANDIR=/usr/local/man/man6
++MANDIR=${PREFIX}/man/man6
+ 
+ 
+ #	please comment out for the system you use
+ #
+ #	sunos 4.1.3
+-XDIR=/usr/openwin/include
+-LIBS=-lm
++#XDIR=/usr/openwin/include
++#LIBS=-lm
+ 
+ # solaris
+ #XDIR=/usr/openwin/include
+ #LIBS=-lnsl
+ 
++# FreeBSD
++XDIR=${LOCALBASE}/include
++LIBS=-lm
++
+ #
+ #
+ #	main
+@@ -101,11 +105,17 @@
+ #
+ #
+ install:
+-	@echo $(HSFILE)|sed -e 's/\//\\\//g'>/tmp/hsn; \
+-	sed -e "s/__SCOREDIR__/`cat /tmp/hsn`/g" manpage > xtrojka.6; \
+-	cp xtrojka.6 $(MANDIR); chmod go+r xtrojka.6; \
+-	cp xtrojka $(TARGET_DIR);chmod go+rx xtrojka; \
+-	touch $(HSFILE); chmod go+rwx $(HSFILE);
++	@rm -f hsn
++	echo $(HSFILE)|sed -e 's/\//\\\//g'>hsn
++	sed -e "s/__SCOREDIR__/`cat hsn`/g" manpage > xtrojka.6
++	gzip -c xtrojka.6 >$(MANDIR)/xtrojka.6.gz
++	cp xtrojka $(TARGET_DIR)
++	chmod 2755 $(TARGET_DIR)/xtrojka
++	chgrp games $(TARGET_DIR)/xtrojka
++	touch $(HSFILE)
++	chmod 664 $(HSFILE)
++	chgrp games $(HSFILE)
++	@rm -f hsn
+ 	
+ clean:
+ 	rm -rf *.o core xtrojka xtrojka.6 
diff -ruN xtrojka.orig/files/patch-Makefile xtrojka/files/patch-Makefile
--- xtrojka.orig/files/patch-Makefile	1970-01-01 01:00:00.000000000 +0100
+++ xtrojka/files/patch-Makefile	2013-09-17 10:28:56.000000000 +0200
@@ -0,0 +1,78 @@
+--- Makefile.orig	1996-07-27 20:05:03.000000000 +0200
++++ Makefile	2013-09-12 11:55:14.000000000 +0200
+@@ -10,15 +10,15 @@
+ #					xtrojka version (do not change!)
+ VERSION=123
+ #					where to put the binary
+-TARGET_DIR=/usr/games
++TARGET_DIR=${PREFIX}/bin
+ #					where to put the manpage
+-MANDIR=/usr/local/man/man6
++MANDIR=${PREFIX}/man/man6
+ #					the location of the highscorefile
+-HSFILE=/fill_in_your_scorefile
++HSFILE=${PREFIX}/share/xtrojka/xtrojka.scores
+ #					your favourite packer
+ COMPRESS=gzip -v9
+ #					your favourite c-compiler
+-CC=gcc
++CC?=gcc
+ #					used X libraries
+ XLIBS= -lXaw -lXmu -lXt -lX11 -lXext
+ #					some more X libraries
+@@ -48,7 +48,7 @@
+ #	comment out your favorite system (the one you use, that is...)
+ #
+ #					search the libaries here
+-LIBPATH=-L/usr/X11/lib
++LIBPATH=-L${LOCALBASE}/lib
+ #					doesn't work too well on all systems
+ #LCK=-DLOCKING
+ #					add debug info
+@@ -75,7 +75,13 @@
+ #
+ # Linux
+ #
+-SYS=-DLINUX
++#SYS=-DLINUX
++
++#
++# FreeBSD
++#
++XDIR=-I${LOCALBASE}/include
++LIBS=-lm
+ 
+ #
+ #
+@@ -105,11 +111,17 @@
+ 	rm -rf xtrojka$(VERSION);
+ 
+ install:
+-	@echo $(HSFILE)|sed -e 's/\//\\\//g'>/tmp/hsn; \
+-	sed -e "s/__SCOREDIR__/`cat /tmp/hsn`/g" xtrojka.man > xtrojka.6; \
+-	cp xtrojka.6 $(MANDIR); chmod go+r xtrojka.6; \
+-	cp xtrojka $(TARGET_DIR);chmod go+rx xtrojka; \
+-	touch $(HSFILE); chmod go+rwx $(HSFILE);
++	@rm -f hsn
++	echo $(HSFILE)|sed -e 's/\//\\\//g'>hsn
++	sed -e "s/__SCOREDIR__/`cat hsn`/g" xtrojka.man > xtrojka.6
++	gzip -c xtrojka.6 >$(MANDIR)/xtrojka.6.gz
++	cp xtrojka $(TARGET_DIR)
++	chmod 2755 $(TARGET_DIR)/xtrojka
++	chgrp games $(TARGET_DIR)/xtrojka
++	touch $(HSFILE)
++	chmod 664 $(HSFILE)
++	chgrp games $(HSFILE)
++	@rm -f hsn
+ 	
+ clean:
+ 	rm -rf tags *.o core xtrojka xtrojka.6 
+@@ -119,7 +131,7 @@
+ #	DEPENDENCIES
+ #
+ 
+-_strdefs.h _resdefs.h:	XTrojka 
++_strdefs.h _resdefs.h:	XTrojka.uk
+ 	$(RESGEN)
+ 
+ actions.o: actions.c actions.h xtrojka.h debug.h
diff -ruN xtrojka.orig/files/patch-aa xtrojka/files/patch-aa
--- xtrojka.orig/files/patch-aa	2008-04-19 19:49:50.000000000 +0200
+++ xtrojka/files/patch-aa	1970-01-01 01:00:00.000000000 +0100
@@ -1,83 +0,0 @@
---- Makefile.orig	Sat Oct 21 22:38:22 1995
-+++ Makefile	Wed Jul 12 08:50:34 2000
-@@ -8,7 +8,7 @@
- 
- #	your favorite C-compiler
- #
--CC=gcc
-+CC?=gcc
- #CC=cc
- 
- 
-@@ -22,13 +22,13 @@
- #	Touch 'hiscore.c' and 'score_status_mgr.c' when you change
- #	these variables!
- #
--HSFILE=/usr/local/games/lib/xtrojka.scores
-+HSFILE=${PREFIX}/share/xtrojka/xtrojka.scores
- #HSFILE=/tmp/xtrojka.scores
- CFLAGS= -DSCOREFILE='"$(HSFILE)"' 
- 
- # add library search path
- #
--CFLAGS+=-L/usr/X11/lib
-+CFLAGS+=-L${LOCALBASE}/lib
- 
- # on some systems you might add this line, because gcc starts wining
- # about 'sizeof(Display)', since Display might be an empty struct;
-@@ -42,24 +42,28 @@
- 
- #	location of xtrojka game
- #
--TARGET_DIR=/usr/games
-+TARGET_DIR=${PREFIX}/bin
- 
- 
- #	location of the manualpage
- #
--MANDIR=/usr/local/man/man6
-+MANDIR=${PREFIX}/man/man6
- 
- 
- #	please comment out for the system you use
- #
- #	sunos 4.1.3
--XDIR=/usr/openwin/include
--LIBS=-lm
-+#XDIR=/usr/openwin/include
-+#LIBS=-lm
- 
- # solaris
- #XDIR=/usr/openwin/include
- #LIBS=-lnsl
- 
-+# FreeBSD
-+XDIR=${LOCALBASE}/include
-+LIBS=-lm
-+
- #
- #
- #	main
-@@ -101,11 +105,17 @@
- #
- #
- install:
--	@echo $(HSFILE)|sed -e 's/\//\\\//g'>/tmp/hsn; \
--	sed -e "s/__SCOREDIR__/`cat /tmp/hsn`/g" manpage > xtrojka.6; \
--	cp xtrojka.6 $(MANDIR); chmod go+r xtrojka.6; \
--	cp xtrojka $(TARGET_DIR);chmod go+rx xtrojka; \
--	touch $(HSFILE); chmod go+rwx $(HSFILE);
-+	@rm -f hsn
-+	echo $(HSFILE)|sed -e 's/\//\\\//g'>hsn
-+	sed -e "s/__SCOREDIR__/`cat hsn`/g" manpage > xtrojka.6
-+	gzip -c xtrojka.6 >$(MANDIR)/xtrojka.6.gz
-+	cp xtrojka $(TARGET_DIR)
-+	chmod 2755 $(TARGET_DIR)/xtrojka
-+	chgrp games $(TARGET_DIR)/xtrojka
-+	touch $(HSFILE)
-+	chmod 664 $(HSFILE)
-+	chgrp games $(HSFILE)
-+	@rm -f hsn
- 	
- clean:
- 	rm -rf *.o core xtrojka xtrojka.6 
diff -ruN xtrojka.orig/files/patch-resgen xtrojka/files/patch-resgen
--- xtrojka.orig/files/patch-resgen	1970-01-01 01:00:00.000000000 +0100
+++ xtrojka/files/patch-resgen	2013-09-17 10:28:57.000000000 +0200
@@ -0,0 +1,12 @@
+--- resgen.orig	2013-09-12 11:56:10.000000000 +0200
++++ resgen	2013-09-12 11:56:20.000000000 +0200
+@@ -16,7 +16,8 @@
+ #	These files will be included
+ #	in the source code as a fall-back resource.
+ #
+-INPUT=XTrojka
++set -x
++INPUT=XTrojka.uk
+ RESFILE=_resdefs.h
+ HFILE=_strdefs.h
+ H="/* hoi */"
diff -ruN xtrojka.orig/pkg-plist xtrojka/pkg-plist
--- xtrojka.orig/pkg-plist	2000-05-29 07:49:38.000000000 +0200
+++ xtrojka/pkg-plist	2013-09-17 10:29:03.000000000 +0200
@@ -1,3 +1,4 @@
 bin/xtrojka
 share/xtrojka/xtrojka.scores
+man/man6/xtrojka.6.gz
 @dirrm share/xtrojka