- Update to 1.7.0

- Unbreak on 64-bit archs [1]
- Install documentation
- Throw in a bunch of useful patches
- Utilize OPTIONS
- Augment mirror list

Approved by:	maintainer timeout
PR:		ports/77810 [1]
Submitted by:	anholt [1]
Tested on:	panther, beast, sledge [1]

6 files changed, 135 insertions, 66 deletions

diff --git a/games/yadex/files/patch-GNUmakefile b/games/yadex/files/patch-GNUmakefile
index 62b74ed8b847..394ea892ccbc 100644
--- a/games/yadex/files/patch-GNUmakefile
+++ b/games/yadex/files/patch-GNUmakefile
@@ -1,23 +1,45 @@
---- GNUmakefile.orig	Tue Dec 12 16:49:00 2000
-+++ GNUmakefile	Sun Jun 17 22:43:27 2001
-@@ -22,7 +22,10 @@
+--- GNUmakefile.orig	Sun Dec 28 23:23:56 2003
++++ GNUmakefile	Mon Mar 21 16:31:11 2005
+@@ -67,8 +67,8 @@
+     X11LIBDIR     = /usr/openwin/lib
+     X11INCLUDEDIR = /usr/openwin/include
+   else
+-    X11LIBDIR     = /usr/X11R6/lib
+-    X11INCLUDEDIR = /usr/X11R6/include
++    X11LIBDIR     = $(X11BASE)/lib
++    X11INCLUDEDIR = $(X11BASE)/include
+   endif
+ endif
  
- # Where you want "make install" to put things.
- # Typical values : "/usr", "/usr/local" and "/opt".
--PREFIX = /usr/local
-+PREFIX?= /usr/local
-+
-+# Make a PREFIX def available to the source
-+DEFINES += -DPREFIX=\"$(PREFIX)\"
+@@ -79,13 +79,13 @@
+ #CXX =
  
- # Which OS ?
- OS := $(shell uname -s | tr A-Z a-z)
-@@ -352,7 +355,7 @@
- else
-   INST_CFGDIR = $(PREFIX)/etc/yadex/$(VERSION)
- endif
--INST_YGDDIR = $(PREFIX)/share/games/yadex/$(VERSION)
-+INST_YGDDIR = $(PREFIX)/share/yadex/$(VERSION)
- ifdef FHS_MAN
-   INST_MANDIR = $(PREFIX)/share/man/man6
- else
+ # Options used when compiling Atclib.
+-CFLAGS = -O
++#CFLAGS = -O
+ 
+ # Options used when compiling and linking Yadex.
+ # ld is invoked through the C++ compiler so
+ # LDFLAGS should not contain options that mean
+ # something to the C++ compiler.
+-CXXFLAGS = -O
++#CXXFLAGS = -O
+ #CXXFLAGS += -DWHITE_BACKGROUND
+ #LDFLAGS  =
+ 
+@@ -395,12 +395,10 @@
+ 	@scripts/mkinstalldirs $(MANDIR)
+ 	@scripts/mkinstalldirs $(MANDIR)/man6
+ 	@scripts/mkinstalldirs $(SHAREDIR)
+-	$(OBJDIR)/install -m 755 $(OBJDIR)/yadex $(BINDIR)/yadex-$(VERSION)
+ 	rm -f $(BINDIR)/yadex
+-	ln -s yadex-$(VERSION) $(BINDIR)/yadex
+-	$(OBJDIR)/install -m 644 doc/yadex.6 $(MANDIR)/man6/yadex-$(VERSION).6
+-	rm -f $(MANDIR)/man6/yadex.6
+-	ln -s yadex-$(VERSION).6 $(MANDIR)/man6/yadex.6
++	$(OBJDIR)/install -m 755 $(OBJDIR)/yadex $(BINDIR)/yadex
++	rm -f $(MANDIR)/man6/yadex.6*
++	$(OBJDIR)/install -m 644 doc/yadex.6 $(MANDIR)/man6/yadex.6
+ 	$(OBJDIR)/install -m 644 -d $(SHAREDIR) $(YGD)
+ 	$(OBJDIR)/install -m 644 -d $(ETCDIR) yadex.cfg
+ 	@echo "---------------------------------------------------------------"
diff --git a/games/yadex/files/patch-cfgfile.cc b/games/yadex/files/patch-cfgfile.cc
deleted file mode 100644
index 66b0acfbd727..000000000000
--- a/games/yadex/files/patch-cfgfile.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/cfgfile.cc.orig	Sat Aug 26 13:21:12 2000
-+++ src/cfgfile.cc	Sun Jun 17 20:33:08 2001
-@@ -572,10 +572,8 @@
-    "~/.yadex/%v/%b",
-    "~/.yadex/%b",
-    "%i/%b",
--   "/usr/local/etc/yadex/%v/%b",
--   "/usr/local/etc/yadex/%b",
--   "/etc/yadex/%v/%b",
--   "/etc/yadex/%b",
-+   PREFIX "/etc/yadex/%v/%b",
-+   PREFIX "/etc/yadex/%b",
-    0
-    };
- 
diff --git a/games/yadex/files/patch-configure b/games/yadex/files/patch-configure
new file mode 100644
index 000000000000..c33c771f55cd
--- /dev/null
+++ b/games/yadex/files/patch-configure
@@ -0,0 +1,70 @@
+--- configure.orig	Mon Mar 21 16:22:56 2005
++++ configure	Mon Mar 21 16:25:54 2005
+@@ -24,15 +24,12 @@
+ APPNAME=yadex
+ VERSION=`cat VERSION`
+ 
+-CC=
+-CXX=
+ HAVE_GETTIMEOFDAY=
+ HAVE_NANOSLEEP=
+ HAVE_SNPRINTF=
+ HAVE_USLEEP=
+ INTERFACE=x11				# "bgi" or "x11"
+ PLATFORM=unix				# "dos" or "unix"
+-PREFIX=/usr/local
+ 
+ 
+ #
+@@ -400,44 +397,14 @@
+ mkdir -p $BUILDDIR
+ 
+ #
+-#	FHS paths
++#	FreeBSD hier(7) paths
+ #
+-if expr "$PREFIX" : '//*usr/*$' >/dev/null
+-then
+-  BINDIR=/usr/bin		# FHS-ly correct is /usr/games
+-  ETCDIR=/etc/$APPNAME/%v
+-  ETCDIRNV=/etc/$APPNAME
+-  MANDIR=/usr/share/man
+-  SHAREDIR=/usr/share/games/$APPNAME/%v
+-  SHAREDIRNV=/usr/share/games/$APPNAME
+-elif expr "$PREFIX" : '//*usr//*local/*$' >/dev/null
+-then
+-  BINDIR=/usr/local/bin		# FHS-ly correct is /usr/local/games
+-  ETCDIR=/etc/$APPNAME/%v
+-  ETCDIRNV=/etc/$APPNAME
+-  MANDIR=/usr/local/man
+-  SHAREDIR=/usr/local/share/games/$APPNAME/%v
+-  SHAREDIRNV=/usr/local/share/games/$APPNAME
+-elif expr "$PREFIX" : '//*opt/*$' >/dev/null
+-then
+-  echo '/opt ? Surely you mean /opt/something, Mr. Feynman !' 1>&2
+-  exit 1
+-elif expr "$PREFIX" : '//*opt//*[^/]' >/dev/null
+-then
+-  BINDIR=$PREFIX/bin
+-  ETCDIR=/etc/opt/`expr "$PREFIX" : '//*opt//*\(.*\)'`
+-  ETCDIRNV=
+-  MANDIR=$PREFIX/man
+-  SHAREDIR=$PREFIX/share
+-  SHAREDIRNV=
+-else					# Probably /home/joe/*
+-  BINDIR=$PREFIX/bin
+-  ETCDIR=$PREFIX/etc
+-  ETCDIRNV=
+-  MANDIR=$PREFIX/man
+-  SHAREDIR=$PREFIX/share
+-  SHAREDIRNV=
+-fi
++BINDIR=$PREFIX/bin
++ETCDIR=$PREFIX/etc
++ETCDIRNV=
++MANDIR=$PREFIX/man
++SHAREDIR=$PREFIX/share/$APPNAME
++SHAREDIRNV=
+ 
+ #
+ #	Write Makefile.config
diff --git a/games/yadex/files/patch-game.cc b/games/yadex/files/patch-game.cc
deleted file mode 100644
index ef2285b3f69b..000000000000
--- a/games/yadex/files/patch-game.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/game.cc.orig	Wed May 10 15:01:58 2000
-+++ src/game.cc	Sun Jun 17 20:42:48 2001
-@@ -42,10 +42,8 @@
-    "./%b",
-    "~/.yadex/%v/%b",
-    "%i/%b",
--   "/usr/local/share/games/yadex/%v/%b",
--   "/usr/share/games/yadex/%v/%b",
--   "/usr/local/share/games/yadex/%b",
--   "/usr/share/games/yadex/%b",
-+   PREFIX "/share/yadex/%v/%b",
-+   PREFIX "/share/yadex/%b",
-    0
-    };
- 
diff --git a/games/yadex/files/patch-wads2.cc b/games/yadex/files/patch-wads2.cc
deleted file mode 100644
index e34da6f5f6b6..000000000000
--- a/games/yadex/files/patch-wads2.cc
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/wads2.cc.orig	Sun May  7 05:47:11 2000
-+++ src/wads2.cc	Sun Jun 17 20:46:41 2001
-@@ -910,10 +910,8 @@
-    {
-    "",
-    "~/",                            // "~" means "the user's home directory"
--   "/usr/local/share/games/%s/",    // %s is replaced by <Game>
--   "/usr/share/games/%s/",          // %s is replaced by <Game>
--   "/usr/local/share/games/wads/",
--   "/usr/share/games/wads/",
-+   "~/doom/",			    // several doom variants put wads here
-+   PREFIX "/share/%s/",             // %s is replaced by <Game>
-    0
-    };
- 
diff --git a/games/yadex/files/patch-yadex.h b/games/yadex/files/patch-yadex.h
new file mode 100644
index 000000000000..44d2329d2c87
--- /dev/null
+++ b/games/yadex/files/patch-yadex.h
@@ -0,0 +1,22 @@
+--- src/yadex.h.orig	Sat Jan  1 14:23:40 2005
++++ src/yadex.h	Sat Jan  1 14:23:50 2005
+@@ -95,13 +95,13 @@
+ #define F_I16_D "hd"
+ #define F_I16_H "hX"
+ 
+-typedef unsigned long  u32;
+-#define F_U32_D "lu"
+-#define F_U32_H "lX"
++typedef unsigned int  u32;
++#define F_U32_D "u"
++#define F_U32_H "X"
+ 
+-typedef signed   long  i32;
+-#define F_I32_D "ld"
+-#define F_I32_H "lX"
++typedef signed   int  i32;
++#define F_I32_D "d"
++#define F_I32_H "X"
+ 
+ 
+ /*