From c51aeee32a7ad113bc8539d7e835f61d4d28d450 Mon Sep 17 00:00:00 2001 From: brad Date: Sun, 11 Jan 2004 07:05:31 +0000 Subject: [PATCH] remove shared lib inter-library dependency on libm and libcurses --- devel/libslang/Makefile | 4 +-- .../patches/patch-autoconf_aclocal_m4 | 30 +++++++++---------- .../patches/patch-autoconf_configure.in | 6 ++-- devel/libslang/pkg/PFRAG.shared | 6 ++-- 4 files changed, 24 insertions(+), 22 deletions(-) diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile index b2947531268..07f4fb76a07 100644 --- a/devel/libslang/Makefile +++ b/devel/libslang/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.36 2003/08/13 23:41:02 naddy Exp $ +# $OpenBSD: Makefile,v 1.37 2004/01/11 07:05:31 brad Exp $ COMMENT= "stack-based interpreter for terminal applications" VERSION= 1.4.9 DISTNAME= slang-${VERSION} -PKGNAME= libslang-${VERSION} +PKGNAME= libslang-${VERSION}p1 CATEGORIES= devel MASTER_SITES= ftp://space.mit.edu/pub/davis/slang/v1.4/ \ http://gd.tuwien.ac.at/editors/davis/slang/v1.4/ diff --git a/devel/libslang/patches/patch-autoconf_aclocal_m4 b/devel/libslang/patches/patch-autoconf_aclocal_m4 index 4d8da495d9d..fba42d031f3 100644 --- a/devel/libslang/patches/patch-autoconf_aclocal_m4 +++ b/devel/libslang/patches/patch-autoconf_aclocal_m4 @@ -1,20 +1,19 @@ -$OpenBSD: patch-autoconf_aclocal_m4,v 1.2 2002/10/19 03:07:28 brad Exp $ ---- autoconf/aclocal.m4.orig Mon Oct 7 16:36:22 2002 -+++ autoconf/aclocal.m4 Fri Oct 18 22:35:10 2002 -@@ -68,7 +68,7 @@ dnl# determine whether or not -R or -rpa - AC_DEFUN(JD_INIT_RPATH, - [ - case "$host_os" in -- *linux*|*solaris* ) -+ *linux*|*solaris*|*openbsd* ) +$OpenBSD: patch-autoconf_aclocal_m4,v 1.3 2004/01/11 07:05:31 brad Exp $ +--- autoconf/aclocal.m4.orig 2003-03-23 02:06:40.000000000 -0500 ++++ autoconf/aclocal.m4 2004-01-10 23:27:34.000000000 -0500 +@@ -86,7 +86,7 @@ case "$host_os" in + fi + fi + ;; +- *osf*) ++ *osf* | *openbsd*) if test "X$GCC" = Xyes then - if test "X$ac_R_nospace" = "Xno" -@@ -566,6 +566,25 @@ case "$host_os" in - ELFLIB="lib\$(THIS_LIB).dylib" + RPATH="-Wl,-rpath," +@@ -572,6 +572,25 @@ case "$host_os" in ELFLIB_MAJOR="lib\$(THIS_LIB).\$(ELF_MAJOR_VERSION).dylib" ELFLIB_MAJOR_MINOR="lib\$(THIS_LIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION).dylib" -+ ;; + ;; + *openbsd* ) + DYNAMIC_LINK_FLAGS="" + ELF_CC="$CC" @@ -28,11 +27,12 @@ $OpenBSD: patch-autoconf_aclocal_m4,v 1.2 2002/10/19 03:07:28 brad Exp $ + esac + ELF_LINK="$CC -shared $ELF_CFLAGS" + ELF_LINK_CMD="\$(ELF_LINK)" -+ ELF_DEP_LIBS="\$(DL_LIB) -lm -lcurses" ++ ELF_DEP_LIBS= + CC_SHARED="$CC -shared $ELF_CFLAGS" + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then + DYNAMIC_LINK_FLAGS="-Wl,-E" + fi - ;; ++ ;; * ) echo "Note: ELF compiler for host_os=$host_os may be wrong" + ELF_CC="$CC" diff --git a/devel/libslang/patches/patch-autoconf_configure.in b/devel/libslang/patches/patch-autoconf_configure.in index 46464ed39fe..d525d9a86ee 100644 --- a/devel/libslang/patches/patch-autoconf_configure.in +++ b/devel/libslang/patches/patch-autoconf_configure.in @@ -1,6 +1,6 @@ ---- autoconf/configure.in.orig Mon Oct 7 16:36:22 2002 -+++ autoconf/configure.in Fri Oct 18 22:31:58 2002 -@@ -106,7 +106,8 @@ slang_minor_version=`echo $slang_version +--- autoconf/configure.in.orig 2003-03-23 02:06:40.000000000 -0500 ++++ autoconf/configure.in 2004-01-10 23:16:55.000000000 -0500 +@@ -107,7 +107,8 @@ slang_minor_version=`echo $slang_version slang_mminor_version=`echo $slang_version $slang_major_version $slang_minor_version | awk '{ print ([$]1 - [$]2*10000 - [$]3*100) }'` diff --git a/devel/libslang/pkg/PFRAG.shared b/devel/libslang/pkg/PFRAG.shared index 1746239d78b..f92680a0795 100644 --- a/devel/libslang/pkg/PFRAG.shared +++ b/devel/libslang/pkg/PFRAG.shared @@ -1,3 +1,5 @@ -@comment $OpenBSD: PFRAG.shared,v 1.8 2003/05/14 04:52:27 naddy Exp $ +@comment $OpenBSD: PFRAG.shared,v 1.9 2004/01/11 07:05:31 brad Exp $ +@comment lib/libslang.so +@comment lib/libslang.so.14 lib/libslang.so.14.9 -DYNLIBDIR(%B) +DYNLIBDIR(%D/lib)