aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--games/yadex/Makefile61
-rw-r--r--games/yadex/distinfo14
-rw-r--r--games/yadex/files/patch-GNUmakefile64
-rw-r--r--games/yadex/files/patch-cfgfile.cc15
-rw-r--r--games/yadex/files/patch-configure70
-rw-r--r--games/yadex/files/patch-game.cc15
-rw-r--r--games/yadex/files/patch-wads2.cc15
-rw-r--r--games/yadex/files/patch-yadex.h22
-rw-r--r--games/yadex/pkg-plist73
9 files changed, 253 insertions, 96 deletions
diff --git a/games/yadex/Makefile b/games/yadex/Makefile
index 72ad47136003..7b32b54f15cb 100644
--- a/games/yadex/Makefile
+++ b/games/yadex/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: yadex
+# New ports collection makefile for: Yadex
# Date created: 17 June 2001
# Whom: Jordan DeLong <fracture@allusion.net>
#
@@ -6,28 +6,69 @@
#
PORTNAME= yadex
-PORTVERSION= 1.5.2
-PORTREVISION= 1
+PORTVERSION= 1.7.0
CATEGORIES= games
-MASTER_SITES= http://www.teaser.fr/~amajorel/yadex/
+MASTER_SITES= http://www.teaser.fr/~amajorel/yadex/ \
+ http://hjem.get2net.dk/RasII/amajorel/yadex/
+DIST_SUBDIR= ${PORTNAME}
MAINTAINER= fracture@allusion.net
COMMENT= A WAD-file editor, for games like Doom and Hexen
-USE_XLIB= yes
+USE_X_PREFIX= yes
USE_GMAKE= yes
MAKEFILE= GNUmakefile
-PLIST_SUB+= PORTVERSION=${PORTVERSION}
+HAS_CONFIGURE= yes
+CONFIGURE_ENV= CC="${CC}" CXX="${CXX}" PREFIX="${PREFIX}"
-MAN6= yadex.6 ybsp.6
+MAN6= yadex.6
+
+OPTIONS= WHITE_BG "Use alternative (black-on-white) color scheme" off \
+ 3D_RENDER "Build with a 3D preview function" off \
+ SEARCH "Search for a thing, linedef or sector by type" off \
+ EXTRA_TOOLS "Add a few extra tools to Yadex's repertoire" off \
+ LAPTOP_KEYS "Key bindings to make editing easier on laptops" off
.include <bsd.port.pre.mk>
-.if ${ARCH} == "alpha" || ${ARCH} == "amd64"
-BROKEN= "Does not compile on alpha or amd64"
+.if defined(WITH_3D_RENDER) || defined(WITH_SEARCH) \
+ || defined(WITH_EXTRA_TOOLS) || defined(WITH_LAPTOP_KEYS)
+PATCH_SITES= http://glbsp.sourceforge.net/%SUBDIR%/
+PATCH_SITE_SUBDIR= ${PORTNAME}
+PATCH_DIST_STRIP= -p1
+PATCH_PREFIX= ${PORTNAME:U:C/^(.).*$/\1/g}${PORTNAME:C/^(.)//}_${PORTVERSION:S/.//g}
+PATCH_SUFFIX= .diff
+PATCHFILES= ${PATCH_PREFIX}_Depend${PATCH_SUFFIX}
+. if defined(WITH_3D_RENDER)
+PATCHFILES+= ${PATCH_PREFIX}_Render3D${PATCH_SUFFIX}
+PLIST_SUB+= 3DRENDER=""
+. else
+PLIST_SUB+= 3DRENDER="@comment "
+. endif
+. if defined(WITH_SEARCH)
+PATCHFILES+= ${PATCH_PREFIX}_Find${PATCH_SUFFIX}
+. endif
+. if defined(WITH_EXTRA_TOOLS)
+PATCHFILES+= ${PATCH_PREFIX}_Tools${PATCH_SUFFIX}
+. endif
+. if defined(WITH_LAPTOP_KEYS)
+PATCHFILES+= ${PATCH_PREFIX}_Keys${PATCH_SUFFIX}
+. endif
+.else
+PLIST_SUB+= 3DRENDER="@comment "
+.endif
+
+.if defined(WITH_WHITE_BG)
+USE_REINPLACE= yes
+post-patch:
+ @${REINPLACE_CMD} -E 's,^#(CXXFLAGS \+= -DWHITE_BACKGROUND)$$,\1,' \
+ ${WRKSRC}/${MAKEFILE}
.endif
post-install:
- ${CHMOD} 644 ${PREFIX}/etc/yadex/${PORTVERSION}/yadex.cfg
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${DOCSDIR}
+ ${INSTALL_DATA} ${WRKSRC}/doc/*.[^6]* ${WRKSRC}/doc/README ${DOCSDIR}
+.endif
.include <bsd.port.post.mk>
diff --git a/games/yadex/distinfo b/games/yadex/distinfo
index 64e56e3d2b63..e7ab918f6ff8 100644
--- a/games/yadex/distinfo
+++ b/games/yadex/distinfo
@@ -1,2 +1,12 @@
-MD5 (yadex-1.5.2.tar.gz) = b93220bd9e6c311055f2077f1d532d46
-SIZE (yadex-1.5.2.tar.gz) = 484354
+MD5 (yadex/yadex-1.7.0.tar.gz) = d341abe066525394082edfd520af86ae
+SIZE (yadex/yadex-1.7.0.tar.gz) = 551318
+MD5 (yadex/Yadex_170_Depend.diff) = 9300e779512267eccaab482436741776
+SIZE (yadex/Yadex_170_Depend.diff) = 790
+MD5 (yadex/Yadex_170_Render3D.diff) = b0122b31aad5df4c74271ecbb5deeaf8
+SIZE (yadex/Yadex_170_Render3D.diff) = 50150
+MD5 (yadex/Yadex_170_Find.diff) = c6d0be2ebfd19339fb72fc256f9807a9
+SIZE (yadex/Yadex_170_Find.diff) = 4911
+MD5 (yadex/Yadex_170_Tools.diff) = 28c17184c911e6314b1d604003b335d9
+SIZE (yadex/Yadex_170_Tools.diff) = 17179
+MD5 (yadex/Yadex_170_Keys.diff) = 83bc9bccc9de2d50c488aed6831c1b23
+SIZE (yadex/Yadex_170_Keys.diff) = 1496
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"
+
+
+ /*
diff --git a/games/yadex/pkg-plist b/games/yadex/pkg-plist
index df618ade5dc6..76947567dd57 100644
--- a/games/yadex/pkg-plist
+++ b/games/yadex/pkg-plist
@@ -1,19 +1,56 @@
bin/yadex
-bin/yadex-%%PORTVERSION%%
-bin/ybsp
-bin/ybsp-%%PORTVERSION%%
-etc/yadex/%%PORTVERSION%%/yadex.cfg
-share/yadex/%%PORTVERSION%%/doom.ygd
-share/yadex/%%PORTVERSION%%/doom02.ygd
-share/yadex/%%PORTVERSION%%/doom04.ygd
-share/yadex/%%PORTVERSION%%/doom05.ygd
-share/yadex/%%PORTVERSION%%/doom2.ygd
-share/yadex/%%PORTVERSION%%/doompr.ygd
-share/yadex/%%PORTVERSION%%/heretic.ygd
-share/yadex/%%PORTVERSION%%/hexen.ygd
-share/yadex/%%PORTVERSION%%/strife.ygd
-share/yadex/%%PORTVERSION%%/strife10.ygd
-@dirrm share/yadex/%%PORTVERSION%%
-@dirrm share/yadex
-@dirrm etc/yadex/%%PORTVERSION%%
-@dirrm etc/yadex
+etc/yadex.cfg
+%%DATADIR%%/doom.ygd
+%%DATADIR%%/doom02.ygd
+%%DATADIR%%/doom04.ygd
+%%DATADIR%%/doom05.ygd
+%%DATADIR%%/doom2.ygd
+%%DATADIR%%/doompr.ygd
+%%DATADIR%%/heretic.ygd
+%%DATADIR%%/hexen.ygd
+%%DATADIR%%/strife.ygd
+%%DATADIR%%/strife10.ygd
+@dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/002f2f.png
+%%PORTDOCS%%%%DOCSDIR%%/E1.png
+%%PORTDOCS%%%%DOCSDIR%%/E2.png
+%%PORTDOCS%%%%DOCSDIR%%/advanced.html
+%%PORTDOCS%%%%DOCSDIR%%/contact.html
+%%PORTDOCS%%%%DOCSDIR%%/credits.html
+%%PORTDOCS%%%%DOCSDIR%%/deu_diffs.html
+%%PORTDOCS%%%%DOCSDIR%%/e1.png
+%%PORTDOCS%%%%DOCSDIR%%/e2.png
+%%PORTDOCS%%%%DOCSDIR%%/editing_docs.html
+%%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/feedback.html
+%%PORTDOCS%%%%DOCSDIR%%/getting_started.html
+%%PORTDOCS%%%%DOCSDIR%%/hackers_guide.html
+%%PORTDOCS%%%%DOCSDIR%%/help.html
+%%PORTDOCS%%%%DOCSDIR%%/index.html
+%%PORTDOCS%%%%DOCSDIR%%/keeping_up.html
+%%PORTDOCS%%%%DOCSDIR%%/legal.html
+%%PORTDOCS%%%%DOCSDIR%%/logo.png
+%%PORTDOCS%%%%DOCSDIR%%/logo_small.png
+%%PORTDOCS%%%%DOCSDIR%%/mirror0.png
+%%PORTDOCS%%%%DOCSDIR%%/mirrorh.png
+%%PORTDOCS%%%%DOCSDIR%%/mirrorv.png
+%%PORTDOCS%%%%DOCSDIR%%/nook1.png
+%%PORTDOCS%%%%DOCSDIR%%/nook2.png
+%%PORTDOCS%%%%DOCSDIR%%/packagers_guide.html
+%%PORTDOCS%%%%DOCSDIR%%/palette.html
+%%PORTDOCS%%%%3DRENDER%%%%DOCSDIR%%/preview.html
+%%PORTDOCS%%%%DOCSDIR%%/reporting.html
+%%PORTDOCS%%%%DOCSDIR%%/slice1.png
+%%PORTDOCS%%%%DOCSDIR%%/slice2.png
+%%PORTDOCS%%%%DOCSDIR%%/tips.html
+%%PORTDOCS%%%%DOCSDIR%%/trivia.html
+%%PORTDOCS%%%%DOCSDIR%%/trouble.html
+%%PORTDOCS%%%%DOCSDIR%%/users_guide.html
+%%PORTDOCS%%%%DOCSDIR%%/vflat.png
+%%PORTDOCS%%%%DOCSDIR%%/vsprite.png
+%%PORTDOCS%%%%DOCSDIR%%/vtexture.png
+%%PORTDOCS%%%%DOCSDIR%%/wad_specs.html
+%%PORTDOCS%%%%DOCSDIR%%/yadex1.png
+%%PORTDOCS%%%%DOCSDIR%%/ygd.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-05 00:02:31 +0000