From 3f2165e10c9afd47cb59b4657c232d675379b676 Mon Sep 17 00:00:00 2001
From: bernd <bernd@openbsd.org>
Date: Sat, 7 Jan 2006 14:19:29 +0000
Subject: [PATCH] - SHARED_LIBS - regen patches while I'm here

---
 devel/libslang/Makefile                       |  9 +++++--
 .../patches/patch-autoconf_aclocal_m4         | 25 +++++++++++++------
 ...nfigure.in => patch-autoconf_configure_in} |  0
 ...-src_Makefile.in => patch-src_Makefile_in} |  0
 devel/libslang/pkg/PFRAG.shared               |  6 ++---
 5 files changed, 27 insertions(+), 13 deletions(-)
 rename devel/libslang/patches/{patch-autoconf_configure.in => patch-autoconf_configure_in} (100%)
 rename devel/libslang/patches/{patch-src_Makefile.in => patch-src_Makefile_in} (100%)

diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 5452d3f8a2c..8264697ce7f 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,10 +1,12 @@
-# $OpenBSD: Makefile,v 1.43 2005/11/03 18:28:55 naddy Exp $
+# $OpenBSD: Makefile,v 1.44 2006/01/07 14:19:29 bernd Exp $
 
 COMMENT=	"stack-based interpreter for terminal applications"
 
 VERSION=	1.4.9
 DISTNAME=	slang-${VERSION}
-PKGNAME=	libslang-${VERSION}p2
+PKGNAME=	libslang-${VERSION}p3
+SHARED_LIBS=	slang 14.9
+
 CATEGORIES=	devel
 MASTER_SITES=	ftp://space.mit.edu/pub/davis/slang/v1.4/ \
 		http://gd.tuwien.ac.at/editors/davis/slang/v1.4/
@@ -24,6 +26,9 @@ MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/autoconf
 REGRESS_TARGET=		runtests
 REGRESS_FLAGS=		TCAPLIB="-ltermlib"
 
+MAKE_ENV=		LIBslang_MAJOR=${LIBslang_VERSION:R} \
+			LIBslang_MINOR=${LIBslang_VERSION:E}
+
 pre-patch:
 .for f in aclocal.m4 configure.in
 	@cd ${WRKSRC} && ln -sf autoconf/${f} ${f}
diff --git a/devel/libslang/patches/patch-autoconf_aclocal_m4 b/devel/libslang/patches/patch-autoconf_aclocal_m4
index fba42d031f3..bc3af512d1f 100644
--- a/devel/libslang/patches/patch-autoconf_aclocal_m4
+++ b/devel/libslang/patches/patch-autoconf_aclocal_m4
@@ -1,6 +1,6 @@
-$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
+$OpenBSD: patch-autoconf_aclocal_m4,v 1.4 2006/01/07 14:19:29 bernd Exp $
+--- autoconf/aclocal.m4.orig	Sun Mar 23 08:06:40 2003
++++ autoconf/aclocal.m4	Sat Jan  7 14:36:59 2006
 @@ -86,7 +86,7 @@ case "$host_os" in
        fi
      fi
@@ -10,10 +10,22 @@ $OpenBSD: patch-autoconf_aclocal_m4,v 1.3 2004/01/11 07:05:31 brad Exp $
      if test "X$GCC" = Xyes
      then
        RPATH="-Wl,-rpath,"
-@@ -572,6 +572,25 @@ case "$host_os" in
+@@ -482,8 +482,8 @@ AC_CHECK_HEADER(dlfcn.h,[
+ AC_SUBST(DYNAMIC_LINK_LIB)
+ 
+ ELFLIB="lib\$(THIS_LIB).so"
+-ELFLIB_MAJOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION)"
+-ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(ELF_MAJOR_VERSION).\$(ELF_MINOR_VERSION)"
++ELFLIB_MAJOR="\$(ELFLIB).\$(LIBslang_MAJOR)"
++ELFLIB_MAJOR_MINOR="\$(ELFLIB).\$(LIBslang_MAJOR).\$(LIBslang_MINOR)"
+ 
+ case "$host_os" in
+   *linux* )
+@@ -571,6 +571,25 @@ case "$host_os" in
+      ELFLIB="lib\$(THIS_LIB).dylib"
       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"
@@ -32,7 +44,6 @@ $OpenBSD: patch-autoconf_aclocal_m4,v 1.3 2004/01/11 07:05:31 brad Exp $
 +     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
similarity index 100%
rename from devel/libslang/patches/patch-autoconf_configure.in
rename to devel/libslang/patches/patch-autoconf_configure_in
diff --git a/devel/libslang/patches/patch-src_Makefile.in b/devel/libslang/patches/patch-src_Makefile_in
similarity index 100%
rename from devel/libslang/patches/patch-src_Makefile.in
rename to devel/libslang/patches/patch-src_Makefile_in
diff --git a/devel/libslang/pkg/PFRAG.shared b/devel/libslang/pkg/PFRAG.shared
index 8a970de78d0..292b073ec36 100644
--- a/devel/libslang/pkg/PFRAG.shared
+++ b/devel/libslang/pkg/PFRAG.shared
@@ -1,4 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.10 2004/08/10 00:52:44 espie Exp $
-@comment lib/libslang.so
-@comment lib/libslang.so.14
-@lib lib/libslang.so.14.9
+@comment $OpenBSD: PFRAG.shared,v 1.11 2006/01/07 14:19:29 bernd Exp $
+@lib lib/libslang.so.${LIBslang_VERSION}