move MASTER_SITES.

honor CFLAGS, PREFIX.
BUILD_DEPENDS -> LIB_DEPENDS on gdbm.

PR:		24546
Submitted by:	KATO Tsuguru <tkato@prontomail.ne.jp>

add missing MAINTAINER.

4 files changed, 68 insertions, 21 deletions

diff --git a/games/tinymux/Makefile b/games/tinymux/Makefile
index c98eac808aab..735aacc18a1e 100644
--- a/games/tinymux/Makefile
+++ b/games/tinymux/Makefile
@@ -1,4 +1,4 @@
-# New ports collection makefile for: TinyMUX
+# New ports collection makefile for:	TinyMUX
 # Date created:		1998/05/28
 # Whom:			cjohnson
 #
@@ -7,14 +7,22 @@
 
 PORTNAME=	tinymux
 PORTVERSION=	1.6p0
+PORTREVISION=	1
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.digex.net/pub/mud/tinymux/
+MASTER_SITES=	http://www.moosh.net/pub/mush/servers/tinymux/TinyMUX-1.x/
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/libgdbm.a:${PORTSDIR}/databases/gdbm
+MAINTAINER=	ports@FreeBSD.org
+
+LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm
 
 WRKSRC=		${WRKDIR}/src
-#GNU_CONFIGURE=	YES
-USE_AUTOCONF=	YES
+
+USE_AUTOCONF=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LIBS="-L${LOCALBASE}/lib"
+
+post-extract:
+	@${RM} -f ${WRKSRC}/gdbm.h
 
 #
 # Distribution does not include an install target.  So here it is.
diff --git a/games/tinymux/files/patch-aa b/games/tinymux/files/patch-aa
index 970c25ba677f..b4fbf87ecc68 100644
--- a/games/tinymux/files/patch-aa
+++ b/games/tinymux/files/patch-aa
@@ -1,11 +1,19 @@
---- configure.in.orig	Thu Nov  5 16:36:22 1998
-+++ configure.in	Sun Mar 26 16:35:37 2000
+--- configure.in.orig	Fri Nov  6 06:36:22 1998
++++ configure.in	Mon Jan 22 23:40:31 2001
 @@ -17,7 +17,7 @@
  else
  	AC_EGREP_HEADER(sys_errlist,errno.h, ,AC_EGREP_HEADER(sys_errlist,stdio.h,,AC_DEFINE(NEED_SYS_ERRLIST_DCL)))
  fi
 -LIBS="-L./gdbm-1.7.3 -lgdbm"
-+LIBS="-L/usr/local/lib -lgdbm"
++AC_CHECK_LIB(gdbm, gdbm_open)
  AC_CHECK_LIB(crypt, main)
  AC_FUNC_STRFTIME
  AC_FUNC_VFORK
+@@ -126,7 +126,6 @@
+ AC_CHECK_LIB(resolv, main)
+ AC_CHECK_LIB(sun, getpwnam)
+ AC_CHECK_LIB(seq, main)
+-AC_CHECK_LIB(intl, main)
+ AC_CHECK_LIB(nsl, main)
+ if test $ac_cv_func_gethostbyaddr = no; then
+ 	AC_CHECK_LIB(inet, main)
diff --git a/games/tinymux/files/patch-ab b/games/tinymux/files/patch-ab
new file mode 100644
index 000000000000..646b42d457d9
--- /dev/null
+++ b/games/tinymux/files/patch-ab
@@ -0,0 +1,31 @@
+--- Makefile.in.orig	Fri Nov  6 11:06:00 1998
++++ Makefile.in	Mon Jan 22 23:27:55 2001
+@@ -8,8 +8,10 @@
+ VPATH = @srcdir@
+ BIN = ../game/bin
+ CC = @CC@
++CFLAGS= @CFLAGS@
+ # CPP = @CPP@	# This is broken in autoconf.  Sigh.
+ CPP = $(CC) -E
++CPPFLAGS = @CPPFLAGS@
+ LIBS = @LIBS@
+ LIBOBJS = @LIBOBJS@
+ 
+@@ -18,7 +20,7 @@
+ # gmon.out)
+ #OPTIM = -O
+ #OPTIM = -g -pg -O
+-OPTIM = -g -O
++#OPTIM = -g -O
+ 
+ # The first set of definitions is for disk-based caching. If you wish to be
+ # memory based, comment the first set and uncomment the second set. Being
+@@ -170,7 +172,7 @@
+ LIB_SRC = 
+ LIB_INC = 
+ DEBUG	= $(OPTIM)
+-ALLCFLAGS = $(CFLAGS) $(DEBUG) $(DEFS) $(COMPRESS_DEFS) $(BASED) $(MALLOC_DEFS) $(CONC_DEFS) $(MOREDEFS) $(RLIM_F)
++ALLCFLAGS = $(CFLAGS) $(CPPFLAGS) $(DEBUG) $(DEFS) $(COMPRESS_DEFS) $(BASED) $(MALLOC_DEFS) $(CONC_DEFS) $(MOREDEFS) $(RLIM_F)
+ 
+ #Auxiliary files
+ A_INST	= README NOTES HIGHLIGHTS CREDITS CHANGES
diff --git a/games/tinymux/pkg-plist b/games/tinymux/pkg-plist
index 664734560d42..bf5e5abdfdb0 100644
--- a/games/tinymux/pkg-plist
+++ b/games/tinymux/pkg-plist
@@ -1,16 +1,16 @@
 games/tinymux/Startmux
 games/tinymux/alias.conf
-games/tinymux/compat.conf
-games/tinymux/mtrace.awk
-games/tinymux/mux.config
-games/tinymux/netmux.conf
 games/tinymux/bin/dbconvert
 games/tinymux/bin/mkindx
 games/tinymux/bin/netmux
 games/tinymux/bin/slave
+games/tinymux/compat.conf
 games/tinymux/data/db_check
 games/tinymux/data/db_load
 games/tinymux/data/db_unload
+games/tinymux/mtrace.awk
+games/tinymux/mux.config
+games/tinymux/netmux.conf
 games/tinymux/text/badsite.txt
 games/tinymux/text/connect.txt
 games/tinymux/text/create_reg.txt
@@ -27,14 +27,14 @@ games/tinymux/text/register.txt
 games/tinymux/text/wizhelp.txt
 games/tinymux/text/wizmotd.txt
 games/tinymux/text/wiznews.txt
-share/doc/tinymux/README
-share/doc/tinymux/README.COMPRESSION
-share/doc/tinymux/README.GUESTS
-share/doc/tinymux/README.MEMORY
-share/doc/tinymux/README.TOOLS
-@dirrm games/tinymux/bin
-@dirrm games/tinymux/data
+%%PORTDOCS%%share/doc/tinymux/README
+%%PORTDOCS%%share/doc/tinymux/README.COMPRESSION
+%%PORTDOCS%%share/doc/tinymux/README.GUESTS
+%%PORTDOCS%%share/doc/tinymux/README.MEMORY
+%%PORTDOCS%%share/doc/tinymux/README.TOOLS
+%%PORTDOCS%%@dirrm share/doc/tinymux
 @dirrm games/tinymux/text
+@dirrm games/tinymux/data
+@dirrm games/tinymux/bin
 @dirrm games/tinymux
-@dirrm games
-@dirrm share/doc/tinymux
+@unexec rmdir %D/games 2>/dev/null || true