From caaa2f96da4877f231c3dc42b1ce46a90f0600f1 Mon Sep 17 00:00:00 2001 From: avsm Date: Wed, 20 Sep 2000 22:42:11 +0000 Subject: [PATCH] - this port now FAKEs - add HOMEPAGE, remove LICENSE_TYPE - add manual do-install - clarify MAKE_ENV - rename patches to reflect filename - install macros go into share/tinyfugue instead of somewhere in lib/ thx brad@ for review --- net/tinyfugue/Makefile | 39 ++++--- .../patches/{patch-ab => patch-unix_Config} | 16 +-- .../patches/{patch-ac => patch-unix_tfconfig} | 1 + net/tinyfugue/patches/patch-unix_unix.mak | 19 ++++ net/tinyfugue/pkg/DESCR | 5 +- net/tinyfugue/pkg/PLIST | 102 ++++++++---------- 6 files changed, 91 insertions(+), 91 deletions(-) rename net/tinyfugue/patches/{patch-ab => patch-unix_Config} (72%) rename net/tinyfugue/patches/{patch-ac => patch-unix_tfconfig} (91%) create mode 100644 net/tinyfugue/patches/patch-unix_unix.mak diff --git a/net/tinyfugue/Makefile b/net/tinyfugue/Makefile index f8c2c4bc47e..11306066590 100644 --- a/net/tinyfugue/Makefile +++ b/net/tinyfugue/Makefile @@ -1,33 +1,32 @@ -# New ports collection makefile for: tinyfugue -# Version required: 4.0s1 -# Date created: Thu Jul 16 10:23:11 PDT 1998 -# Whom: downsj@openbsd.org -# -# From FreeBSD: -# Date created: 4 January 1997 -# Whom: mike@binghamton.edu -# -# $OpenBSD: Makefile,v 1.10 2000/04/09 17:37:35 espie Exp $ +# $OpenBSD: Makefile,v 1.11 2000/09/20 22:42:11 avsm Exp $ # $FreeBSD: Makefile,v 1.16 1999/02/16 03:06:21 jseger Exp $ -# DISTNAME= tf-40s1 -PKGNAME= tf-4.0s1 +PKGNAME= tinyfugue-4.0s1 CATEGORIES= net games -NEED_VERSION= 1.210 -FAKE=No +NEED_VERSION= 1.333 MASTER_SITES= ftp://tf.tcp.com/pub/tinyfugue/ \ ftp://ftp.demon.co.uk/pub/games/mud/ +HOMEPAGE= http://tf.tcp.com/~hawkeye/tf/ + MAINTAINER= ports@openbsd.org -LICENSE_TYPE= GPL -PERMIT_PACKAGE_CDROM= YES -PERMIT_PACKAGE_FTP= YES -PERMIT_DISTFILES_CDROM= YES -PERMIT_DISTFILES_FTP= YES +# GPL +PERMIT_PACKAGE_CDROM= Yes +PERMIT_PACKAGE_FTP= Yes +PERMIT_DISTFILES_CDROM= Yes +PERMIT_DISTFILES_FTP= Yes + +MAKE_ENV= TFVER="${DISTNAME:S/^tf-//}" \ + CC="${CC}" TFDEV_CCFLAGS="${CFLAGS}" MAKE_FILE= ${WRKSRC}/unix/Makefile -MAKE_ENV= TFVER=${DISTNAME:S/^tf-//} + +do-install: + ${INSTALL_DATA_DIR} ${PREFIX}/share/tinyfugue + ${INSTALL_PROGRAM} ${WRKBUILD}/src/tf ${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/src/tf.1.nroffman ${PREFIX}/man/man1/tf.1 + ${INSTALL_DATA} ${WRKSRC}/tf-lib/* ${PREFIX}/share/tinyfugue .include diff --git a/net/tinyfugue/patches/patch-ab b/net/tinyfugue/patches/patch-unix_Config similarity index 72% rename from net/tinyfugue/patches/patch-ab rename to net/tinyfugue/patches/patch-unix_Config index 49cb173796f..6167a318852 100644 --- a/net/tinyfugue/patches/patch-ab +++ b/net/tinyfugue/patches/patch-unix_Config @@ -1,5 +1,6 @@ ---- unix/Config.orig Mon Nov 16 16:43:32 1998 -+++ unix/Config Thu Jan 14 04:56:10 1999 +$OpenBSD: patch-unix_Config,v 1.1 2000/09/20 22:42:12 avsm Exp $ +--- unix/Config.orig Sat Mar 6 17:43:28 1999 ++++ unix/Config Wed Sep 20 12:05:16 2000 @@ -33,9 +33,12 @@ # even if an old version is currently in use. You can remove # the old version manually later when it is no longer in use. @@ -11,7 +12,7 @@ + PREFIX="/usr/local" +fi +TF="${PREFIX}/bin/tf-${TFVER}" -+LIBDIR="${PREFIX}/lib/tf-${TFVER}-lib" ++LIBDIR="${PREFIX}/share/tinyfugue" +SYMLINK="${PREFIX}/bin/tf" @@ -27,12 +28,3 @@ ### Flags. -@@ -110,7 +113,7 @@ - # by removing the leading "#". - - # CC=cc --# CCFLAGS="-g" -+CCFLAGS=${CFLAGS} - - - ### Stripping. diff --git a/net/tinyfugue/patches/patch-ac b/net/tinyfugue/patches/patch-unix_tfconfig similarity index 91% rename from net/tinyfugue/patches/patch-ac rename to net/tinyfugue/patches/patch-unix_tfconfig index 45945169ba6..bb494be2566 100644 --- a/net/tinyfugue/patches/patch-ac +++ b/net/tinyfugue/patches/patch-unix_tfconfig @@ -1,3 +1,4 @@ +$OpenBSD: patch-unix_tfconfig,v 1.1 2000/09/20 22:42:12 avsm Exp $ --- unix/tfconfig.orig Fri Apr 4 11:51:58 1997 +++ unix/tfconfig Mon Jun 16 18:00:45 1997 @@ -211,17 +211,17 @@ diff --git a/net/tinyfugue/patches/patch-unix_unix.mak b/net/tinyfugue/patches/patch-unix_unix.mak new file mode 100644 index 00000000000..9613fa141a2 --- /dev/null +++ b/net/tinyfugue/patches/patch-unix_unix.mak @@ -0,0 +1,19 @@ +$OpenBSD: patch-unix_unix.mak,v 1.1 2000/09/20 22:42:12 avsm Exp $ +--- unix/unix.mak.orig Wed Sep 20 18:04:05 2000 ++++ unix/unix.mak Wed Sep 20 18:04:53 2000 +@@ -22,7 +22,6 @@ + install: _failmsg _all $(TF) LIBRARY $(MANPAGE) $(SYMLINK) + @echo '#####################################################' > exitmsg + @echo '## TinyFugue installation successful.' >> exitmsg +- @echo "## You can safely delete everything in `cd ..; pwd`". >> exitmsg + @DIR=`echo $(TF) | sed 's;/[^/]*$$;;'`; \ + echo ":$(PATH):" | egrep ":$${DIR}:" >/dev/null 2>&1 || { \ + echo ; \ +@@ -35,7 +34,6 @@ + all files: _all + @echo '#####################################################' > exitmsg + @echo '## TinyFugue build successful.' >> exitmsg +- @echo '## Use "unixmake install" to install the files.' >> exitmsg + + _all: tf$(X) ../tf-lib/tf-help.idx + diff --git a/net/tinyfugue/pkg/DESCR b/net/tinyfugue/pkg/DESCR index 426de3404a6..344b5402f45 100644 --- a/net/tinyfugue/pkg/DESCR +++ b/net/tinyfugue/pkg/DESCR @@ -1,3 +1,4 @@ TinyFugue is a powerful, programmable MUD client with macro support -and multi-worlding support and much more. See -http://tf.tcp.com/~hawkeye/tf/ for more information on TinyFugue. +and multi-worlding support and much more. + +WWW: ${HOMEPAGE} diff --git a/net/tinyfugue/pkg/PLIST b/net/tinyfugue/pkg/PLIST index b1ac198c38f..a743aa08b38 100644 --- a/net/tinyfugue/pkg/PLIST +++ b/net/tinyfugue/pkg/PLIST @@ -1,59 +1,47 @@ +@comment $OpenBSD: PLIST,v 1.4 2000/09/20 22:42:12 avsm Exp $ bin/tf -bin/tf-40s1 -lib/tf-40s1-lib/CHANGES -lib/tf-40s1-lib/README -lib/tf-40s1-lib/alias.tf -lib/tf-40s1-lib/at.tf -lib/tf-40s1-lib/bind-bash.tf -lib/tf-40s1-lib/bind-emacs.tf -lib/tf-40s1-lib/changes.tf -lib/tf-40s1-lib/color.tf -lib/tf-40s1-lib/complete.tf -lib/tf-40s1-lib/completion.tf -lib/tf-40s1-lib/examples.old -lib/tf-40s1-lib/factoral.tf -lib/tf-40s1-lib/factorial.tf -lib/tf-40s1-lib/file-xfer.tf -lib/tf-40s1-lib/filexfer.tf -lib/tf-40s1-lib/finger.tf -lib/tf-40s1-lib/grep.tf -lib/tf-40s1-lib/hanoi.tf -lib/tf-40s1-lib/kb-bash.tf -lib/tf-40s1-lib/kb-emacs.tf -lib/tf-40s1-lib/kb-os2.tf -lib/tf-40s1-lib/kbbind.tf -lib/tf-40s1-lib/kbfunc.tf -lib/tf-40s1-lib/kbregion.tf -lib/tf-40s1-lib/kbstack.tf -lib/tf-40s1-lib/lisp.tf -lib/tf-40s1-lib/local-eg.tf -lib/tf-40s1-lib/local.tf.sample -lib/tf-40s1-lib/map.tf -lib/tf-40s1-lib/pcmd.tf -lib/tf-40s1-lib/pref-shell.tf -lib/tf-40s1-lib/psh.tf -lib/tf-40s1-lib/quoter.tf -lib/tf-40s1-lib/relog.tf -lib/tf-40s1-lib/rwho.tf -lib/tf-40s1-lib/self.tf -lib/tf-40s1-lib/space_page.tf -lib/tf-40s1-lib/spc-page.tf -lib/tf-40s1-lib/spedwalk.tf -lib/tf-40s1-lib/speedwalk.tf -lib/tf-40s1-lib/spell.tf -lib/tf-40s1-lib/stack-q.tf -lib/tf-40s1-lib/stack_queue.tf -lib/tf-40s1-lib/stdlib.tf -lib/tf-40s1-lib/textutil.tf -lib/tf-40s1-lib/tf-help -lib/tf-40s1-lib/tf-help.idx -lib/tf-40s1-lib/tfrc -lib/tf-40s1-lib/tick.tf -lib/tf-40s1-lib/tintin.tf -lib/tf-40s1-lib/tools.tf -lib/tf-40s1-lib/tr.tf -lib/tf-40s1-lib/watch.tf -lib/tf-40s1-lib/world-q.tf -lib/tf-40s1-lib/worldqueue.tf man/man1/tf.1 -@dirrm lib/tf-40s1-lib +share/tinyfugue/README +share/tinyfugue/alias.tf +share/tinyfugue/at.tf +share/tinyfugue/changes.tf +share/tinyfugue/color.tf +share/tinyfugue/complete.tf +share/tinyfugue/examples.old +share/tinyfugue/factoral.tf +share/tinyfugue/filexfer.tf +share/tinyfugue/finger.tf +share/tinyfugue/grep.tf +share/tinyfugue/hanoi.tf +share/tinyfugue/kb-bash.tf +share/tinyfugue/kb-emacs.tf +share/tinyfugue/kb-os2.tf +share/tinyfugue/kbbind.tf +share/tinyfugue/kbfunc.tf +share/tinyfugue/kbregion.tf +share/tinyfugue/kbstack.tf +share/tinyfugue/lisp.tf +share/tinyfugue/local-eg.tf +share/tinyfugue/map.tf +share/tinyfugue/pcmd.tf +share/tinyfugue/psh.tf +share/tinyfugue/quoter.tf +share/tinyfugue/relog.tf +share/tinyfugue/rwho.tf +share/tinyfugue/self.tf +share/tinyfugue/spc-page.tf +share/tinyfugue/spedwalk.tf +share/tinyfugue/spell.tf +share/tinyfugue/stack-q.tf +share/tinyfugue/stdlib.tf +share/tinyfugue/textutil.tf +share/tinyfugue/tf-help +share/tinyfugue/tf-help.idx +share/tinyfugue/tfrc +share/tinyfugue/tick.tf +share/tinyfugue/tintin.tf +share/tinyfugue/tools.tf +share/tinyfugue/tr.tf +share/tinyfugue/watch.tf +share/tinyfugue/world-q.tf +@dirrm share/tinyfugue