On Wed, Jul 16, 2008 at 08:11:44PM -0401, jared r r spiegel wrote: > On Wed, Jul 16, 2008 at 08:02:59PM -0400, Brad wrote: > > On Wednesday 16 July 2008 19:50:05 jared r r spiegel wrote: > > > the pkg/PLIST in here has a .orig file it slurps up in 'make > > > update-plist', it's not a critical update, but corrects a local-specific > > > path in one of the default macro files. don't know what the preferred way > > > of handling this is (just leave it, make a list of files to copy by hand > > > in > > > the Makefile, make a command in the Makefile to remove that .orig file > > > before do-install, etc). > > > > Just use @comment to exclude the file. > > yeah, whoops; sthen@ reminded me minutes after i sent it. > > i had forgotten the nice part of pkg_create(1) that says: "hey > jackass, this is the right way to do that" > > attached (b/c they're so small) is updated tgz who inc'ls that @comment.
Please try the attached diff against -current. It should fix some minor problems like: * use in-tree pcre * keep .tf files in $PREFIX/share/tinyfuge. You moved them to $PREFIX/share/tinyfuge/lib * add all .tf files, some links were missing One thing where I'm a bit unsure: I added a cast in src/socket.c to silence the warning: socket.c: In function `handle_socket_lines': socket.c:2603: warning: assignment from incompatible pointer type Both LHS and RHS are pointers to a struct. The difference between both is in one 2 members are const while not in the other struct. Is it better to keep the warning or to add the cast as in patches/patch-src_socket_c? Builds fine here on sparc64. Only lightly tested so far. I'll do some more testing during next days. Please test/comment and maybe commit. Regards, Markus (Maintainer)
Index: Makefile =================================================================== RCS file: /cvs/ports/net/tinyfugue/Makefile,v retrieving revision 1.22 diff -u -p -r1.22 Makefile --- Makefile 29 Feb 2008 09:28:45 -0000 1.22 +++ Makefile 28 Jul 2008 17:36:00 -0000 @@ -3,8 +3,8 @@ COMMENT= programmable MUD client, with macro support and more -PKGNAME= tinyfugue-4.0s1p3 -DISTNAME= tf-40s1 +PKGNAME= tinyfugue-5.0b8 +DISTNAME= tf-50b8 CATEGORIES= net games HOMEPAGE= http://tinyfugue.sourceforge.net/ @@ -18,17 +18,10 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= c m termcap z -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tinyfugue/} \ - ftp://ftp.demon.co.uk/pub/games/mud/ +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tinyfugue/} -MASTER_SITES0= http://inphobia.net/openbsd/patches/ -PATCHFILES= tf-40s1-mccp-20020717.patch.gz:0 -PATCH_DIST_STRIP= -p0 - -MAKE_ENV= TFVER="${DISTNAME:S/^tf-//}" \ - CC="${CC}" TFDEV_CCFLAGS="${CFLAGS}" - -MAKE_FILE= ${WRKSRC}/unix/Makefile +CONFIGURE_STYLE= gnu +CONFIGURE_ARGS+= --with-inclibpfx=${LOCALBASE} NO_REGRESS= Yes @@ -39,11 +32,15 @@ SYMLINKS= kb-bash.tf,bind-bash.tf kb-ema spedwalk.tf,speedwalk.tf stack-q.tf,stack_queue.tf \ world-q.tf,worldqueue.tf +pre-configure: + @${SUBST_CMD} ${WRKSRC}/tf-lib/local-eg.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 + ${INSTALL_DATA} ${WRKSRC}/tf-lib/!(*.bak|*.orig) ${PREFIX}/share/tinyfugue + ${INSTALL_DATA} ${WRKSRC}/CHANGES ${PREFIX}/share/tinyfugue .for i in ${SYMLINKS} ln -s ${i:C/,.*//} ${PREFIX}/share/tinyfugue/${i:C/.*,//} .endfor Index: distinfo =================================================================== RCS file: /cvs/ports/net/tinyfugue/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo 5 Apr 2007 16:20:16 -0000 1.4 +++ distinfo 28 Jul 2008 17:36:00 -0000 @@ -1,10 +1,5 @@ -MD5 (tf-40s1-mccp-20020717.patch.gz) = xX+biDyhIMzw4WV9jp2SoA== -MD5 (tf-40s1.tar.gz) = 22+poarAt/GZVn2BxLXIHQ== -RMD160 (tf-40s1-mccp-20020717.patch.gz) = n3GV9TqLNTgQlR2Y7d2wkx13mrw= -RMD160 (tf-40s1.tar.gz) = KFLaozY7sTTynMJdMXfpWZ7KzB8= -SHA1 (tf-40s1-mccp-20020717.patch.gz) = odZ8c9AcTxf7KB/SAwQmthmi8Zw= -SHA1 (tf-40s1.tar.gz) = ie510NhQHdf+VEDIHPmylOXM90Y= -SHA256 (tf-40s1-mccp-20020717.patch.gz) = g7l8GkBXbdDUp3yV6xk1dT7O8D7+mC7wJ2IiD5x28dk= -SHA256 (tf-40s1.tar.gz) = SIcV08df8FwIpRiw4c1FGCRYQvvB5BeMbaUV5BUQG+s= -SIZE (tf-40s1-mccp-20020717.patch.gz) = 7217 -SIZE (tf-40s1.tar.gz) = 349239 +MD5 (tf-50b8.tar.gz) = PplOeRlm0nT2Ow5hq/LvWQ== +RMD160 (tf-50b8.tar.gz) = 3RlShUjEE5oRgq19xBu1YcF2l+8= +SHA1 (tf-50b8.tar.gz) = N7twv7e0TTbChgbGvUXkNVAvtLQ= +SHA256 (tf-50b8.tar.gz) = N1ChFM+Uex49cc7L4ljLgww58xhsNp42jUZi3pxQ2Yk= +SIZE (tf-50b8.tar.gz) = 719553 Index: patches/patch-configure =================================================================== RCS file: patches/patch-configure diff -N patches/patch-configure --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-configure 28 Jul 2008 17:36:00 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- configure.orig Sun Jan 14 20:44:58 2007 ++++ configure Thu Jul 24 18:55:43 2008 +@@ -8730,7 +8730,7 @@ test "${program_suffix}" != "NONE" && EXENAME="${EXENA + if test "${program_transform_name}" != "NONE"; then + EXENAME=`echo "${EXENAME}" | sed "${program_transform_name}"` + fi +-LIBNAME="${EXENAME}-lib" ++LIBNAME="tinyfugue" + + if test "$enable_symlink" = "no"; then + SYMLINK="" Index: patches/patch-configure_in =================================================================== RCS file: patches/patch-configure_in diff -N patches/patch-configure_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-configure_in 28 Jul 2008 17:36:00 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- configure.in.orig Sun Jan 14 00:12:35 2007 ++++ configure.in Thu Jul 24 18:55:53 2008 +@@ -597,7 +597,7 @@ test "${program_suffix}" != "NONE" && EXENAME="${EXENA + if test "${program_transform_name}" != "NONE"; then + EXENAME=`echo "${EXENAME}" | sed "${program_transform_name}"` + fi +-LIBNAME="${EXENAME}-lib" ++LIBNAME="tinyfugue" + + if test "$enable_symlink" = "no"; then + SYMLINK="" Index: patches/patch-src_socket_c =================================================================== RCS file: patches/patch-src_socket_c diff -N patches/patch-src_socket_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_socket_c 28 Jul 2008 17:36:00 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- src/socket.c.orig Sun Jan 14 00:12:39 2007 ++++ src/socket.c Thu Jul 24 19:14:51 2008 +@@ -2600,7 +2600,7 @@ static void handle_socket_lines(void) + socks_with_lines--; + + if (line->attrs & (F_TFPROMPT)) { +- incoming_text = line; ++ incoming_text = (String*)line; + handle_prompt(incoming_text, 0, TRUE); + continue; + } Index: patches/patch-src_util_c =================================================================== RCS file: patches/patch-src_util_c diff -N patches/patch-src_util_c --- patches/patch-src_util_c 29 Feb 2008 09:29:10 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,20 +0,0 @@ -$OpenBSD: patch-src_util_c,v 1.1 2008/02/29 09:29:10 espie Exp $ ---- src/util.c.orig Sat Mar 6 23:43:25 1999 -+++ src/util.c Wed Nov 28 12:48:49 2007 -@@ -1124,6 +1124,7 @@ int tftime(dest, fmt, sec, usec) - CONST char *s; - static char fmtbuf[3] = "%?"; /* static to allow init in K&R C */ - struct tm *local = NULL; -+ time_t lt; - if (!*fmt) fmt = "%c"; - for (s = fmt; *s; s++) { - if (*s != '%') { -@@ -1133,7 +1134,7 @@ int tftime(dest, fmt, sec, usec) - } else if (*s == '.') { - Sprintf(dest, SP_APPEND, "%02ld", (usec + 5000) / 10000); - } else { -- if (!local) local = localtime(&sec); -+ if (!local) { lt = sec; local = localtime(<); } - fmtbuf[1] = *s; - Stringterm(dest, dest->len + 32); - dest->len += strftime(dest->s + dest->len, 32, fmtbuf, local); Index: patches/patch-tf-lib_local-eg_tf =================================================================== RCS file: patches/patch-tf-lib_local-eg_tf diff -N patches/patch-tf-lib_local-eg_tf --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-tf-lib_local-eg_tf 28 Jul 2008 17:36:00 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- tf-lib/local-eg.tf.orig Wed Jun 17 07:38:12 1998 ++++ tf-lib/local-eg.tf Thu Jul 24 19:15:56 2008 +@@ -20,7 +20,7 @@ + ;;; The helpfile location is defined during installation. If you want to + ;;; move it without re-installing, uncomment and edit the line below. + +-; /set TFHELP=/usr/local/lib/tf-lib/help ++; /set TFHELP=${PREFIX}/share/tinyfugue/help + + ;;; Mail location + ;; If your system keeps incoming mail in the recipient's home, instead of Index: patches/patch-unix_Config =================================================================== RCS file: patches/patch-unix_Config diff -N patches/patch-unix_Config --- patches/patch-unix_Config 20 Sep 2000 22:42:12 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,30 +0,0 @@ -$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. - --# TF="/usr/local/bin/tf-${TFVER}" --# LIBDIR="/usr/local/lib/tf-${TFVER}-lib" --# SYMLINK="/usr/local/bin/tf" -+if [ -z "${PREFIX}" ]; then -+ PREFIX="/usr/local" -+fi -+TF="${PREFIX}/bin/tf-${TFVER}" -+LIBDIR="${PREFIX}/share/tinyfugue" -+SYMLINK="${PREFIX}/bin/tf" - - - ### Manual Page. -@@ -44,8 +47,8 @@ - # uses nroff format; set MANTYPE=cat if your man uses pre-formatted - # vt100 "catman" pages. Default is "cat". - --# MANTYPE="nroff" --# MANPAGE="/usr/local/man/man1/tf.1" -+MANTYPE="nroff" -+MANPAGE="${PREFIX}/man/man1/tf.1" - - - ### Flags. Index: patches/patch-unix_README =================================================================== RCS file: patches/patch-unix_README diff -N patches/patch-unix_README --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-unix_README 28 Jul 2008 17:36:00 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- unix/README.orig Sat Jan 13 23:41:11 2007 ++++ unix/README Thu Jul 24 18:47:05 2008 +@@ -96,7 +96,7 @@ TFLIBDIR to the new path before running tf, or run tf + This can be done with a shell script like this: + + #! /bin/sh +- exec /new/location/bin/tf -L"/new/location/lib/tf-lib" "$@" ++ exec /new/location/bin/tf -L"/new/location/share/tinyfugue" "$@" + + The variables TFHELP and TFLIBRARY can also be set in the environment, + but this should not normally be necessary, since their default values are Index: patches/patch-unix_tfconfig =================================================================== RCS file: patches/patch-unix_tfconfig diff -N patches/patch-unix_tfconfig --- patches/patch-unix_tfconfig 20 Sep 2000 22:42:12 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,32 +0,0 @@ -$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 @@ - echo - - echo 'To change these locations type "n" now and edit the unix/Config file.' --while [ -z "$ans" ]; do -- echo 'Continue? (y/n)' -- read ans; -- case "$ans" in -- y|Y) break ;; -- n|N) exit 1 ;; -- *) ans= -- echo 'Please answer "y" or "n".' -- ;; -- esac --done -+# while [ -z "$ans" ]; do -+# echo 'Continue? (y/n)' -+# read ans; -+# case "$ans" in -+# y|Y) break ;; -+# n|N) exit 1 ;; -+# *) ans= -+# echo 'Please answer "y" or "n".' -+# ;; -+# esac -+# done - echo; echo - - echo "#define LIBDIR \"${LIBDIR}\"" >&4 Index: patches/patch-unix_unix.mak =================================================================== RCS file: /cvs/ports/net/tinyfugue/patches/patch-unix_unix.mak,v retrieving revision 1.1 diff -u -p -r1.1 patch-unix_unix.mak --- patches/patch-unix_unix.mak 20 Sep 2000 22:42:12 -0000 1.1 +++ patches/patch-unix_unix.mak 28 Jul 2008 17:36:00 -0000 @@ -1,19 +1,11 @@ $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 - +--- unix/unix.mak.orig Sun Jan 14 00:12:39 2007 ++++ unix/unix.mak Wed Jul 23 18:29:25 2008 +@@ -46,7 +46,6 @@ all files: _all + @echo + @echo '#####################################################' + @echo '## TinyFugue build successful.' +- @echo '## Use "$(MAKE) install" to install:' + @echo '## tf binary: $(TF)' + @echo '## library: $(TF_LIBDIR)' + # @echo '## manpage: $(MANPAGE)' Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/net/tinyfugue/pkg/PLIST,v retrieving revision 1.8 diff -u -p -r1.8 PLIST --- pkg/PLIST 15 Sep 2004 18:17:46 -0000 1.8 +++ pkg/PLIST 28 Jul 2008 17:36:00 -0000 @@ -1,8 +1,11 @@ @comment $OpenBSD: PLIST,v 1.8 2004/09/15 18:17:46 espie Exp $ -bin/tf [EMAIL PROTECTED] bin/tf @man man/man1/tf.1 share/tinyfugue/ +share/tinyfugue/CHANGES share/tinyfugue/README +share/tinyfugue/activity_status.tf +share/tinyfugue/activity_status2.tf share/tinyfugue/alias.tf share/tinyfugue/at.tf share/tinyfugue/bind-bash.tf @@ -11,6 +14,7 @@ share/tinyfugue/changes.tf share/tinyfugue/color.tf share/tinyfugue/complete.tf share/tinyfugue/completion.tf +share/tinyfugue/cylon.tf share/tinyfugue/examples.old share/tinyfugue/factoral.tf share/tinyfugue/factorial.tf @@ -21,7 +25,9 @@ share/tinyfugue/grep.tf share/tinyfugue/hanoi.tf share/tinyfugue/kb-bash.tf share/tinyfugue/kb-emacs.tf +share/tinyfugue/kb-old.tf share/tinyfugue/kb-os2.tf +share/tinyfugue/kb_badterm.tf share/tinyfugue/kbbind.tf share/tinyfugue/kbfunc.tf share/tinyfugue/kbregion.tf @@ -36,6 +42,7 @@ share/tinyfugue/psh.tf share/tinyfugue/quoter.tf share/tinyfugue/relog.tf share/tinyfugue/rwho.tf +share/tinyfugue/savehist.tf share/tinyfugue/self.tf share/tinyfugue/space_page.tf share/tinyfugue/spc-page.tf @@ -45,10 +52,15 @@ share/tinyfugue/spell.tf share/tinyfugue/stack-q.tf share/tinyfugue/stack_queue.tf share/tinyfugue/stdlib.tf +share/tinyfugue/teraterm.keyboard.cnf +share/tinyfugue/testcolor.tf +share/tinyfugue/textencode.tf share/tinyfugue/textutil.tf share/tinyfugue/tf-help share/tinyfugue/tf-help.idx +share/tinyfugue/tf.gdb share/tinyfugue/tfrc +share/tinyfugue/tfstatus.tf share/tinyfugue/tick.tf share/tinyfugue/tintin.tf share/tinyfugue/tools.tf
