From owner-freebsd-ports Mon Jan 18 06:40:07 1999 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id GAA18744 for freebsd-ports-outgoing; Mon, 18 Jan 1999 06:40:07 -0800 (PST) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21]) by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id GAA18675 for ; Mon, 18 Jan 1999 06:40:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.8.8/8.8.5) id GAA04139; Mon, 18 Jan 1999 06:40:01 -0800 (PST) Received: from rucus.ru.ac.za (rucus.ru.ac.za [146.231.29.2]) by hub.freebsd.org (8.8.8/8.8.8) with SMTP id GAA17631 for ; Mon, 18 Jan 1999 06:30:56 -0800 (PST) (envelope-from nbm@rucus.ru.ac.za) Received: (qmail 4306 invoked by uid 1003); 18 Jan 1999 14:30:45 -0000 Message-Id: <19990118143045.4305.qmail@rucus.ru.ac.za> Date: 18 Jan 1999 14:30:45 -0000 From: nbm@rucus.ru.ac.za Reply-To: nbm@rucus.ru.ac.za To: FreeBSD-gnats-submit@FreeBSD.ORG X-Send-Pr-Version: 3.2 Subject: ports/9553: fix to misc/pdmenu to allow command line options Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org >Number: 9553 >Category: ports >Synopsis: fix to misc/pdmenu to allow command line options >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: Mon Jan 18 06:40:01 PST 1999 >Closed-Date: >Last-Modified: >Originator: Neil Blakey-Milner >Release: FreeBSD 3.0-CURRENT i386 >Organization: Rhodes University Computer Users' Society >Environment: FreeBSD rucus.ru.ac.za 3.0-CURRENT FreeBSD 3.0-CURRENT #0: Wed Nov 11 10:47:28 SAT 1998 root@rucus.ru.ac.za:/usr/src/sys/compile/WOOF i386 >Description: Update to fix to make pdmenu build with slang's dependency on termcap correctly. This is a shar of _just_ the patches directory. >How-To-Repeat: cd /usr/ports/misc/pdmenu && make configure and watch the "No command line options" error message. >Fix: # This is a shell archive. Save it in a file, remove anything before # this line, and then unpack it by entering "sh file". Note, it may # create directories; files and directories will be owned by you and # have default permissions. # # This archive contains: # # patches # patches/patch-aa # patches/patch-ab # echo c - patches mkdir -p patches > /dev/null 2>&1 echo x - patches/patch-aa sed 's/^X//' >patches/patch-aa << 'END-of-patches/patch-aa' X--- configure.in.orig Thu Jan 14 17:49:38 1999 X+++ configure.in Thu Jan 14 17:50:06 1999 X@@ -36,6 +36,27 @@ X rmdir ./test/test2 2>/dev/null X rmdir ./test 2>/dev/null X X+dnl If we cannot find terminfo, link with termcap. X+Terminfo_Dirs="/usr/lib/terminfo \ X+ /usr/share/lib/terminfo \ X+ /usr/local/lib/terminfo" X+TERMCAP=yes X+AC_MSG_CHECKING(for terminfo) X+for terminfo_dir in $Terminfo_Dirs X+do X+ if test -d $terminfo_dir; then X+ AC_MSG_RESULT(found) X+ TERMCAP="" X+ break X+ fi X+done X+if test "$TERMCAP"; then X+ AC_MSG_RESULT(not found) X+ AC_CHECK_LIB(termcap,tgetent) X+ # Note that if this fails, we continue and make probably dies with X+ # an error. Unless terminfo is hiding somewhere else.. X+fi X+ X dnl Let the user specify an alternate location for the libs. X dnl I have to add this to CFLAGS, instead of to LIBS, to placate X dnl some compiler that wanted -L before -l . X@@ -96,27 +117,6 @@ X fi X else X AC_MSG_WARN(pdmenu will be built without GPM mouse support.) X-fi X- X-dnl If we cannot find terminfo, link with termcap. X-Terminfo_Dirs="/usr/lib/terminfo \ X- /usr/share/lib/terminfo \ X- /usr/local/lib/terminfo" X-TERMCAP=yes X-AC_MSG_CHECKING(for terminfo) X-for terminfo_dir in $Terminfo_Dirs X-do X- if test -d $terminfo_dir; then X- AC_MSG_RESULT(found) X- TERMCAP="" X- break X- fi X-done X-if test "$TERMCAP"; then X- AC_MSG_RESULT(not found) X- AC_CHECK_LIB(termcap,tgetent) X- # Note that if this fails, we continue and make probably dies with X- # an error. Unless terminfo is hiding somewhere else.. X fi X X AC_CHECK_PROG(DATE_PROG,date,yes,no) END-of-patches/patch-aa echo x - patches/patch-ab sed 's/^X//' >patches/patch-ab << 'END-of-patches/patch-ab' X*** configure.orig Thu Jan 14 17:49:33 1999 X--- configure Thu Jan 14 17:50:19 1999 X*************** X*** 832,835 **** X--- 832,902 ---- X rmdir ./test 2>/dev/null X X+ Terminfo_Dirs="/usr/lib/terminfo \ X+ /usr/share/lib/terminfo \ X+ /usr/local/lib/terminfo" X+ TERMCAP=yes X+ echo $ac_n "checking for terminfo""... $ac_c" 1>&6 X+ echo "configure:840: checking for terminfo" >&5 X+ for terminfo_dir in $Terminfo_Dirs X+ do X+ if test -d $terminfo_dir; then X+ echo "$ac_t""found" 1>&6 X+ TERMCAP="" X+ break X+ fi X+ done X+ if test "$TERMCAP"; then X+ echo "$ac_t""not found" 1>&6 X+ echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 X+ echo "configure:852: checking for tgetent in -ltermcap" >&5 X+ ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` X+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then X+ echo $ac_n "(cached) $ac_c" 1>&6 X+ else X+ ac_save_LIBS="$LIBS" X+ LIBS="-ltermcap $LIBS" X+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then X+ rm -rf conftest* X+ eval "ac_cv_lib_$ac_lib_var=yes" X+ else X+ echo "configure: failed program was:" >&5 X+ cat conftest.$ac_ext >&5 X+ rm -rf conftest* X+ eval "ac_cv_lib_$ac_lib_var=no" X+ fi X+ rm -f conftest* X+ LIBS="$ac_save_LIBS" X+ X+ fi X+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then X+ echo "$ac_t""yes" 1>&6 X+ ac_tr_lib=HAVE_LIB`echo termcap | sed -e 's/[^a-zA-Z0-9_]/_/g' \ X+ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` X+ cat >> confdefs.h <&6 X+ fi X+ X+ # Note that if this fails, we continue and make probably dies with X+ # an error. Unless terminfo is hiding somewhere else.. X+ fi X+ X if test "$SLANG_LIB_LOC" != "" ; then X CFLAGS="-L$SLANG_LIB_LOC $CFLAGS" X*************** X*** 1679,1749 **** X else X echo "configure: warning: pdmenu will be built without GPM mouse support." 1>&2 X- fi X- X- Terminfo_Dirs="/usr/lib/terminfo \ X- /usr/share/lib/terminfo \ X- /usr/local/lib/terminfo" X- TERMCAP=yes X- echo $ac_n "checking for terminfo""... $ac_c" 1>&6 X- echo "configure:1689: checking for terminfo" >&5 X- for terminfo_dir in $Terminfo_Dirs X- do X- if test -d $terminfo_dir; then X- echo "$ac_t""found" 1>&6 X- TERMCAP="" X- break X- fi X- done X- if test "$TERMCAP"; then X- echo "$ac_t""not found" 1>&6 X- echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 X- echo "configure:1701: checking for tgetent in -ltermcap" >&5 X- ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'` X- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then X- echo $ac_n "(cached) $ac_c" 1>&6 X- else X- ac_save_LIBS="$LIBS" X- LIBS="-ltermcap $LIBS" X- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then X- rm -rf conftest* X- eval "ac_cv_lib_$ac_lib_var=yes" X- else X- echo "configure: failed program was:" >&5 X- cat conftest.$ac_ext >&5 X- rm -rf conftest* X- eval "ac_cv_lib_$ac_lib_var=no" X- fi X- rm -f conftest* X- LIBS="$ac_save_LIBS" X- X- fi X- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then X- echo "$ac_t""yes" 1>&6 X- ac_tr_lib=HAVE_LIB`echo termcap | sed -e 's/[^a-zA-Z0-9_]/_/g' \ X- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` X- cat >> confdefs.h <&6 X- fi X- X- # Note that if this fails, we continue and make probably dies with X- # an error. Unless terminfo is hiding somewhere else.. X fi X X--- 1746,1749 ---- END-of-patches/patch-ab exit >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message