3 files changed, 153 insertions, 155 deletions

diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile
index 87cf96cdcfe8..43f5bebfdf00 100644
--- a/misc/pdmenu/Makefile
+++ b/misc/pdmenu/Makefile
@@ -1,12 +1,12 @@
 # New ports collection makefile for:	pdmenu
-# Version required:     1.2.40
+# Version required:     1.2.48
 # Date created:		14 December 1998
 # Whom:			Neil Blakey-Milner <nbm@rucus.ru.ac.za>
 #
 # $FreeBSD$
 
 DISTNAME=       pdmenu
-PKGNAME=	pdmenu-1.2.40
+PKGNAME=	pdmenu-1.2.48
 CATEGORIES=	misc
 MASTER_SITES=	http://kitenet.net/programs/code/pdmenu/
 
@@ -14,8 +14,6 @@ MAINTAINER=	nbm@rucus.ru.ac.za
 
 LIB_DEPENDS=    slang.1:${PORTSDIR}/devel/libslang
 
-WRKSRC=		${WRKDIR}/${PKGNAME}
-
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
diff --git a/misc/pdmenu/distinfo b/misc/pdmenu/distinfo
index bf9aaa1179fe..2d14cbe0fc57 100644
--- a/misc/pdmenu/distinfo
+++ b/misc/pdmenu/distinfo
@@ -1 +1 @@
-MD5 (pdmenu.tar.gz) = c692fded481d13e5f80a70cdb91475ef
+MD5 (pdmenu.tar.gz) = 3bc8bcce3bad68b0ee7e59e1f74be718
diff --git a/misc/pdmenu/files/patch-ab b/misc/pdmenu/files/patch-ab
index 70a965af981d..3df93e8da844 100644
--- a/misc/pdmenu/files/patch-ab
+++ b/misc/pdmenu/files/patch-ab
@@ -1,150 +1,150 @@
-*** configure.orig	Thu Jan 14 17:49:33 1999
---- configure	Thu Jan 14 17:50:19 1999
-***************
-*** 832,835 ****
---- 832,902 ----
-  rmdir ./test 2>/dev/null
-  
-+ Terminfo_Dirs="/usr/lib/terminfo \
-+ 	/usr/share/lib/terminfo \
-+ 	/usr/local/lib/terminfo"
-+ TERMCAP=yes
-+ echo $ac_n "checking for terminfo""... $ac_c" 1>&6
-+ echo "configure:840: checking for terminfo" >&5
-+ for terminfo_dir in $Terminfo_Dirs
-+ do
-+ 	if test -d $terminfo_dir; then
-+ 		echo "$ac_t""found" 1>&6
-+ 		TERMCAP=""
-+ 		break
-+ 	fi
-+ done
-+ if test "$TERMCAP"; then
-+ 	echo "$ac_t""not found" 1>&6
-+ 	echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-+ echo "configure:852: checking for tgetent in -ltermcap" >&5
-+ ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
-+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+   echo $ac_n "(cached) $ac_c" 1>&6
-+ else
-+   ac_save_LIBS="$LIBS"
-+ LIBS="-ltermcap  $LIBS"
-+ cat > conftest.$ac_ext <<EOF
-+ #line 860 "configure"
-+ #include "confdefs.h"
-+ /* Override any gcc2 internal prototype to avoid an error.  */
-+ /* We use char because int might match the return type of a gcc2
-+     builtin and then its argument prototype would still apply.  */
-+ char tgetent();
-+ 
-+ int main() {
-+ tgetent()
-+ ; return 0; }
-+ EOF
-+ if { (eval echo configure:871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=yes"
-+ else
-+   echo "configure: failed program was:" >&5
-+   cat conftest.$ac_ext >&5
-+   rm -rf conftest*
-+   eval "ac_cv_lib_$ac_lib_var=no"
-+ fi
-+ rm -f conftest*
-+ LIBS="$ac_save_LIBS"
-+ 
-+ fi
-+ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+   echo "$ac_t""yes" 1>&6
-+     ac_tr_lib=HAVE_LIB`echo termcap | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-+     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-+   cat >> confdefs.h <<EOF
-+ #define $ac_tr_lib 1
-+ EOF
-+ 
-+   LIBS="-ltermcap $LIBS"
-+ 
-+ else
-+   echo "$ac_t""no" 1>&6
-+ fi
-+ 
-+ 	# Note that if this fails, we continue and make probably dies with
-+ 	# an error. Unless terminfo is hiding somewhere else..
-+ fi
-+ 
-  if test "$SLANG_LIB_LOC" != "" ; then 
-  	CFLAGS="-L$SLANG_LIB_LOC $CFLAGS"
-***************
-*** 1679,1749 ****
-  else
-  	echo "configure: warning: pdmenu will be built without GPM mouse support." 1>&2
-- fi
-- 
-- Terminfo_Dirs="/usr/lib/terminfo \
-- 	/usr/share/lib/terminfo \
-- 	/usr/local/lib/terminfo"
-- TERMCAP=yes
-- echo $ac_n "checking for terminfo""... $ac_c" 1>&6
-- echo "configure:1689: checking for terminfo" >&5
-- for terminfo_dir in $Terminfo_Dirs
-- do
-- 	if test -d $terminfo_dir; then
-- 		echo "$ac_t""found" 1>&6
-- 		TERMCAP=""
-- 		break
-- 	fi
-- done
-- if test "$TERMCAP"; then
-- 	echo "$ac_t""not found" 1>&6
-- 	echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-- echo "configure:1701: checking for tgetent in -ltermcap" >&5
-- ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
-- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--   echo $ac_n "(cached) $ac_c" 1>&6
-- else
--   ac_save_LIBS="$LIBS"
-- LIBS="-ltermcap  $LIBS"
-- cat > conftest.$ac_ext <<EOF
-- #line 1709 "configure"
-- #include "confdefs.h"
-- /* Override any gcc2 internal prototype to avoid an error.  */
-- /* We use char because int might match the return type of a gcc2
--     builtin and then its argument prototype would still apply.  */
-- char tgetent();
-- 
-- int main() {
-- tgetent()
-- ; return 0; }
-- EOF
-- if { (eval echo configure:1720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
--   rm -rf conftest*
--   eval "ac_cv_lib_$ac_lib_var=yes"
-- else
--   echo "configure: failed program was:" >&5
--   cat conftest.$ac_ext >&5
--   rm -rf conftest*
--   eval "ac_cv_lib_$ac_lib_var=no"
-- fi
-- rm -f conftest*
-- LIBS="$ac_save_LIBS"
-- 
-- fi
-- if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--   echo "$ac_t""yes" 1>&6
--     ac_tr_lib=HAVE_LIB`echo termcap | sed -e 's/[^a-zA-Z0-9_]/_/g' \
--     -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
--   cat >> confdefs.h <<EOF
-- #define $ac_tr_lib 1
-- EOF
-- 
--   LIBS="-ltermcap $LIBS"
-- 
-- else
--   echo "$ac_t""no" 1>&6
-- fi
-- 
-- 	# Note that if this fails, we continue and make probably dies with
-- 	# an error. Unless terminfo is hiding somewhere else..
-  fi
-  
---- 1746,1749 ----
+--- configure.orig	Tue Sep  7 01:19:45 1999
++++ configure	Fri Sep 10 13:26:38 1999
+@@ -890,6 +890,73 @@
+ rmdir ./test/test2 2>/dev/null
+ rmdir ./test 2>/dev/null
+ 
++Terminfo_Dirs="/usr/lib/terminfo \
++	/usr/share/lib/terminfo \
++	/usr/local/lib/terminfo"
++TERMCAP=yes
++echo $ac_n "checking for terminfo""... $ac_c" 1>&6
++echo "configure:840: checking for terminfo" >&5
++for terminfo_dir in $Terminfo_Dirs
++do
++	if test -d $terminfo_dir; then
++		echo "$ac_t""found" 1>&6
++		TERMCAP=""
++		break
++	fi
++done
++if test "$TERMCAP"; then
++	echo "$ac_t""not found" 1>&6
++	echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
++echo "configure:852: checking for tgetent in -ltermcap" >&5
++ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
++if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
++  echo $ac_n "(cached) $ac_c" 1>&6
++else
++  ac_save_LIBS="$LIBS"
++LIBS="-ltermcap  $LIBS"
++cat > conftest.$ac_ext <<EOF
++#line 860 "configure"
++#include "confdefs.h"
++/* Override any gcc2 internal prototype to avoid an error.  */
++/* We use char because int might match the return type of a gcc2
++    builtin and then its argument prototype would still apply.  */
++char tgetent();
++
++int main() {
++tgetent()
++; return 0; }
++EOF
++if { (eval echo configure:871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=yes"
++else
++  echo "configure: failed program was:" >&5
++  cat conftest.$ac_ext >&5
++  rm -rf conftest*
++  eval "ac_cv_lib_$ac_lib_var=no"
++fi
++rm -f conftest*
++LIBS="$ac_save_LIBS"
++
++fi
++if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
++  echo "$ac_t""yes" 1>&6
++    ac_tr_lib=HAVE_LIB`echo termcap | sed -e 's/[^a-zA-Z0-9_]/_/g' \
++    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
++  cat >> confdefs.h <<EOF
++#define $ac_tr_lib 1
++EOF
++
++  LIBS="-ltermcap $LIBS"
++
++else
++  echo "$ac_t""no" 1>&6
++fi
++
++	# Note that if this fails, we continue and make probably dies with
++	# an error. Unless terminfo is hiding somewhere else..
++fi
++
+ if test "$SLANG_LIB_LOC" != "" ; then 
+ 	CFLAGS="-L$SLANG_LIB_LOC $CFLAGS"
+ fi
+@@ -1756,73 +1823,6 @@
+ 	fi
+ else
+ 	echo "configure: warning: pdmenu will be built without GPM mouse support." 1>&2
+-fi
+-
+-Terminfo_Dirs="/usr/lib/terminfo \
+-	/usr/share/lib/terminfo \
+-	/usr/local/lib/terminfo"
+-TERMCAP=yes
+-echo $ac_n "checking for terminfo""... $ac_c" 1>&6
+-echo "configure:1767: checking for terminfo" >&5
+-for terminfo_dir in $Terminfo_Dirs
+-do
+-	if test -d $terminfo_dir; then
+-		echo "$ac_t""found" 1>&6
+-		TERMCAP=""
+-		break
+-	fi
+-done
+-if test "$TERMCAP"; then
+-	echo "$ac_t""not found" 1>&6
+-	echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
+-echo "configure:1779: checking for tgetent in -ltermcap" >&5
+-ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
+-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  ac_save_LIBS="$LIBS"
+-LIBS="-ltermcap  $LIBS"
+-cat > conftest.$ac_ext <<EOF
+-#line 1787 "configure"
+-#include "confdefs.h"
+-/* Override any gcc2 internal prototype to avoid an error.  */
+-/* We use char because int might match the return type of a gcc2
+-    builtin and then its argument prototype would still apply.  */
+-char tgetent();
+-
+-int main() {
+-tgetent()
+-; return 0; }
+-EOF
+-if { (eval echo configure:1798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=yes"
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  eval "ac_cv_lib_$ac_lib_var=no"
+-fi
+-rm -f conftest*
+-LIBS="$ac_save_LIBS"
+-
+-fi
+-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
+-  echo "$ac_t""yes" 1>&6
+-    ac_tr_lib=HAVE_LIB`echo termcap | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+-  cat >> confdefs.h <<EOF
+-#define $ac_tr_lib 1
+-EOF
+-
+-  LIBS="-ltermcap $LIBS"
+-
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-	# Note that if this fails, we continue and make probably dies with
+-	# an error. Unless terminfo is hiding somewhere else..
+ fi
+ 
+ # Extract the first word of "date", so it can be a program name with args.