Date: Wed, 2 Jul 1997 19:54:34 -0400 (EDT) From: Timothy.Michael.Vanderhoek.the.First@x22 To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/4017: plor port is out of date!! Message-ID: <199707022354.TAA05476@x22> Resent-Message-ID: <199707030000.RAA02245@hub.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 4017 >Category: ports >Synopsis: Someone has to upgrade the plor port! >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Jul 2 17:00:02 PDT 1997 >Last-Modified: >Originator: Tim Vanderhoek >Organization: The league of those who lost their porn when they wiped their hdd >Release: FreeBSD 2.2.2-RELEASE i386 >Environment: This is FreeBSD-2.2.2. I've checked both the 2.1.7, 2.2.2, and -current versions of FreeBSD, but none of them have an up-to-date version of plor. >Description: Plor is a newsreader for SOUP and QWK packets. >How-To-Repeat: pkg_add ftp://ftp.freebsd.org/pub/FreeBSD/packages-2.2.2/All/plor-0.3.1.tgz returns Error: FTP Unable to get ftp://ftp.freebsd.org/pub/FreeBSD/packages-2.2.2/All/pl or-0.3.1.tgz: File unavailable (e.g., file not found, no access) Unable to fetch `ftp://ftp.freebsd.org/pub/FreeBSD/packages-2.2.2/All/plor-0.3.1 .tgz' by URL. >Fix: In addition to the following patch, you'll have to delete files/porting.notes, and manually add patches/patch-ad. The file, patches/patch-ad follows. After the file patch-ad follows a uni-diff that patches the rest of the port. diff -ur plor-0.3.1/video.c plor-mod/video.c --- plor-0.3.1/video.c Sat Mar 15 07:15:40 1997 +++ video.c Wed Jul 2 15:55:21 1997 @@ -8,7 +8,11 @@ * see file COPYING for more information on copyright policy */ -#ifdef _HAVE_PARAM_H +#ifdef HAVE_CONFIG_H +#include "config.h" +#endif + +#ifdef HAVE_SYS_PARAM_H #include <sys/param.h> #endif #include <stdio.h> And, a uni-diff fixing the rest of the port... diff -ur plor-old/Makefile plor/Makefile --- plor-old/Makefile Fri Jan 24 06:14:45 1997 +++ plor/Makefile Wed Jul 2 19:29:54 1997 @@ -1,37 +1,36 @@ # New ports collection makefile for: plor -# Version Required: 0.1 alpha +# Version Required: 0.3.0 # Date Created: 30 Dec 1996 # Whom: Tim Vanderhoek <ac199@freenet.hamilton.on.ca> # # $Id: Makefile,v 1.2 1997/01/24 10:28:05 asami Exp $ # -DISTNAME= plor -PKGNAME= plor-0.1 +DISTNAME= plor-0.3.1 CATEGORIES= news -# supposedly the primary site is sunsite, but the version there is -# out-of-date, so... sunsite.unc.edu /pub/Linux/system/BBS/mail/ if you -# want to try again... -MASTER_SITES= ftp://ftp.dei.unipd.it/pub/pluto/developers/ -EXTRACT_SUFX= .tgz +MASTER_SITES= ftp://ftp.psy.unipd.it/pub/pluto/developers +MASTER_SITES= ftp://ftp.unipd.it/pub/Linux/pluto/developers +MASTER_SITES= ftp://ftp.linux.it/pub/Pluto/developers -MAINTAINER= ac199@freenet.hamilton.on.ca +MAINTAINER= ac199@hwcn.org + +RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip + +GNU_CONFIGURE= yes MAN1= plor.1 -DOCFILES= BUGS HISTORY PER_ZENO TODO plor-1.html plor-2.html \ +DOCFILES= ../AUTHORS ../NEWS TODO plor-1.html plor-2.html \ plor.html plor.txt -do-install: +post-install: .if !defined{NOPORTDOCS} @${MKDIR} ${PREFIX}/share/doc/plor - (for f in ${DOCFILES}; do \ - ${INSTALL_DATA} ${WRKSRC}/docs/$$f ${PREFIX}/share/doc/plor; \ - done) - ${INSTALL_DATA} ${FILESDIR}/porting.notes ${PREFIX}/share/doc/plor +.for f in ${DOCFILES} + ${INSTALL_DATA} ${WRKSRC}/docs/${f} ${PREFIX}/share/doc/plor +.endfor .endif ${INSTALL_MAN} ${FILESDIR}/plor.1 ${PREFIX}/man/man1/plor.1 - perl -pi -e '$$a = '\''${PREFIX}/doc/plor/'\''; $$a =~ s/([^\w\/])/\\$$1/g; s/FUNKYTOKENHERE/$$a/' ${PREFIX}/man/man1/plor.1 - ${INSTALL_PROGRAM} ${WRKSRC}/plor ${PREFIX}/bin + perl -pi -e '$$a = '\''${PREFIX}/share/doc/plor/'\''; $$a =~ s/([^\w\/])/\\$$1/g; s/FUNKYTOKENHERE/$$a/' ${PREFIX}/man/man1/plor.1 .include <bsd.port.mk> diff -ur plor-old/files/md5 plor/files/md5 --- plor-old/files/md5 Fri Jan 17 09:32:42 1997 +++ plor/files/md5 Wed Jul 2 19:14:21 1997 @@ -1 +1 @@ -MD5 (plor.tgz) = 2be4f7717f4a5e51c67f80d871ad6dc9 +MD5 (plor-0.3.1.tar.gz) = 40ad554318ebc47c13bd866108dc4f2d Only in plor-old/files: porting.notes diff -ur plor-old/patches/patch-aa plor/patches/patch-aa --- plor-old/patches/patch-aa Fri Jan 17 09:32:43 1997 +++ plor/patches/patch-aa Wed Jul 2 18:55:11 1997 @@ -1,45 +1,18 @@ ---- Makefile.orig Thu Oct 31 06:36:14 1996 -+++ Makefile Fri Jan 17 22:56:42 1997 -@@ -14,12 +14,12 @@ - INCLUDE = ./include/ - #LIBS = +diff -ur plor-0.3.1/config.h.in plor-mod/config.h.in +--- plor-0.3.1/config.h.in Sun Jan 26 08:23:10 1997 ++++ config.h.in Wed Jul 2 15:51:55 1997 +@@ -9,8 +9,14 @@ + /* Define if you have the <fcntl.h> header file. */ + #undef HAVE_FCNTL_H + ++/* Define if you have the <getopt.h> header file. */ ++#undef HAVE_GETOPT_H ++ + /* Define if you have the <sys/ioctl.h> header file. */ + #undef HAVE_SYS_IOCTL_H ++ ++/* Define if you have the <sys/param.h> header file. */ ++#undef HAVE_SYS_PARAM_H --ifdef DEBUG -+.ifdef DEBUG - #CFLAGS = -g -Wall -m486 -O2 -ansi -pedantic -finline-functions --FLAGS = -g -Wall -m486 -O3 -ansi -pedantic -fomit-frame-pointer --else --FLAGS = -m486 -O3 -fomit-frame-pointer --endif -+FLAGS = -g -Wall -m486 -O3 -ansi -pedantic -fomit-frame-pointer -D_HAVE_PARAM_H -+.else -+FLAGS = -m486 -O3 -fomit-frame-pointer -D_HAVE_PARAM_H -+.endif - - CFLAGS = -I$(INCLUDE) $(FLAGS) - -@@ -28,18 +28,18 @@ - - ############# END USER CONFIGURATION ################## - --ifdef DEBUG -+.ifdef DEBUG - all: TODO $(OBJECTS) del plor --else -+.else - all: $(OBJECTS) del plor --endif -+.endif - - plor: $(OBJECTS) - $(CC) $(FLAGS) $(OBJECTS) $(LIBS) -o plor --ifdef DEBUG --else -+.ifdef DEBUG -+.else - strip plor --endif -+.endif - - # OBJECTS to compile - main.o: main.c + /* Define if you have the <unistd.h> header file. */ + #undef HAVE_UNISTD_H diff -ur plor-old/patches/patch-ab plor/patches/patch-ab --- plor-old/patches/patch-ab Fri Mar 28 06:19:07 1997 +++ plor/patches/patch-ab Wed Jul 2 18:55:28 1997 @@ -1,37 +1,673 @@ -diff -ud work/plor/main.c src/main.c ---- work/plor/main.c Sun Oct 27 09:24:00 1996 -+++ ./main.c Mon Dec 30 09:40:07 1996 -@@ -19,10 +19,20 @@ - - */ - -+#ifdef _HAVE_PARAM_H -+#include <sys/param.h> -+#endif - #include <stdio.h> +diff -ur plor-0.3.1/configure plor-mod/configure +--- plor-0.3.1/configure Sat Apr 26 13:11:10 1997 ++++ configure Wed Jul 2 15:51:07 1997 +@@ -1,7 +1,7 @@ + #! /bin/sh + + # Guess values for system-dependent variables and create Makefiles. +-# Generated automatically using autoconf version 2.10 ++# Generated automatically using autoconf version 2.12 + # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. + # + # This configure script is free software; the Free Software Foundation +@@ -49,6 +49,8 @@ + # Initialize some other variables. + subdirs= + MFLAGS= MAKEFLAGS= ++# Maximum number of lines to put in a shell here document. ++ac_max_here_lines=12 + + ac_prev= + for ac_option +@@ -330,7 +332,7 @@ + verbose=yes ;; + + -version | --version | --versio | --versi | --vers) +- echo "configure generated by autoconf version 2.10" ++ echo "configure generated by autoconf version 2.12" + exit 0 ;; + + -with-* | --with-*) +@@ -432,11 +434,14 @@ + done + + # NLS nuisances. +-# Only set LANG and LC_ALL to C if already set. +-# These must not be set unconditionally because not all systems understand +-# e.g. LANG=C (notably SCO). +-if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi ++# Only set these to C if already set. These must not be set unconditionally ++# because not all systems understand e.g. LANG=C (notably SCO). ++# Fixing LC_MESSAGES prevents Solaris sh from translating var values in `set'! ++# Non-C LC_CTYPE values break the ctype check. + if test "${LANG+set}" = set; then LANG=C; export LANG; fi ++if test "${LC_ALL+set}" = set; then LC_ALL=C; export LC_ALL; fi ++if test "${LC_MESSAGES+set}" = set; then LC_MESSAGES=C; export LC_MESSAGES; fi ++if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi + + # confdefs.h avoids OS command line length limits that DEFS can exceed. + rm -rf conftest* confdefs.h +@@ -498,6 +503,7 @@ + ac_cpp='$CPP $CPPFLAGS' + ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' + ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ++cross_compiling=$ac_cv_prog_cc_cross + + if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then + # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. +@@ -543,7 +549,8 @@ + + + echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 +-set dummy ${MAKE-make}; ac_make=$2 ++echo "configure:553: checking whether ${MAKE-make} sets \${MAKE}" >&5 ++set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -573,6 +580,7 @@ + # Extract the first word of "gcc", so it can be a program name with args. + set dummy gcc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++echo "configure:584: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -601,6 +609,7 @@ + # Extract the first word of "cc", so it can be a program name with args. + set dummy cc; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++echo "configure:613: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -647,7 +656,47 @@ + test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } + fi + ++echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 ++echo "configure:661: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++ ++ac_ext=c ++# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ++ac_cpp='$CPP $CPPFLAGS' ++ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' ++ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' ++cross_compiling=$ac_cv_prog_cc_cross ++ ++cat > conftest.$ac_ext <<EOF ++#line 671 "configure" ++#include "confdefs.h" ++main(){return(0);} ++EOF ++if { (eval echo configure:675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ++ ac_cv_prog_cc_works=yes ++ # If we can't run a trivial program, we are probably using a cross compiler. ++ if (./conftest; exit) 2>/dev/null; then ++ ac_cv_prog_cc_cross=no ++ else ++ ac_cv_prog_cc_cross=yes ++ fi ++else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ ac_cv_prog_cc_works=no ++fi ++rm -fr conftest* ++ ++echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 ++if test $ac_cv_prog_cc_works = no; then ++ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } ++fi ++echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 ++echo "configure:695: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 ++cross_compiling=$ac_cv_prog_cc_cross ++ + echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 ++echo "configure:700: checking whether we are using GNU C" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -656,7 +705,7 @@ + yes; + #endif + EOF +-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ++if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:709: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then + ac_cv_prog_gcc=yes + else + ac_cv_prog_gcc=no +@@ -664,29 +713,34 @@ + fi + + echo "$ac_t""$ac_cv_prog_gcc" 1>&6 ++ + if test $ac_cv_prog_gcc = yes; then + GCC=yes +- if test "${CFLAGS+set}" != set; then +- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +-if eval "test \"`echo '$''{'ac_cv_prog_gcc_g'+set}'`\" = set"; then ++ ac_test_CFLAGS="${CFLAGS+set}" ++ ac_save_CFLAGS="$CFLAGS" ++ CFLAGS= ++ echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 ++echo "configure:724: checking whether ${CC-cc} accepts -g" >&5 ++if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + echo 'void f(){}' > conftest.c + if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then +- ac_cv_prog_gcc_g=yes ++ ac_cv_prog_cc_g=yes + else +- ac_cv_prog_gcc_g=no ++ ac_cv_prog_cc_g=no + fi + rm -f conftest* + + fi + +-echo "$ac_t""$ac_cv_prog_gcc_g" 1>&6 +- if test $ac_cv_prog_gcc_g = yes; then +- CFLAGS="-g -O" +- else +- CFLAGS="-O" +- fi ++echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 ++ if test "$ac_test_CFLAGS" = set; then ++ CFLAGS="$ac_save_CFLAGS" ++ elif test $ac_cv_prog_cc_g = yes; then ++ CFLAGS="-g -O2" ++ else ++ CFLAGS="-O2" + fi + else + GCC= +@@ -723,11 +777,12 @@ + # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" + # ./install, which can be erroneously created by make from ./install.sh. + echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 ++echo "configure:781: checking for a BSD compatible install" >&5 + if test -z "$INSTALL"; then + if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" ++ IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + # Account for people who put trailing slashes in PATH elements. + case "$ac_dir/" in +@@ -750,7 +805,7 @@ + ;; + esac + done +- IFS="$ac_save_ifs" ++ IFS="$ac_save_IFS" + + fi + if test "${ac_cv_path_install+set}" = set; then +@@ -774,6 +829,7 @@ + # Extract the first word of "zip", so it can be a program name with args. + set dummy zip; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++echo "configure:833: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -804,6 +860,7 @@ + # Extract the first word of "unzip", so it can be a program name with args. + set dummy unzip; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 ++echo "configure:864: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -836,6 +893,7 @@ + + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 ++echo "configure:897: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= +@@ -850,33 +908,37 @@ + # On the NeXT, cc -E runs the code through the compiler's parser, + # not just through cpp. + cat > conftest.$ac_ext <<EOF +-#line 854 "configure" ++#line 912 "configure" + #include "confdefs.h" + #include <assert.h> + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:860: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out` + if test -z "$ac_err"; then + : + else + echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -E -traditional-cpp" + cat > conftest.$ac_ext <<EOF +-#line 869 "configure" ++#line 929 "configure" + #include "confdefs.h" + #include <assert.h> + Syntax Error + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:875: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out` + if test -z "$ac_err"; then + : + else + echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP=/lib/cpp + fi +@@ -891,38 +953,13 @@ + fi + echo "$ac_t""$CPP" 1>&6 + +-# If we cannot run a trivial program, we must be cross compiling. +-echo $ac_n "checking whether cross-compiling""... $ac_c" 1>&6 +-if eval "test \"`echo '$''{'ac_cv_c_cross'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- if test "$cross_compiling" = yes; then +- ac_cv_c_cross=yes +-else +-cat > conftest.$ac_ext <<EOF +-#line 904 "configure" +-#include "confdefs.h" +-main(){return(0);} +-EOF +-{ (eval echo configure:908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +-if test -s conftest && (./conftest; exit) 2>/dev/null; then +- ac_cv_c_cross=no +-else +- ac_cv_c_cross=yes +-fi +-fi +-rm -fr conftest* +-fi +- +-echo "$ac_t""$ac_cv_c_cross" 1>&6 +-cross_compiling=$ac_cv_c_cross +- + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 ++echo "configure:958: checking for ANSI C header files" >&5 + if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 926 "configure" ++#line 963 "configure" + #include "confdefs.h" + #include <stdlib.h> + #include <stdarg.h> +@@ -930,13 +967,15 @@ + #include <float.h> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:934: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:971: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out` + if test -z "$ac_err"; then + rm -rf conftest* + ac_cv_header_stdc=yes + else + echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 + rm -rf conftest* + ac_cv_header_stdc=no + fi +@@ -945,7 +984,7 @@ + if test $ac_cv_header_stdc = yes; then + # SunOS 4.x string.h does not declare mem*, contrary to ANSI. + cat > conftest.$ac_ext <<EOF +-#line 949 "configure" ++#line 988 "configure" + #include "confdefs.h" #include <string.h> + EOF +@@ -963,7 +1002,7 @@ + if test $ac_cv_header_stdc = yes; then + # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. + cat > conftest.$ac_ext <<EOF +-#line 967 "configure" ++#line 1006 "configure" + #include "confdefs.h" #include <stdlib.h> -+#if !defined(BSD) - #include <getopt.h> -+#else -+#if BSD >= 199506 -+/* Lite2, need getopt() prototypes */ -+#include <unistd.h> -+#endif -+#endif - - /* will be included when we will have locale support - #include <locale.h> -@@ -75,10 +80,10 @@ - Show_SConf(); - break; - case '3': -- printf("Help on Line, not yet supported!!!"); -+ printf("Help on Line, not yet supported!!!\n"); - continue; - case '4': -- printf("Replies not yet implemented!!!"); -+ printf("Replies not yet implemented!!!\n"); - continue; - case '5': - case 'q': + EOF +@@ -983,8 +1022,8 @@ + if test "$cross_compiling" = yes; then + : + else +-cat > conftest.$ac_ext <<EOF +-#line 988 "configure" ++ cat > conftest.$ac_ext <<EOF ++#line 1027 "configure" + #include "confdefs.h" + #include <ctype.h> + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +@@ -995,15 +1034,19 @@ + exit (0); } + + EOF +-{ (eval echo configure:999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } +-if test -s conftest && (./conftest; exit) 2>/dev/null; then ++if { (eval echo configure:1038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null ++then + : + else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 ++ rm -fr conftest* + ac_cv_header_stdc=no + fi +-fi + rm -fr conftest* + fi ++ ++fi + fi + + echo "$ac_t""$ac_cv_header_stdc" 1>&6 +@@ -1014,26 +1057,29 @@ + + fi + +-for ac_hdr in fcntl.h sys/ioctl.h unistd.h ++for ac_hdr in fcntl.h sys/ioctl.h unistd.h sys/param.h getopt.h + do +-ac_safe=`echo "$ac_hdr" | tr './\055' '___'` ++ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 ++echo "configure:1065: checking for $ac_hdr" >&5 + if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1026 "configure" ++#line 1070 "configure" + #include "confdefs.h" + #include <$ac_hdr> + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:1031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:1075: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } + ac_err=`grep -v '^ *+' conftest.out` + if test -z "$ac_err"; then + rm -rf conftest* + eval "ac_cv_header_$ac_safe=yes" + else + echo "$ac_err" >&5 ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_header_$ac_safe=no" + fi +@@ -1041,7 +1087,7 @@ + fi + if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- ac_tr_hdr=HAVE_`echo $ac_hdr | tr 'abcdefghijklmnopqrstuvwxyz./\055' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ___'` ++ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` + cat >> confdefs.h <<EOF + #define $ac_tr_hdr 1 + EOF +@@ -1055,12 +1101,13 @@ + + if test $ac_cv_prog_gcc = yes; then + echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 ++echo "configure:1105: checking whether ${CC-cc} needs -traditional" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_pattern="Autoconf.*'x'" + cat > conftest.$ac_ext <<EOF +-#line 1064 "configure" ++#line 1111 "configure" + #include "confdefs.h" + #include <sgtty.h> + Autoconf TIOCGETP +@@ -1078,7 +1125,7 @@ + + if test $ac_cv_prog_gcc_traditional = no; then + cat > conftest.$ac_ext <<EOF +-#line 1082 "configure" ++#line 1129 "configure" + #include "confdefs.h" + #include <termio.h> + Autoconf TCGETA +@@ -1102,11 +1149,12 @@ + for ac_func in strcspn + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 ++echo "configure:1153: checking for $ac_func" >&5 + if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext <<EOF +-#line 1110 "configure" ++#line 1158 "configure" + #include "confdefs.h" + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func(); below. */ +@@ -1116,8 +1164,7 @@ + builtin and then its argument prototype would still apply. */ + char $ac_func(); + +-int main() { return 0; } +-int t() { ++int main() { + + /* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named +@@ -1130,16 +1177,18 @@ + + ; return 0; } + EOF +-if { (eval echo configure:1134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then ++if { (eval echo configure:1181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then + rm -rf conftest* + eval "ac_cv_func_$ac_func=yes" + else ++ echo "configure: failed program was:" >&5 ++ cat conftest.$ac_ext >&5 + rm -rf conftest* + eval "ac_cv_func_$ac_func=no" + fi + rm -f conftest* +- + fi ++ + if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then + echo "$ac_t""yes" 1>&6 + ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` +@@ -1170,11 +1219,25 @@ + # --recheck option to rerun configure. + # + EOF ++# The following way of writing the cache mishandles newlines in values, ++# but we know of no workaround that is simple, portable, and efficient. ++# So, don't put newlines in cache variables' values. + # Ultrix sh set writes to stderr and can't be redirected directly, + # and sets the high bit in the cache file unless we assign to the vars. + (set) 2>&1 | +- sed -n "s/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=\${\1='\2'}/p" \ +- >> confcache ++ case `(ac_space=' '; set) 2>&1` in ++ *ac_space=\ *) ++ # `set' does not quote correctly, so add quotes (double-quote substitution ++ # turns \\\\ into \\, and sed turns \\ into \). ++ sed -n \ ++ -e "s/'/'\\\\''/g" \ ++ -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p" ++ ;; ++ *) ++ # `set' quotes correctly as required by POSIX, so do not add quotes. ++ sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p' ++ ;; ++ esac >> confcache + if cmp -s $cache_file confcache; then + : + else +@@ -1229,7 +1292,7 @@ + echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" + exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; + -version | --version | --versio | --versi | --vers | --ver | --ve | --v) +- echo "$CONFIG_STATUS generated by autoconf version 2.10" ++ echo "$CONFIG_STATUS generated by autoconf version 2.12" + exit 0 ;; + -help | --help | --hel | --he | --h) + echo "\$ac_cs_usage"; exit 0 ;; +@@ -1282,20 +1345,56 @@ + + CEOF + EOF ++ ++cat >> $CONFIG_STATUS <<\EOF ++ ++# Split the substitutions into bite-sized pieces for seds with ++# small command number limits, like on Digital OSF/1 and HP-UX. ++ac_max_sed_cmds=90 # Maximum number of lines to put in a sed script. ++ac_file=1 # Number of current file. ++ac_beg=1 # First line for current file. ++ac_end=$ac_max_sed_cmds # Line after last line for current file. ++ac_more_lines=: ++ac_sed_cmds="" ++while $ac_more_lines; do ++ if test $ac_beg -gt 1; then ++ sed "1,${ac_beg}d; ${ac_end}q" conftest.subs > conftest.s$ac_file ++ else ++ sed "${ac_end}q" conftest.subs > conftest.s$ac_file ++ fi ++ if test ! -s conftest.s$ac_file; then ++ ac_more_lines=false ++ rm -f conftest.s$ac_file ++ else ++ if test -z "$ac_sed_cmds"; then ++ ac_sed_cmds="sed -f conftest.s$ac_file" ++ else ++ ac_sed_cmds="$ac_sed_cmds | sed -f conftest.s$ac_file" ++ fi ++ ac_file=`expr $ac_file + 1` ++ ac_beg=$ac_end ++ ac_end=`expr $ac_end + $ac_max_sed_cmds` ++ fi ++done ++if test -z "$ac_sed_cmds"; then ++ ac_sed_cmds=cat ++fi ++EOF ++ + cat >> $CONFIG_STATUS <<EOF + + CONFIG_FILES=\${CONFIG_FILES-"Makefile tkplor/Makefile include/Makefile docs/Makefile lang/Makefile"} + EOF + cat >> $CONFIG_STATUS <<\EOF + for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then +- # Support "outfile[:infile]", defaulting infile="outfile.in". ++ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case "$ac_file" in +- *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'` ++ *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + *) ac_file_in="${ac_file}.in" ;; + esac + +- # Adjust relative srcdir, etc. for subdirectories. ++ # Adjust a relative srcdir, top_srcdir, and INSTALL for subdirectories. + + # Remove last slash and all that follows it. Not all systems have dirname. + ac_dir=`echo $ac_file|sed 's%/[^/][^/]*$%%'` +@@ -1323,6 +1422,7 @@ + [/$]*) INSTALL="$ac_given_INSTALL" ;; + *) INSTALL="$ac_dots$ac_given_INSTALL" ;; + esac ++ + echo creating "$ac_file" + rm -f "$ac_file" + configure_input="Generated automatically from `echo $ac_file_in|sed 's%.*/%%'` by configure." +@@ -1331,14 +1431,16 @@ + # $configure_input" ;; + *) ac_comsub= ;; + esac ++ ++ ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` + sed -e "$ac_comsub + s%@configure_input@%$configure_input%g + s%@srcdir@%$srcdir%g + s%@top_srcdir@%$top_srcdir%g + s%@INSTALL@%$INSTALL%g +-" -f conftest.subs $ac_given_srcdir/$ac_file_in > $ac_file ++" $ac_file_inputs | (eval "$ac_sed_cmds") > $ac_file + fi; done +-rm -f conftest.subs ++rm -f conftest.s* + + # These sed commands are passed to sed as "A NAME B NAME C VALUE D", where + # NAME is the cpp macro being defined and VALUE is the value it is being given. +@@ -1359,11 +1461,17 @@ + ac_eC=' ' + ac_eD='%g' + +-CONFIG_HEADERS=${CONFIG_HEADERS-"config.h"} ++if test "${CONFIG_HEADERS+set}" != set; then ++EOF ++cat >> $CONFIG_STATUS <<EOF ++ CONFIG_HEADERS="config.h" ++EOF ++cat >> $CONFIG_STATUS <<\EOF ++fi + for ac_file in .. $CONFIG_HEADERS; do if test "x$ac_file" != x..; then +- # Support "outfile[:infile]", defaulting infile="outfile.in". ++ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case "$ac_file" in +- *:*) ac_file_in=`echo "$ac_file"|sed 's%.*:%%'` ++ *:*) ac_file_in=`echo "$ac_file"|sed 's%[^:]*:%%'` + ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + *) ac_file_in="${ac_file}.in" ;; + esac +@@ -1371,7 +1479,8 @@ + echo creating $ac_file + + rm -f conftest.frag conftest.in conftest.out +- cp $ac_given_srcdir/$ac_file_in conftest.in ++ ac_file_inputs=`echo $ac_file_in|sed -e "s%^%$ac_given_srcdir/%" -e "s%:% $ac_given_srcdir/%g"` ++ cat $ac_file_inputs > conftest.in + + EOF + +@@ -1399,8 +1508,6 @@ + + # Break up conftest.vals because some shells have a limit on + # the size of here documents, and old seds have small limits too. +-# Maximum number of lines to put in a single here document. +-ac_max_here_lines=12 + + rm -f conftest.tail + while : +@@ -1442,7 +1549,11 @@ + fi + fi; done + ++EOF ++cat >> $CONFIG_STATUS <<EOF + ++EOF ++cat >> $CONFIG_STATUS <<\EOF + test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h + exit 0 + EOF diff -ur plor-old/patches/patch-ac plor/patches/patch-ac --- plor-old/patches/patch-ac Fri Jan 17 09:32:43 1997 +++ plor/patches/patch-ac Wed Jul 2 18:55:59 1997 @@ -1,63 +1,20 @@ -diff -ud work/plor/video.c src/video.c ---- work/plor/video.c Thu Aug 29 05:55:56 1996 -+++ ./video.c Mon Dec 30 09:38:10 1996 -@@ -2,12 +2,18 @@ - * (C) 1996 by Davide Barbieri - */ +diff -ur plor-0.3.1/main.c plor-mod/main.c +--- plor-0.3.1/main.c Thu May 1 11:38:35 1997 ++++ main.c Wed Jul 2 15:55:18 1997 +@@ -24,11 +24,16 @@ + static char vcid[] = "$Id: main.c,v 1.2 1997/04/03 11:36:17 dpaci Exp dpaci $"; + #endif /* lint */ -+#ifdef _HAVE_PARAM_H -+#include <sys/param.h> ++#ifdef HAVE_CONFIG_H ++#include "config.h" +#endif + #include <stdio.h> - #include <sys/types.h> - #include <sys/stat.h> - #include <sys/ioctl.h> - #include <fcntl.h> - #include <unistd.h> -+#if defined(BSD) -+#include <termios.h> + #include <string.h> + #include <stdlib.h> ++#if HAVE_GETOPT_H + #include <getopt.h> +#endif - #include "include/video.h" - -@@ -180,21 +186,40 @@ - int get_ch() { - int file; - char return_char; -+#if defined(BSD) -+ struct termios newterm, oldterm; -+#else - struct termio newterm, oldterm; -+#endif - file = open("/dev/tty", O_RDONLY); - if (file == -1) - return (0); -+#if defined(BSD) -+ ioctl(file,TIOCGETA,&oldterm); -+ memcpy (&newterm,&oldterm,sizeof(struct termios)); -+ /* printf() doesn't seem to flush the output unless given a \n. I -+ * don't actually know why... */ -+#else - ioctl(file,TCGETA,&oldterm); - memcpy (&newterm,&oldterm,sizeof(struct termio)); -+#endif -+ /* I don't know what you're trying to do with the below two statements... -+ * on FreeBSD, this changes the VERASE and VWERASE chars */ - newterm.c_cc[4] = 1; - newterm.c_cc[5] = 0; - /* newterm.c_cflag = (B9600|CS8|CREAD); */ - newterm.c_lflag = 0; - newterm.c_iflag = IGNBRK; - newterm.c_oflag = 0; -+#if defined(BSD) -+ ioctl (file,TIOCSETAF,&newterm); -+ read(file,&return_char,1); -+ ioctl (file,TIOCSETAF,&oldterm); -+#else - ioctl (file,TCSETAF,&newterm); - read(file,&return_char,1); - ioctl (file,TCSETAF,&oldterm); -+#endif - close(file); - return (return_char); - } + /* will be included when we will have locale support + #include <locale.h> Only in plor/patches: patch-ad diff -ur plor-old/pkg/DESCR plor/pkg/DESCR --- plor-old/pkg/DESCR Fri Jan 17 09:32:45 1997 +++ plor/pkg/DESCR Wed Jul 2 19:07:16 1997 @@ -1,7 +1,7 @@ This is a port of plor (which stands for Pluto Offline Linux Reader). -Plor reads soup and qwk message packets. It is alpha software, and -does not yet support the creation of reply packets, nor does it -support advanced features such as kill-files. +Plor reads soup and qwk message packets. It is alpha software. + +You can use this as an alternative to the slnr package. - Tim Vanderhoek -ac199@freenet.hamilton.on.ca +ac199@hwcn.org diff -ur plor-old/pkg/PLIST plor/pkg/PLIST --- plor-old/pkg/PLIST Fri Jan 17 09:32:44 1997 +++ plor/pkg/PLIST Wed Jul 2 19:08:27 1997 @@ -1,11 +1,10 @@ bin/plor man/man1/plor.1.gz -share/doc/plor/BUGS -share/doc/plor/HISTORY -share/doc/plor/PER_ZENO +share/doc/plor/AUTHORS +share/doc/plor/NEWS share/doc/plor/TODO share/doc/plor/plor-1.html share/doc/plor/plor-2.html share/doc/plor/plor.html share/doc/plor/plor.txt -share/doc/plor/porting.notes +@unexec rmdir %D/share/doc/plor >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199707022354.TAA05476>