Date: Fri, 25 Aug 2000 05:19:43 -0700 (PDT) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/20840: Update port: net/pmf (fix ports/20756) Message-ID: <20000825121943.D077037B43E@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 20840
>Category: ports
>Synopsis: Update port: net/pmf (fix ports/20756)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Aug 25 05:20:04 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Support NOPORTDOCS
- Change location of data files from libdata/ to share/
This PR supersedes ports/20756.
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/net/pmf/Makefile net/pmf/Makefile
--- /usr/ports/net/pmf/Makefile Mon Apr 10 20:58:11 2000
+++ net/pmf/Makefile Fri Aug 25 19:48:26 2000
@@ -20,19 +20,22 @@
post-patch:
@${SED} -e 's:%%PREFIX%%:${PREFIX}:g' ${FILESDIR}/pmfrc.default.in \
- > ${WRKSRC}/../system_dir/pmfrc.default
+ > ${SYSSRC}/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/pmf
+ ${INSTALL_DATA} ${SYSSRC}/NEWS ${PREFIX}/share/pmf
+ ${INSTALL_DATA} ${SYSSRC}/pmfrc.default ${PREFIX}/share/pmf
+ @${MKDIR} ${PREFIX}/share/pmf/helpfiles
+ ${INSTALL_DATA} ${SYSSRC}/helpfiles/.pmfrc ${PREFIX}/share/pmf/helpfiles
+ ${INSTALL_DATA} ${SYSSRC}/helpfiles/* ${PREFIX}/share/pmf/helpfiles
@${MKDIR} ${PREFIX}/share/examples/pmf
- ${INSTALL_DATA} ${XMPSRC}/.pmfrc ${PREFIX}/share/examples/pmf
+ ${INSTALL_DATA} ${XMPSRC}/.pmfrc ${PREFIX}/share/examples/pmf/dot.pmfrc
${INSTALL_DATA} ${XMPSRC}/* ${PREFIX}/share/examples/pmf
+.if !defined(NOPORTDOCS)
+ @${MKDIR} ${PREFIX}/share/doc/pmf
+ ${INSTALL_DATA} ${DOCSRC}/* ${PREFIX}/share/doc/pmf
+.endif
.include <bsd.port.mk>
diff -urN /usr/ports/net/pmf/files/pmfrc.default.in net/pmf/files/pmfrc.default.in
--- /usr/ports/net/pmf/files/pmfrc.default.in Mon Feb 14 01:02:48 2000
+++ net/pmf/files/pmfrc.default.in Tue Aug 15 09:32:21 2000
@@ -38,7 +38,7 @@
#
# Some more aliases:
#
-/alias /soundon "/source %%PREFIX%%/libdata/pmf/soundfiles/pmf-sparc-sound"
+/alias /soundon "/source %%PREFIX%%/share/pmf/soundfiles/pmf-sparc-sound"
/alias /soundoff "/unset sound"
#
# Avoid printing some of the more annoying messages:
diff -urN /usr/ports/net/pmf/patches/patch-ab net/pmf/patches/patch-ab
--- /usr/ports/net/pmf/patches/patch-ab Mon Feb 14 01:02:48 2000
+++ net/pmf/patches/patch-ab Tue Aug 15 09:32:21 2000
@@ -30,7 +30,7 @@
# Distribution: CFLAGS = -O
# Maximum debug: CFLAGS = -g -pg -DDEBUG -pipe
-CFLAGS = -O
-+CFLAGS += -D_ANSI_SOURCE -DSYSTEM_DIR=\"${PREFIX}/libdata/pmf\"
++CFLAGS += -D_ANSI_SOURCE -DSYSTEM_DIR=\"${PREFIX}/share/pmf\"
######################################################################
diff -urN /usr/ports/net/pmf/patches/patch-ac net/pmf/patches/patch-ac
--- /usr/ports/net/pmf/patches/patch-ac Mon Feb 14 01:02:48 2000
+++ net/pmf/patches/patch-ac Tue Aug 15 09:32:21 2000
@@ -1,12 +1,11 @@
--- config.h.orig Fri Oct 29 18:25:35 1993
-+++ config.h Fri Feb 11 05:31:15 2000
++++ config.h Tue Aug 15 09:04:26 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"
+ #define SYSTEM_DIR "/home/diagnostix3/ida/tompa/pmf-1.13.1/pmfdir/system_dir"
+#endif
/* These are the names of some files, usually in the system directory
diff -urN /usr/ports/net/pmf/pkg/PLIST net/pmf/pkg/PLIST
--- /usr/ports/net/pmf/pkg/PLIST Mon Feb 14 01:02:49 2000
+++ net/pmf/pkg/PLIST Tue Aug 15 09:32:21 2000
@@ -1,101 +1,101 @@
bin/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-rwho.FAQ
share/doc/pmf/mud.FAQ
-share/doc/pmf/mudlist.18oct93
+share/doc/pmf/mudlist.18oct93
share/doc/pmf/pmf.doc
share/doc/pmf/resource-usage
-share/examples/pmf/.pmfrc
+share/examples/pmf/dot.pmfrc
share/examples/pmf/pmf-sparc-sound
share/examples/pmf/sample-robot
+share/pmf/NEWS
+share/pmf/pmfrc.default
+share/pmf/helpfiles/!!
+share/pmf/helpfiles/!number
+share/pmf/helpfiles/!str
+share/pmf/helpfiles/!string
+share/pmf/helpfiles/+action
+share/pmf/helpfiles/+alias
+share/pmf/helpfiles/+beep
+share/pmf/helpfiles/+cd
+share/pmf/helpfiles/+connect
+share/pmf/helpfiles/+cryptsay
+share/pmf/helpfiles/+crypttell
+share/pmf/helpfiles/+debuglog
+share/pmf/helpfiles/+disconnect
+share/pmf/helpfiles/+dump
+share/pmf/helpfiles/+echo
+share/pmf/helpfiles/+gag
+share/pmf/helpfiles/+getfile
+share/pmf/helpfiles/+help
+share/pmf/helpfiles/+history
+share/pmf/helpfiles/+last
+share/pmf/helpfiles/+log
+share/pmf/helpfiles/+perform
+share/pmf/helpfiles/+putfile
+share/pmf/helpfiles/+quit
+share/pmf/helpfiles/+quote
+share/pmf/helpfiles/+receive
+share/pmf/helpfiles/+send
+share/pmf/helpfiles/+set
+share/pmf/helpfiles/+sound
+share/pmf/helpfiles/+source
+share/pmf/helpfiles/+status
+share/pmf/helpfiles/+system
+share/pmf/helpfiles/+unaction
+share/pmf/helpfiles/+unactionall
+share/pmf/helpfiles/+unalias
+share/pmf/helpfiles/+ungag
+share/pmf/helpfiles/+unset
+share/pmf/helpfiles/+unsound
+share/pmf/helpfiles/.pmfrc
+share/pmf/helpfiles/242
+share/pmf/helpfiles/?
+share/pmf/helpfiles/CTRL-C
+share/pmf/helpfiles/CTRL-D
+share/pmf/helpfiles/CTRL-Z
+share/pmf/helpfiles/FRONT242
+share/pmf/helpfiles/Padrone
+share/pmf/helpfiles/README
+share/pmf/helpfiles/achtung
+share/pmf/helpfiles/bug
+share/pmf/helpfiles/can_gag_fight
+share/pmf/helpfiles/cryptkey
+share/pmf/helpfiles/debug
+share/pmf/helpfiles/documentation
+share/pmf/helpfiles/echo
+share/pmf/helpfiles/frontcd
+share/pmf/helpfiles/frontecho
+share/pmf/helpfiles/fronthelp
+share/pmf/helpfiles/frontquit
+share/pmf/helpfiles/frontset
+share/pmf/helpfiles/frontstatus
+share/pmf/helpfiles/frontunset
+share/pmf/helpfiles/help
+share/pmf/helpfiles/history
+share/pmf/helpfiles/host
+share/pmf/helpfiles/ignoreeof
+share/pmf/helpfiles/init
+share/pmf/helpfiles/lines_to_save
+share/pmf/helpfiles/options
+share/pmf/helpfiles/padrone
+share/pmf/helpfiles/pmf
+share/pmf/helpfiles/port
+share/pmf/helpfiles/prompt
+share/pmf/helpfiles/quit
+share/pmf/helpfiles/replace_control
+share/pmf/helpfiles/robot
+share/pmf/helpfiles/screen_length
+share/pmf/helpfiles/show_receive
+share/pmf/helpfiles/slash_commands
+share/pmf/helpfiles/sound
+share/pmf/helpfiles/source
+share/pmf/helpfiles/source-code
+share/pmf/helpfiles/status
+share/pmf/helpfiles/substitute_history
+share/pmf/helpfiles/variables
+share/pmf/helpfiles/verbose
+@dirrm share/pmf/helpfiles
+@dirrm share/pmf
@dirrm share/examples/pmf
@dirrm share/doc/pmf
-@dirrm libdata/pmf/helpfiles
-@dirrm libdata/pmf
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000825121943.D077037B43E>