- Fix build on -current

- Utilize DATADIR/DOCSDIR

PR:		58128
Submitted by:	Ports Fury

3 files changed, 85 insertions, 79 deletions

diff --git a/games/omega/Makefile b/games/omega/Makefile
index 9ae90f82f9e6..89c2b8ec32e6 100644
--- a/games/omega/Makefile
+++ b/games/omega/Makefile
@@ -21,30 +21,24 @@ MAN6=		omega.6
 PORTDOCS=	buglist.txt docs/compile.all docs/omega.txt docs/readme.1st \
 		docs/readme3 docs/readme4
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/omega ${PREFIX}/bin/omega-game
 	@${CHOWN} root:games ${PREFIX}/bin/omega-game
 	@${CHMOD} 2711 ${PREFIX}/bin/omega-game
 	${INSTALL_MAN} ${WRKSRC}/docs/omega.6 ${PREFIX}/man/man6
-	@${MKDIR} ${PREFIX}/share/omega
-	${INSTALL_DATA} ${WRKSRC}/lib/* ${PREFIX}/share/omega
-	@${RM} ${PREFIX}/share/omega/license.old
-	@${CHMOD} 0460 ${PREFIX}/share/omega/omega.hi
-	@${CHMOD} 0460 ${PREFIX}/share/omega/omega.log
-	${CP} ${PREFIX}/share/omega/omega.hi ${PREFIX}/share/omega/omegahi.bak
-	@${CHMOD} 0460 ${PREFIX}/share/omega/omegahi.bak
-	@${CHOWN} -R root:games ${PREFIX}/share/omega
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/lib/* ${DATADIR}
+	@${RM} ${DATADIR}/license.old
+	@${CHMOD} 0460 ${DATADIR}/omega.hi
+	@${CHMOD} 0460 ${DATADIR}/omega.log
+	${CP} ${DATADIR}/omega.hi ${DATADIR}/omegahi.bak
+	@${CHMOD} 0460 ${DATADIR}/omegahi.bak
+	@${CHOWN} -R root:games ${DATADIR}
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/omega
+	@${MKDIR} ${DOCSDIR}
 .for file in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/omega
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/omega/files/patch-ae b/games/omega/files/patch-ae
index d3195813a630..362d2f13107e 100644
--- a/games/omega/files/patch-ae
+++ b/games/omega/files/patch-ae
@@ -1,6 +1,6 @@
---- genclr.c	Sat Aug  8 16:53:59 1998
-+++ /home/andy/tmp/wrk/genclr.c	Fri May 14 20:28:35 1999
-@@ -281,7 +281,11 @@
+--- genclr.c.orig	Sat Aug  8 21:53:59 1998
++++ genclr.c	Thu Oct 16 20:38:27 2003
+@@ -281,16 +281,20 @@
       */
      fp = emitopen (cfile, argv);
      fprintf (fp, "\
@@ -11,4 +11,16 @@
 +#endif\n\
  #include <stdio.h>\n\
  #include <stdlib.h>\n\
- 
+-
++\n\
+ #include \"%s\"\n\
+-
++\n\
+ void clrgen_init (void)\n\
+ ""{\n\
+     if (%d > COLOR_PAIRS - 1) {\n\
+-	endwin();
++	endwin();\n\
+ 	fputs (\"Too many color pairs!\\n\", stderr);\n\
+ 	exit (1);\n\
+     }\n\
diff --git a/games/omega/pkg-plist b/games/omega/pkg-plist
index 662aa38522e8..4f993f19edd9 100644
--- a/games/omega/pkg-plist
+++ b/games/omega/pkg-plist
@@ -3,63 +3,63 @@
 @mode 4711
 bin/omega-game
 @mode 666
-share/omega/omega.hi
-share/omega/omega.log
+%%DATADIR%%/omega.hi
+%%DATADIR%%/omega.log
 @mode 600
-share/omega/omegahi.bak
+%%DATADIR%%/omegahi.bak
 @mode
-%%PORTDOCS%%share/doc/omega/buglist.txt
-%%PORTDOCS%%share/doc/omega/compile.all
-%%PORTDOCS%%share/doc/omega/omega.txt
-%%PORTDOCS%%share/doc/omega/readme.1st
-%%PORTDOCS%%share/doc/omega/readme3
-%%PORTDOCS%%share/doc/omega/readme4
-share/omega/abyss.dat
-share/omega/abyss.txt
-share/omega/arena.dat
-share/omega/circle.dat
-share/omega/city.dat
-share/omega/country.dat
-share/omega/court.dat
-share/omega/dlair.dat
-share/omega/help1.txt
-share/omega/help10.txt
-share/omega/help11.txt
-share/omega/help12.txt
-share/omega/help13.txt
-share/omega/help2.txt
-share/omega/help3.txt
-share/omega/help4.txt
-share/omega/help5.txt
-share/omega/help6.txt
-share/omega/help7.txt
-share/omega/help8.txt
-share/omega/help9.txt
-share/omega/home1.dat
-share/omega/home2.dat
-share/omega/home3.dat
-share/omega/intro.txt
-share/omega/lgpl.txt
-share/omega/license.txt
-share/omega/maze1.dat
-share/omega/maze2.dat
-share/omega/maze3.dat
-share/omega/maze4.dat
-share/omega/misle.dat
-share/omega/motd.txt
-share/omega/scroll1.txt
-share/omega/scroll2.txt
-share/omega/scroll3.txt
-share/omega/scroll4.txt
-share/omega/speak.dat
-share/omega/temple.dat
-share/omega/thanks.txt
-share/omega/update.txt
-share/omega/village1.dat
-share/omega/village2.dat
-share/omega/village3.dat
-share/omega/village4.dat
-share/omega/village5.dat
-share/omega/village6.dat
-%%PORTDOCS%%@dirrm share/doc/omega
-@dirrm share/omega
+%%PORTDOCS%%%%DOCSDIR%%/buglist.txt
+%%PORTDOCS%%%%DOCSDIR%%/compile.all
+%%PORTDOCS%%%%DOCSDIR%%/omega.txt
+%%PORTDOCS%%%%DOCSDIR%%/readme.1st
+%%PORTDOCS%%%%DOCSDIR%%/readme3
+%%PORTDOCS%%%%DOCSDIR%%/readme4
+%%DATADIR%%/abyss.dat
+%%DATADIR%%/abyss.txt
+%%DATADIR%%/arena.dat
+%%DATADIR%%/circle.dat
+%%DATADIR%%/city.dat
+%%DATADIR%%/country.dat
+%%DATADIR%%/court.dat
+%%DATADIR%%/dlair.dat
+%%DATADIR%%/help1.txt
+%%DATADIR%%/help10.txt
+%%DATADIR%%/help11.txt
+%%DATADIR%%/help12.txt
+%%DATADIR%%/help13.txt
+%%DATADIR%%/help2.txt
+%%DATADIR%%/help3.txt
+%%DATADIR%%/help4.txt
+%%DATADIR%%/help5.txt
+%%DATADIR%%/help6.txt
+%%DATADIR%%/help7.txt
+%%DATADIR%%/help8.txt
+%%DATADIR%%/help9.txt
+%%DATADIR%%/home1.dat
+%%DATADIR%%/home2.dat
+%%DATADIR%%/home3.dat
+%%DATADIR%%/intro.txt
+%%DATADIR%%/lgpl.txt
+%%DATADIR%%/license.txt
+%%DATADIR%%/maze1.dat
+%%DATADIR%%/maze2.dat
+%%DATADIR%%/maze3.dat
+%%DATADIR%%/maze4.dat
+%%DATADIR%%/misle.dat
+%%DATADIR%%/motd.txt
+%%DATADIR%%/scroll1.txt
+%%DATADIR%%/scroll2.txt
+%%DATADIR%%/scroll3.txt
+%%DATADIR%%/scroll4.txt
+%%DATADIR%%/speak.dat
+%%DATADIR%%/temple.dat
+%%DATADIR%%/thanks.txt
+%%DATADIR%%/update.txt
+%%DATADIR%%/village1.dat
+%%DATADIR%%/village2.dat
+%%DATADIR%%/village3.dat
+%%DATADIR%%/village4.dat
+%%DATADIR%%/village5.dat
+%%DATADIR%%/village6.dat
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%