Date: 29 Oct 2002 22:19:55 -0000 From: Sergei Kolobov <sergei@kolobov.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: xaa+ports@madison-gurkha.com Subject: ports/44713: [PATCH] Unbreak devel/libslang by updating to 1.4.6 Message-ID: <20021029221955.85955.qmail@outpost.globcon.net>
next in thread | raw e-mail | index | archive | help
>Number: 44713 >Category: ports >Synopsis: [PATCH] Unbreak devel/libslang by updating to 1.4.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Oct 29 14:20:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: Sergei Kolobov >Release: FreeBSD 4.6-STABLE i386 >Organization: >Environment: System: FreeBSD outpost.globcon.net 4.7-STABLE FreeBSD 4.7-STABLE #0: Mon Oct 14 02:23:23 MSD 2002 sgk@outpost.globcon.net:/data/FreeBSD/obj/data/FreeBSD/src/sys/OUTPOST i386 >Description: devel/libslang is currently broken due to checksum errors (distfile changed?). Unbreak by updating to the latest (1.4.6) version. - Update to 1.4.6 - Regenerate patch-aa (Port maintainer has been copied). >How-To-Repeat: >Fix: --- libslang-1.4.6.patch begins here --- diff -ruN /data/FreeBSD/ports/devel/libslang/Makefile /home/sgk/ports/devel/libslang/Makefile --- /data/FreeBSD/ports/devel/libslang/Makefile Sun Feb 17 23:45:49 2002 +++ /home/sgk/ports/devel/libslang/Makefile Tue Oct 29 23:21:12 2002 @@ -6,7 +6,7 @@ # PORTNAME= libslang -PORTVERSION= 1.4.5 +PORTVERSION= 1.4.6 CATEGORIES= devel MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/ DISTNAME= slang-${PORTVERSION} diff -ruN /data/FreeBSD/ports/devel/libslang/distinfo /home/sgk/ports/devel/libslang/distinfo --- /data/FreeBSD/ports/devel/libslang/distinfo Sun Feb 17 23:45:49 2002 +++ /home/sgk/ports/devel/libslang/distinfo Tue Oct 29 23:23:49 2002 @@ -1 +1 @@ -MD5 (slang-1.4.5.tar.bz2) = 380f5d0c306b70125a110f54814e26a3 +MD5 (slang-1.4.6.tar.bz2) = a69e9ba14f975d9be85af135017d98f1 diff -ruN /data/FreeBSD/ports/devel/libslang/files/patch-aa /home/sgk/ports/devel/libslang/files/patch-aa --- /data/FreeBSD/ports/devel/libslang/files/patch-aa Sun Feb 17 23:45:51 2002 +++ /home/sgk/ports/devel/libslang/files/patch-aa Wed Oct 30 04:06:03 2002 @@ -1,67 +1,28 @@ ---- 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:1837: checking for dlopen in -ldl" >&5 -+ echo $ac_n "checking for dlopenl""... $ac_c" 1>&6 -+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 -@@ -1868,7 +1868,7 @@ - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 - -- DYNAMIC_LINK_LIB="-ldl" -+ DYNAMIC_LINK_LIB="" - cat >> confdefs.h <<\EOF - #define HAVE_DLOPEN 1 - EOF -@@ -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)" -- ELF_DEP_LIBS="\$(DL_LIB) -lm -lc" -+ ELF_DEP_LIBS="\$(DL_LIB) -lm" - CC_SHARED="$CC $CFLAGS -shared -fPIC" - esac - -@@ -2063,6 +2063,19 @@ - IEEE_CFLAGS="-ieee_with_no_inexact" - fi - ;; -+ *freebsd* ) +--- configure.orig Wed Oct 30 03:37:23 2002 ++++ configure Wed Oct 30 03:56:57 2002 +@@ -2033,6 +2033,18 @@ + ELFLIB_MAJOR="lib\$(THIS_LIB).\$(ELF_MAJOR_VERSION).dylib" + ELFLIB_MAJOR_MINOR="lib\$(THIS_LIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION).dylib" + ;; ++ *freebsd* ) ++ ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION)" ++ ELF_CC="\$(CC)" ++ ELF_CFLAGS="\$(CFLAGS) -fPIC" + if [ $PORTOBJFORMAT = elf ]; then -+ ELF_CC="\$(CC)" -+ ELF_CFLAGS="\$(CFLAGS) -fPIC" + ELF_LINK="\$(CC) -shared -Wl,-soname,\$(ELFLIB_MAJOR)" -+ ELF_LINK_CMD="\$(ELF_LINK)" + else -+ ELF_CC="\$(CC)" -+ ELF_CFLAGS="\$(CFLAGS) -fPIC" + ELF_LINK="ld -Bshareable -x" -+ ELF_LINK_CMD="\$(ELF_LINK)" + fi ++ ELF_LINK_CMD="\$(ELF_LINK)" ++ ELF_DEP_LIBS="\$(DL_LIB) -lm" + ;; * ) - IEEE_CFLAGS="" - esac -@@ -2432,16 +2445,8 @@ + echo "Note: ELF compiler for host_os=$host_os may be wrong" + ELF_CC="$CC" +@@ -2438,16 +2489,8 @@ echo $ac_n "checking SLANG_VERSION""... $ac_c" 1>&6 - echo "configure:2435: checking SLANG_VERSION" >&5 + echo "configure:2441: checking SLANG_VERSION" >&5 -slang_version=`grep "^#define *SLANG_VERSION " $srcdir/src/slang.h | - awk '{ print $3 }'` -slang_major_version=`echo $slang_version | @@ -73,7 +34,7 @@ - -slang_minor_version="$slang_minor_version.$slang_mminor_version" +slang_major_version=1 -+slang_miner_version=5 ++slang_minor_version=5 slang_version="$slang_major_version.$slang_minor_version" echo "$ac_t""$slang_version" 1>&6 --- libslang-1.4.6.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021029221955.85955.qmail>