6 files changed, 56 insertions, 40 deletions

diff --git a/games/xemeraldia/Makefile b/games/xemeraldia/Makefile
index ed59dacdb4f8..4a7a5ac6a1f4 100644
--- a/games/xemeraldia/Makefile
+++ b/games/xemeraldia/Makefile
@@ -1,36 +1,28 @@
-# New ports collection makefile for:    xemeraldia
-# Version required:     0.3
-# Date created:         22 Mar 1995
-# Whom:                 asami
+# New ports collection makefile for:	xemeraldia
+# Version required:	0.31
+# Date created:		22 Mar 1995
+# Whom:			asami
 #
 # $FreeBSD$
 #
 
-DISTNAME=       xemeraldia-0.3
+DISTNAME=	xemeraldia-0.3
+PKGNAME=	xemeraldia-0.31
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.kuis.kyoto-u.ac.jp/News.Archives/fj.sources/1995/
-DISTFILES=	271.gz
+MASTER_SITES=	ftp://ftp.lab.kdd.co.jp/Usenet/fj.sources/1995/mar/
+
+PATCH_SITES=	ftp://ftp.lab.kdd.co.jp/Usenet/fj.sources/1995/apr/
+PATCHFILES=	xemeraldia-0.3to0.31.patch.gz
+PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_IMAKE=      yes
+USE_IMAKE=	yes
 NO_INSTALL_MANPAGES=	yes
 
-do-extract:
-	@(cd ${DISTDIR}; \
-	  if [ ! -f ${DISTNAME}.tar.gz ]; then \
-	    zcat ${DISTFILES} | uudecode; \
-	  fi)
-	@${RM} -rf ${WRKDIR}
-	@${MKDIR} ${WRKDIR}
-	@(cd ${WRKDIR}; tar -xzf \
-		${DISTDIR}/${DISTNAME}.tar.gz)
-
 post-install:
-	touch ${PREFIX}/lib/X11/.xemeraldia.scores
-	${CHMOD} 666 ${PREFIX}/lib/X11/.xemeraldia.scores
-
-pre-clean:
-	@${RM} -f ${DISTDIR}/${DISTNAME}.tar.gz
+	@${MKDIR} ${PREFIX}/lib/X11/xemeraldia
+	@${TOUCH} ${PREFIX}/lib/X11/xemeraldia/xemeraldia.scores
+	@${CHMOD} 666 ${PREFIX}/lib/X11/xemeraldia/xemeraldia.scores
 
 .include <bsd.port.mk>
diff --git a/games/xemeraldia/distinfo b/games/xemeraldia/distinfo
index e66da89b04df..998168efc0ef 100644
--- a/games/xemeraldia/distinfo
+++ b/games/xemeraldia/distinfo
@@ -1 +1,2 @@
-MD5 (271.gz) = 693edb031d149ab93ae1b0c0a65a487a
+MD5 (xemeraldia-0.3.tar.gz) = 35c30637ea597ce995d8b51a3d8e4080
+MD5 (xemeraldia-0.3to0.31.patch.gz) = 77287135b5d28d67c1245241dbd6534f
diff --git a/games/xemeraldia/files/patch-aa b/games/xemeraldia/files/patch-aa
index 79d4769808d1..237c1811c55c 100644
--- a/games/xemeraldia/files/patch-aa
+++ b/games/xemeraldia/files/patch-aa
@@ -1,23 +1,19 @@
---- ./Imakefile.org	Thu Mar 23 03:12:46 1995
-+++ ./Imakefile	Tue Mar 28 00:55:44 1995
-@@ -1,11 +1,7 @@
+--- Imakefile.orig	Thu Dec  9 19:16:34 1999
++++ Imakefile	Thu Dec  9 19:27:40 1999
+@@ -1,5 +1,4 @@
 -BIN_DIR=          /usr/local/bin
 -HIGH_SCORE_DIR=   /usr/local/lib
-+HIGH_SCORE_DIR=   ${LIBDIR}
++HIGH_SCORE_DIR=   ${LIBDIR}/xemeraldia
  
  /*---------------------------------------------------------------------*/
  
--/* CC=gcc */
--CDEBUGFLAGS=-g
--
- #ifdef SunOSPlatform
- #if SunOSPlatform
- #if OSMajorVersion == 4
-@@ -15,7 +11,6 @@
+@@ -14,8 +13,7 @@
  #endif
  #endif
  
 -BINDIR=$(BIN_DIR)
- EXTRA_DEFINES = -DHIGH_SCORE_TABLE=\"$(HIGH_SCORE_DIR)/.xemeraldia.scores\"\
+-EXTRA_DEFINES = -DHIGH_SCORE_TABLE=\"$(HIGH_SCORE_DIR)/.xemeraldia.scores\"\
++EXTRA_DEFINES = -DHIGH_SCORE_TABLE=\"$(HIGH_SCORE_DIR)/xemeraldia.scores\"\
                  -D__USE_FIXED_PROTOTYPES__
  
+ HEADERS = games.h graphics.h bitmaps.h
diff --git a/games/xemeraldia/files/patch-ab b/games/xemeraldia/files/patch-ab
new file mode 100644
index 000000000000..95f99eb37909
--- /dev/null
+++ b/games/xemeraldia/files/patch-ab
@@ -0,0 +1,15 @@
+--- XEmeraldia.ad.orig	Thu Dec  9 19:16:35 1999
++++ XEmeraldia.ad	Thu Dec  9 19:23:20 1999
+@@ -32,9 +32,9 @@
+ XEmeraldia*useScoreFile: True
+ 
+ !!!!! fonts !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+-XEmeraldia*nextBox*Font: -adobe-courier-bold-r-normal-*-20-*-*-*-*-*-*-*
+-XEmeraldia*buttonBox*Font: -adobe-courier-bold-r-normal-*-20-*-*-*-*-*-*-*
+-XEmeraldia*dispBox*Font: -adobe-courier-bold-r-normal-*-20-*-*-*-*-*-*-*
++XEmeraldia*nextBox*Font: -adobe-courier-bold-r-normal-*-18-*-*-*-*-*-*-*
++XEmeraldia*buttonBox*Font: -adobe-courier-bold-r-normal-*-18-*-*-*-*-*-*-*
++XEmeraldia*dispBox*Font: -adobe-courier-bold-r-normal-*-18-*-*-*-*-*-*-*
+ 
+ !!!!! controls !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ XEmeraldia*bigBox.baseTranslations:	#override \
diff --git a/games/xemeraldia/files/patch-ac b/games/xemeraldia/files/patch-ac
new file mode 100644
index 000000000000..5e0ab91153ca
--- /dev/null
+++ b/games/xemeraldia/files/patch-ac
@@ -0,0 +1,11 @@
+--- init-graphics.c.orig	Mon Mar 20 16:15:38 1995
++++ init-graphics.c	Thu Dec  9 19:50:51 1999
+@@ -50,7 +50,7 @@
+   clearScreen (w);
+ 
+   font = XLoadFont (XtDisplay (w),
+-		    "-*-new century schoolbook-*-*-*-*-20-*-*-*-*-*-*-*");
++		    "-*-new century schoolbook-*-*-*-*-18-*-*-*-*-*-*-*");
+   XSetFont (XtDisplay (w), draw_gc, font);
+ }
+ 
diff --git a/games/xemeraldia/pkg-plist b/games/xemeraldia/pkg-plist
index e0a9d09f4257..f8a764b8ab02 100644
--- a/games/xemeraldia/pkg-plist
+++ b/games/xemeraldia/pkg-plist
@@ -1,5 +1,6 @@
 bin/xemeraldia
-@exec touch -f %D/lib/X11/.xemeraldia.scores
-@exec chmod 666 %D/lib/X11/.xemeraldia.scores
-@exec chown games %D/lib/X11/.xemeraldia.scores
-@unexec rm -f %D/lib/X11/.xemeraldia.scores
+@exec mkdir -p %D/lib/X11/xemeraldia
+@exec touch -f %D/lib/X11/xemeraldia/xemeraldia.scores
+@exec chmod 666 %D/lib/X11/xemeraldia/xemeraldia.scores
+@unexec rm -f %D/lib/X11/xemeraldia/xemeraldia.scores
+@unexec rmdir %D/lib/X11/xemeraldia