diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile index 35836db0f500..e83b41c4e1fd 100644 --- a/devel/libslang/Makefile +++ b/devel/libslang/Makefile @@ -6,8 +6,7 @@ # PORTNAME= libslang -PORTVERSION= 1.4.4 -PORTREVISION= 1 +PORTVERSION= 1.4.5 CATEGORIES= devel MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/ DISTNAME= slang-${PORTVERSION} diff --git a/devel/libslang/distinfo b/devel/libslang/distinfo index 9dae79be6226..3c931e587d39 100644 --- a/devel/libslang/distinfo +++ b/devel/libslang/distinfo @@ -1 +1 @@ -MD5 (slang-1.4.4.tar.bz2) = a79b7e57efb8d56a80048144a73ba909 +MD5 (slang-1.4.5.tar.bz2) = 380f5d0c306b70125a110f54814e26a3 diff --git a/devel/libslang/files/patch-aa b/devel/libslang/files/patch-aa index b29dedfe46e7..b30064568f0b 100644 --- a/devel/libslang/files/patch-aa +++ b/devel/libslang/files/patch-aa @@ -1,17 +1,17 @@ ---- configure.orig Tue Feb 20 20:17:29 2001 -+++ configure Mon Feb 26 11:28:55 2001 -@@ -1833,8 +1833,8 @@ +--- configure.orig Sun Feb 10 08:39:19 2002 ++++ configure Sun Feb 17 18:24:45 2002 +@@ -1832,8 +1832,8 @@ #define HAVE_DLFCN_H 1 EOF - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:1838: checking for dlopen in -ldl" >&5 +-echo "configure:1837: checking for dlopen in -ldl" >&5 + echo $ac_n "checking for dlopenl""... $ac_c" 1>&6 -+echo "configure:1838: checking for dlopen" >&5 ++echo "configure:1837: checking for dlopen" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1869,7 +1869,7 @@ +@@ -1868,7 +1868,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then echo "$ac_t""yes" 1>&6 @@ -20,7 +20,16 @@ cat >> confdefs.h <<\EOF #define HAVE_DLOPEN 1 EOF -@@ -2023,7 +2023,7 @@ +@@ -1943,7 +1943,7 @@ + + ELFLIB="lib\$(THIS_LIB).so" + ELFLIB_MAJOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION)" +-ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION)" ++ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION)" + + case "$host_os" in + *linux* ) +@@ -2038,7 +2038,7 @@ ELF_CFLAGS="$CFLAGS -fPIC" ELF_LINK="$CC -shared" ELF_LINK_CMD="\$(ELF_LINK)" @@ -29,7 +38,7 @@ CC_SHARED="$CC $CFLAGS -shared -fPIC" esac -@@ -2046,6 +2046,19 @@ +@@ -2063,6 +2063,19 @@ IEEE_CFLAGS="-ieee_with_no_inexact" fi ;; @@ -49,10 +58,10 @@ * ) IEEE_CFLAGS="" esac -@@ -2408,16 +2421,8 @@ +@@ -2432,16 +2445,8 @@ echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6 - echo "configure:2411: checking SLANG_VERSION" >&5 + echo "configure:2435: checking SLANG_VERSION" >&5 -slang_version=`grep "^#define *SLANG_VERSION " $srcdir/src/slang.h | - awk '{ print $3 }'` -slang_major_version=`echo $slang_version | @@ -64,7 +73,7 @@ - -slang_minor_version="$slang_minor_version.$slang_mminor_version" +slang_major_version=1 -+slang_miner_version=4 ++slang_miner_version=5 slang_version="$slang_major_version.$slang_minor_version" echo "$ac_t""$slang_version" 1>&6 diff --git a/devel/libslang/files/patch-ad b/devel/libslang/files/patch-ad deleted file mode 100644 index 81f024ae10dd..000000000000 --- a/devel/libslang/files/patch-ad +++ /dev/null @@ -1,14 +0,0 @@ ---- src/Makefile.in Fri Apr 24 01:17:04 1998 -+++ /tmp/Makefile.in Tue Sep 22 15:45:26 1998 -@@ -68,7 +68,11 @@ - - ELFLIB = lib$(THIS_LIB).so# - ELFLIB_MAJOR = $(ELFLIB).$(ELF_MAJOR_VERSION)# -+.if ${PORTOBJFORMAT} == elf -+ELFLIB_MAJOR_MINOR = $(ELFLIB).$(ELF_MAJOR_VERSION)# -+.else - ELFLIB_MAJOR_MINOR = $(ELFLIB).$(ELF_MAJOR_VERSION).$(ELF_MINOR_VERSION)# -+.endif - - ELFDIR_ELF_LIB = $(ELFDIR)/$(ELFLIB_MAJOR_MINOR)# - diff --git a/devel/libslang/pkg-plist b/devel/libslang/pkg-plist index 527682c3a5a5..9a8f1786ef5a 100644 --- a/devel/libslang/pkg-plist +++ b/devel/libslang/pkg-plist @@ -2,7 +2,7 @@ include/slang.h include/slcurses.h lib/libslang.a lib/libslang.so -lib/libslang.so.1.4 +lib/libslang.so.1 %%PORTDOCS%%share/doc/slang/COPYING %%PORTDOCS%%share/doc/slang/COPYING.ART %%PORTDOCS%%share/doc/slang/COPYING.GPL