- Support CC/CFLAGS prolerly

- Move install path of utility data from lib/ to libdata/
- Fix pkg/PLIST

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

7 files changed, 321 insertions, 15 deletions

diff --git a/net/pmf/Makefile b/net/pmf/Makefile
index 22b706c33d8..9039c79004f 100644
--- a/net/pmf/Makefile
+++ b/net/pmf/Makefile
@@ -1,26 +1,38 @@
-# New ports collection makefile for:    pmf
-# Version required:     1.13.1
-# Date created:         24 Sep 1994
-# Whom:                 adam
+# New ports collection makefile for:	pmf
+# Version required:	1.13.1
+# Date created:		24 Sep 1994
+# Whom:			adam
 #
 # $FreeBSD$
 #
 
-DISTNAME=       pmf-1.13.1
+DISTNAME=	pmf-1.13.1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.lysator.liu.se/pub/lpmud/clients/pmf/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/pmfdir/src
 
-pre-install:
-	@${MKDIR} ${PREFIX}/lib/pmf
-	@find ${WRKSRC}/../system_dir -name '*.orig' -exec ${RM} {} \;
-	@-${MV} ${WRKSRC}/../doc/pmf.doc ${WRKSRC}/../system_dir
-	@tar -C ${WRKSRC}/../system_dir -cf - . \
-		| tar -C ${PREFIX}/lib/pmf -xf -
-	@${CHOWN} -R bin.bin ${PREFIX}/lib/pmf
-	@${CHMOD} -R a-w ${PREFIX}/lib/pmf
+SYSSRC=		${WRKSRC}/../system_dir
+DOCSRC=		${WRKSRC}/../doc
+XMPSRC=		${WRKSRC}/../examples
+
+post-patch:
+	@${SED} -e 's:%%PREFIX%%:${PREFIX}:g' ${FILESDIR}/pmfrc.default.in \
+		> ${WRKSRC}/../system_dir/pmfrc.default
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/pmf ${PREFIX}/bin
+	@${MKDIR} ${PREFIX}/libdata/pmf/helpfiles
+	${INSTALL_DATA} ${SYSSRC}/pmfrc.default ${PREFIX}/libdata/pmf
+	${INSTALL_DATA} ${SYSSRC}/NEWS ${PREFIX}/libdata/pmf
+	${INSTALL_DATA} ${SYSSRC}/helpfiles/.pmfrc ${PREFIX}/libdata/pmf/helpfiles
+	${INSTALL_DATA} ${SYSSRC}/helpfiles/* ${PREFIX}/libdata/pmf/helpfiles
+	@${MKDIR} ${PREFIX}/share/doc/pmf
+	${INSTALL_DATA} ${DOCSRC}/../doc/* ${PREFIX}/share/doc/pmf
+	@${MKDIR} ${PREFIX}/share/examples/pmf
+	${INSTALL_DATA} ${XMPSRC}/.pmfrc ${PREFIX}/share/examples/pmf
+	${INSTALL_DATA} ${XMPSRC}/* ${PREFIX}/share/examples/pmf
 
 .include <bsd.port.mk>
diff --git a/net/pmf/files/patch-ab b/net/pmf/files/patch-ab
new file mode 100644
index 00000000000..a3829884009
--- /dev/null
+++ b/net/pmf/files/patch-ab
@@ -0,0 +1,68 @@
+--- Makefile.orig	Sun May 23 20:54:05 1993
++++ Makefile	Fri Feb 11 04:02:29 2000
+@@ -29,12 +29,13 @@
+ # pmf without GNU readline or without sound.
+ # Remove one (or both) of "-DGNU_READLINE" and "-DSOUND".
+ #
+-OPTIONS = -DGNU_READLINE -DSOUND
++#OPTIONS = -DGNU_READLINE -DSOUND
++OPTIONS = -DGNU_READLINE
+ 
+ # This variable, SOUND_OBJECT, should be changed if you want to
+ # compile pmf without sound: remove this definition of SOUND_OBJECT.
+ #
+-SOUND_OBJECT = sound.o
++#SOUND_OBJECT = sound.o
+ 
+ # This variable, HISTORY_OBJECT, should be changed if you want to
+ # compile pmf without GNU readline: define HISTORY_OBJECT as
+@@ -56,7 +57,7 @@
+ # If you want to use the GNU C compiler,
+ # change the variable CC to "gcc -traditional" instead:
+ #
+-CC = cc
++CC ?= cc
+ # CC = gcc -traditional
+ 
+ ######################################################################
+@@ -65,7 +66,7 @@
+ #	-- the Makefiles in the subdirs have to be changed separately.
+ # Distribution: CFLAGS = -O
+ # Maximum debug: CFLAGS = -g -pg -DDEBUG -pipe
+-CFLAGS = -O
++CFLAGS += -D_ANSI_SOURCE -DSYSTEM_DIR=\"${PREFIX}/libdata/pmf\"
+ 
+ ######################################################################
+ 
+@@ -104,7 +105,8 @@
+ READLINE_LIB = $(READLINE_DIR)/libreadline.a
+ C_PACKAGES_LIB = $(C_PACKAGES_DIR)/libc_packs.a
+ 
+-LIBS = $(READLINE_LIB) $(C_PACKAGES_LIB)
++#LIBS = $(READLINE_LIB) $(C_PACKAGES_LIB)
++LIBS = $(C_PACKAGES_LIB) -lreadline -lcompat
+ 
+ INCLUDEDIRS = -I$(C_PACKAGES_DIR)/safe_malloc \
+ 	-I$(C_PACKAGES_DIR)/generic_list \
+@@ -123,7 +125,7 @@
+ 
+ pmf: $(OBJECTS) $(LIBS)
+ 	rm -f compile_time.c
+-	$(CC) -o pmf $(CFLAGS) $(OBJECTS) $(LIBS) -ltermcap -lresolv
++	$(CC) -o pmf $(CFLAGS) $(OBJECTS) $(LIBS) -ltermcap
+ 	strip pmf
+ 	rm -f compile_time.o
+ 
+@@ -133,10 +135,10 @@
+ ######################################################################
+ 
+ $(READLINE_LIB):
+-	( cd $(READLINE_DIR); make )
++	( cd $(READLINE_DIR); $(MAKE) )
+ 
+ $(C_PACKAGES_LIB):
+-	( cd $(C_PACKAGES_DIR); make )
++	( cd $(C_PACKAGES_DIR); $(MAKE) 'CFLAGS=$(CFLAGS)')
+ 
+ READLINE_FILES = \
+ 	$(READLINE_DIR)/*
diff --git a/net/pmf/files/patch-ac b/net/pmf/files/patch-ac
new file mode 100644
index 00000000000..e0ac006c778
--- /dev/null
+++ b/net/pmf/files/patch-ac
@@ -0,0 +1,42 @@
+--- config.h.orig	Fri Oct 29 18:25:35 1993
++++ config.h	Fri Feb 11 05:31:15 2000
+@@ -35,14 +35,16 @@
+  *  files instead.
+  *  Note that "~" is not expanded in this directory name.
+  */
+-#define SYSTEM_DIR              "/home/diagnostix3/ida/tompa/pmf-1.13.1/pmfdir/system_dir"
++#ifndef SYSTEM_DIR
++#define SYSTEM_DIR              "/usr/local/libdata/pmf"
++#endif
+ 
+ /*  These are the names of some files, usually in the system directory
+  *  SYSTEM_DIR that is #defined above.
+  *  If these names start with a "/" they are considered
+  *  relative to the root directory, otherwise to SYSTEM_DIR.
+  */
+-#define SYSTEM_DEFAULT_INIT_FILE        ".pmfrc.default"
++#define SYSTEM_DEFAULT_INIT_FILE        "pmfrc.default"
+ #define SYSTEM_NEWS_FILE                "NEWS"
+ #define SYSTEM_HELP_DIR                 "helpfiles"
+ #define SYSTEM_SOUND_DIR                "soundfiles"
+@@ -63,7 +65,9 @@
+ #define X_OUTPUT_PROGRAM	"cat"
+ 
+ /* What system? Define one either BSD or SYSV:*/
++#ifndef BSD
+ #define BSD
++#endif
+ /* #define SYSV */
+ 
+ /* What ioctl do we use for the ttys? */
+@@ -71,6 +75,10 @@
+ #  define USE_TIOCGETP
+ #else
+ #  define USE_TCGETA
++#endif
++
++#ifdef BSD
++#define _cnt _r
+ #endif
+ 
+ /*  The prompt to print after doing a builtin command. 0 means no prompt.
diff --git a/net/pmf/files/patch-ad b/net/pmf/files/patch-ad
new file mode 100644
index 00000000000..e40f2721b7a
--- /dev/null
+++ b/net/pmf/files/patch-ad
@@ -0,0 +1,20 @@
+--- main.c.orig	Sun Sep 22 12:13:43 1991
++++ main.c	Fri Feb 11 04:14:00 2000
+@@ -37,7 +37,7 @@
+     extern int stop_printing();
+     extern int continue_printing();
+ 
+-    extern int last_c_pos;
++    extern int _rl_last_c_pos;
+ #endif
+ 
+ /* Longjmp buffer, jump there after error() or CTRL-C */
+@@ -58,7 +58,7 @@
+ 	ldisplay("\n");
+ 	ldisplay("%s", rl_line_buffer);
+ 	rl_redisplay(count, key);
+-	last_c_pos = rl_end;
++	_rl_last_c_pos = rl_end;
+     }
+ #endif
+ 
diff --git a/net/pmf/files/patch-ae b/net/pmf/files/patch-ae
new file mode 100644
index 00000000000..12bb270b2d2
--- /dev/null
+++ b/net/pmf/files/patch-ae
@@ -0,0 +1,11 @@
+--- c_packages/Makefile.orig	Sun Sep 22 12:13:58 1991
++++ c_packages/Makefile	Fri Feb 11 04:14:00 2000
+@@ -8,7 +8,7 @@
+ 	for i in $(PACKAGES) ; \
+ 	do \
+ 		echo Making $$i...; \
+-		( cd $$i; make ) \
++		( cd $$i; $(MAKE) 'CFLAGS=$(CFLAGS)') \
+ 	done
+ 	ln -s */*.o .
+ 	ar rv libc_packs.a *.o
diff --git a/net/pmf/files/pmfrc.default.in b/net/pmf/files/pmfrc.default.in
new file mode 100644
index 00000000000..9e91ed18508
--- /dev/null
+++ b/net/pmf/files/pmfrc.default.in
@@ -0,0 +1,54 @@
+#
+# Default init file for pmf.
+# Thomas Padron-McCarhty, padrone@lysator.liu.se, Sept 22 1991
+# Remember that all blank lines are sent to Mud, which means that you
+# should probably NOT have any blank lines in the init file.
+# Silent mode is on while running the init file.
+#
+#
+# First of all, set up some things:
+#
+/set prompt "pmf %d> "
+/set history 40
+/set lines_to_save 100
+/set cryptkey "Have a Coke and a Smile!"
+/unset substitute_history
+/unset replace_control
+#
+# Some very useful aliases:
+#
+/alias c score
+/alias l look
+/alias g get all
+/alias ec exa corpse
+/alias dc drop corpse
+/alias sb sell bottle
+/alias m missile
+/alias k shock
+/alias f fireball
+/alias gc "get $1 from corpse $2"
+/alias gb "get $1 from bag $2"
+/alias bdb "buy beer $n drink beer"
+/alias h history
+#
+# This alias lets you run from the church to the pub:
+#
+/unalias . "perform $1 >"
+/alias church-to-pub ". s $n . e $n . e $n . n $n . e"
+#
+# Some more aliases:
+#
+/alias /soundon "/source %%PREFIX%%/libdata/pmf/soundfiles/pmf-sparc-sound"
+/alias /soundoff "/unset sound"
+#
+# Avoid printing some of the more annoying messages:
+#
+# /gag "Go player says: "
+# /gag "Harry says: "
+#
+# A simple robot action:
+#
+/action "$1 tells you: $2" "/beep"
+/alias /on /set robot
+/alias /off /unset robot
+/on
diff --git a/net/pmf/pkg-plist b/net/pmf/pkg-plist
index f06f00db899..9bd7be24900 100644
--- a/net/pmf/pkg-plist
+++ b/net/pmf/pkg-plist
@@ -1,2 +1,101 @@
 bin/pmf
-lib/pmf
+libdata/pmf/pmfrc.default
+libdata/pmf/NEWS
+libdata/pmf/helpfiles/!!
+libdata/pmf/helpfiles/!number
+libdata/pmf/helpfiles/!str
+libdata/pmf/helpfiles/!string
+libdata/pmf/helpfiles/+action
+libdata/pmf/helpfiles/+alias
+libdata/pmf/helpfiles/+beep
+libdata/pmf/helpfiles/+cd
+libdata/pmf/helpfiles/+connect
+libdata/pmf/helpfiles/+cryptsay
+libdata/pmf/helpfiles/+crypttell
+libdata/pmf/helpfiles/+debuglog
+libdata/pmf/helpfiles/+disconnect
+libdata/pmf/helpfiles/+dump
+libdata/pmf/helpfiles/+echo
+libdata/pmf/helpfiles/+gag
+libdata/pmf/helpfiles/+getfile
+libdata/pmf/helpfiles/+help
+libdata/pmf/helpfiles/+history
+libdata/pmf/helpfiles/+last
+libdata/pmf/helpfiles/+log
+libdata/pmf/helpfiles/+perform
+libdata/pmf/helpfiles/+putfile
+libdata/pmf/helpfiles/+quit
+libdata/pmf/helpfiles/+quote
+libdata/pmf/helpfiles/+receive
+libdata/pmf/helpfiles/+send
+libdata/pmf/helpfiles/+set
+libdata/pmf/helpfiles/+sound
+libdata/pmf/helpfiles/+source
+libdata/pmf/helpfiles/+status
+libdata/pmf/helpfiles/+system
+libdata/pmf/helpfiles/+unaction
+libdata/pmf/helpfiles/+unactionall
+libdata/pmf/helpfiles/+unalias
+libdata/pmf/helpfiles/+ungag
+libdata/pmf/helpfiles/+unset
+libdata/pmf/helpfiles/+unsound
+libdata/pmf/helpfiles/.pmfrc
+libdata/pmf/helpfiles/242
+libdata/pmf/helpfiles/?
+libdata/pmf/helpfiles/CTRL-C
+libdata/pmf/helpfiles/CTRL-D
+libdata/pmf/helpfiles/CTRL-Z
+libdata/pmf/helpfiles/FRONT242
+libdata/pmf/helpfiles/Padrone
+libdata/pmf/helpfiles/README
+libdata/pmf/helpfiles/achtung
+libdata/pmf/helpfiles/bug
+libdata/pmf/helpfiles/can_gag_fight
+libdata/pmf/helpfiles/cryptkey
+libdata/pmf/helpfiles/debug
+libdata/pmf/helpfiles/documentation
+libdata/pmf/helpfiles/echo
+libdata/pmf/helpfiles/frontcd
+libdata/pmf/helpfiles/frontecho
+libdata/pmf/helpfiles/fronthelp
+libdata/pmf/helpfiles/frontquit
+libdata/pmf/helpfiles/frontset
+libdata/pmf/helpfiles/frontstatus
+libdata/pmf/helpfiles/frontunset
+libdata/pmf/helpfiles/help
+libdata/pmf/helpfiles/history
+libdata/pmf/helpfiles/host
+libdata/pmf/helpfiles/ignoreeof
+libdata/pmf/helpfiles/init
+libdata/pmf/helpfiles/lines_to_save
+libdata/pmf/helpfiles/options
+libdata/pmf/helpfiles/padrone
+libdata/pmf/helpfiles/pmf
+libdata/pmf/helpfiles/port
+libdata/pmf/helpfiles/prompt
+libdata/pmf/helpfiles/quit
+libdata/pmf/helpfiles/replace_control
+libdata/pmf/helpfiles/robot
+libdata/pmf/helpfiles/screen_length
+libdata/pmf/helpfiles/show_receive
+libdata/pmf/helpfiles/slash_commands
+libdata/pmf/helpfiles/sound
+libdata/pmf/helpfiles/source
+libdata/pmf/helpfiles/source-code
+libdata/pmf/helpfiles/status
+libdata/pmf/helpfiles/substitute_history
+libdata/pmf/helpfiles/variables
+libdata/pmf/helpfiles/verbose
+share/doc/pmf/mud-clients.FAQ
+share/doc/pmf/mud-rwho.FAQ
+share/doc/pmf/mud.FAQ
+share/doc/pmf/mudlist.18oct93
+share/doc/pmf/pmf.doc
+share/doc/pmf/resource-usage
+share/examples/pmf/.pmfrc
+share/examples/pmf/pmf-sparc-sound
+share/examples/pmf/sample-robot
+@dirrm share/examples/pmf
+@dirrm share/doc/pmf
+@dirrm libdata/pmf/helpfiles
+@dirrm libdata/pmf