Fix build on -CURRENT.

6 files changed, 155 insertions, 11 deletions

diff --git a/games/tinymux/Makefile b/games/tinymux/Makefile
index 3e8bb88..2309c4e 100644
--- a/games/tinymux/Makefile
+++ b/games/tinymux/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tinymux
 PORTVERSION=	1.6p0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	http://www.moosh.net/pub/mush/servers/tinymux/TinyMUX-1.x/
 
@@ -23,18 +23,9 @@ USE_AUTOCONF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 501000
-BROKEN=		"Does not compile"
-.endif
-
 post-extract:
 	@${RM} -f ${WRKSRC}/gdbm.h
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' ${WRKSRC}/udb_ochunk.c
-
 #
 # Distribution does not include an install target.  So here it is.
 do-install:
@@ -67,4 +58,4 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/tinymux/files/patch-src-db.h b/games/tinymux/files/patch-src-db.h
new file mode 100644
index 0000000..5692a9f
--- /dev/null
+++ b/games/tinymux/files/patch-src-db.h
@@ -0,0 +1,20 @@
+--- db.h.orig	Tue Oct 28 00:58:23 2003
++++ db.h	Tue Oct 28 00:58:46 2003
+@@ -16,7 +16,7 @@
+ #define STORE(key, attr, len)	cache_put(key, attr, len)
+ #else
+ #define STORE(key, attr)	cache_put(key, attr)
+-#endif RADIX_COMPRESSION
++#endif /* RADIX_COMPRESSION */
+ #define DELETE(key)		cache_del(key)
+ #define FETCH(key)		cache_get(key)
+ #define SYNC			cache_sync()
+@@ -27,7 +27,7 @@
+ #define FETCH(key)
+ #define SYNC
+ #define CLOSE
+-#endif MEMORY_BASED
++#endif /* MEMORY_BASED */
+ 
+ #include "udb.h"
+ 
diff --git a/games/tinymux/files/patch-src-htab.c b/games/tinymux/files/patch-src-htab.c
new file mode 100644
index 0000000..69a18f0
--- /dev/null
+++ b/games/tinymux/files/patch-src-htab.c
@@ -0,0 +1,9 @@
+--- htab.c.orig	Tue Oct 28 01:03:30 2003
++++ htab.c	Tue Oct 28 01:03:38 2003
+@@ -805,4 +805,4 @@
+ 	return -1;
+ }
+ 
+-#endif STANDALONE
+\ No newline at end of file
++#endif /* STANDALONE */
diff --git a/games/tinymux/files/patch-src-udb_misc.c b/games/tinymux/files/patch-src-udb_misc.c
new file mode 100644
index 0000000..c3332b4
--- /dev/null
+++ b/games/tinymux/files/patch-src-udb_misc.c
@@ -0,0 +1,14 @@
+--- udb_misc.c.orig	Tue Oct 28 01:01:25 2003
++++ udb_misc.c	Tue Oct 28 01:01:47 2003
+@@ -40,9 +40,9 @@
+  * VARARGS 
+  */
+ #ifdef STDC_HEADERS
+-void logf(char *p,...)
++void Logf(char *p,...)
+ #else
+-void logf(va_alist)
++void Logf(va_alist)
+ va_dcl
+ 
+ #endif
diff --git a/games/tinymux/files/patch-src-udb_ocache.c b/games/tinymux/files/patch-src-udb_ocache.c
new file mode 100644
index 0000000..0f5baf6
--- /dev/null
+++ b/games/tinymux/files/patch-src-udb_ocache.c
@@ -0,0 +1,47 @@
+--- udb_ocache.c.orig	Tue Oct 28 01:02:12 2003
++++ udb_ocache.c	Tue Oct 28 01:02:25 2003
+@@ -32,7 +32,7 @@
+ #endif
+ 
+ extern struct Obj *dddb_get();
+-extern void logf();
++extern void Logf();
+ 
+ /*
+  * This is by far the most complex and kinky code in UnterMUD. You should
+@@ -220,7 +220,7 @@
+ 
+ 	sp = sys_c = (CacheLst *) malloc((unsigned)cwidth * sizeof(CacheLst));
+ 	if (sys_c == (CacheLst *) 0) {
+-		logf(ncmsg, (char *)-1, "\n", (char *)0);
++		Logf(ncmsg, (char *)-1, "\n", (char *)0);
+ 		return (-1);
+ 	}
+ 	/*
+@@ -228,7 +228,7 @@
+ 	 */
+ 	cp = (Cache *) malloc(cwidth * cdepth * sizeof(Cache));
+ 	if (cp == (Cache *) 0) {
+-		logf(ncmsg, (char *)-1, "\n", (char *)0);
++		Logf(ncmsg, (char *)-1, "\n", (char *)0);
+ 		return (-1);
+ 	}
+ 	for (x = 0; x < cwidth; x++, sp++) {
+@@ -358,7 +358,7 @@
+ 	 */
+ 	if (nam == (Aname *) 0 || !cache_initted) {
+ #ifdef	CACHE_VERBOSE
+-		logf("cache_get: NULL object name - programmer error\n", (char *)0);
++		Logf("cache_get: NULL object name - programmer error\n", (char *)0);
+ #endif
+ 		return ((Attr *) 0);
+ 	}
+@@ -548,7 +548,7 @@
+ 	 */
+ 	if (obj == (Attr *) 0 || nam == (Aname *) 0 || !cache_initted) {
+ #ifdef	CACHE_VERBOSE
+-		logf("cache_put: NULL object/name - programmer error\n", (char *)0);
++		Logf("cache_put: NULL object/name - programmer error\n", (char *)0);
+ #endif
+ 		return (1);
+ 	}
diff --git a/games/tinymux/files/patch-src-udb_ochunk.c b/games/tinymux/files/patch-src-udb_ochunk.c
new file mode 100644
index 0000000..9f2a2e7
--- /dev/null
+++ b/games/tinymux/files/patch-src-udb_ochunk.c
@@ -0,0 +1,63 @@
+--- udb_ochunk.c.orig	Sun Oct 25 23:58:06 1998
++++ udb_ochunk.c	Tue Oct 28 01:01:14 2003
+@@ -11,7 +11,7 @@
+ #include	"mudconf.h"
+ 
+ #ifdef VMS
+-#include	<malloc.h>
++#include	<stdlib.h>
+ #include        <types.h>
+ #include        <file.h>
+ #include        <unixio.h>
+@@ -19,7 +19,7 @@
+ #else
+ #ifndef NEXT
+ #ifndef MALLOC_IN_STDLIB_H
+-#include	<malloc.h>
++#include	<stdlib.h>
+ #endif
+ #endif /* NEXT */
+ #include	<sys/param.h>
+@@ -75,7 +75,7 @@
+ 
+ 	if ((dbp = gdbm_open(dbfile, block_size, GDBM_WRCREAT, 0600, gdbm_panic)) == (GDBM_FILE) 0) {
+ 		gdbm_error = (char *)gdbm_strerror(gdbm_errno);
+-		logf(copen, dbfile, " ", (char *)-1, "\n", gdbm_error, "\n", (char *)0);
++		Logf(copen, dbfile, " ", (char *)-1, "\n", gdbm_error, "\n", (char *)0);
+ 		return (1);
+ 	}
+ 
+@@ -130,7 +130,7 @@
+ 	
+ 	/* if the file is badly formatted, ret == Obj * 0 */
+ 	if ((ret = objfromFILE(dat.dptr)) == (Obj *) 0) {
+-		logf("db_get: cannot decode ", nam, "\n", (char *)0);
++		Logf("db_get: cannot decode ", nam, "\n", (char *)0);
+ 		free(dat.dptr);
+ 		return NULL;
+ 	}
+@@ -170,13 +170,13 @@
+ 	dat.dsize = nsiz;
+ 
+ 	if (objtoFILE(obj, dat.dptr) != 0) {
+-		logf("db_put: can't save ", nam, " ", (char *)-1, "\n", (char *)0);
++		Logf("db_put: can't save ", nam, " ", (char *)-1, "\n", (char *)0);
+ 		free(dat.dptr);
+ 		return (1);
+ 	}
+ 
+ 	if (gdbm_store(dbp, key, dat, GDBM_REPLACE)) {
+-		logf("db_put: can't gdbm_store ", nam, " ", (char *)-1, "\n", (char *)0);
++		Logf("db_put: can't gdbm_store ", nam, " ", (char *)-1, "\n", (char *)0);
+ 		free(dat.dptr);
+ 		return (1);
+ 	}
+@@ -204,7 +204,7 @@
+ 	
+ 	/* drop key from db */
+ 	if (gdbm_delete(dbp, key)) {
+-		logf("db_del: can't delete key ", nam, "\n", (char *)0);
++		Logf("db_del: can't delete key ", nam, "\n", (char *)0);
+ 		return (1);
+ 	}
+ 	return (0);