SHARED_LIBS and USE_LIBTOOL

devel/popt/Makefile

@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2003/07/15 16:50:22 jolan Exp $
+# $OpenBSD: Makefile,v 1.13 2006/01/06 18:52:12 steven Exp $
 
 COMMENT=		"getopt(3)-like library with a number of enhancements"
 
 DISTNAME=		popt-1.7
+PKGNAME=		${DISTNAME}p0
+SHARED_LIBS=		popt 0.3
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ \
 			ftp://ftp.mirror.ac.uk/sites/ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/
@@ -16,6 +18,7 @@ PERMIT_DISTFILES_FTP=	Yes
 MAKE_FLAGS=		libpopt_la_LDFLAGS="-version-info 0:3"
 
 USE_GMAKE=		Yes
+USE_LIBTOOL=		Yes
 SEPARATE_BUILD=		concurrent
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED}

devel/popt/patches/patch-ltmain_sh

@@ -1,72 +0,0 @@
-$OpenBSD: patch-ltmain_sh,v 1.1 2003/07/15 16:50:22 jolan Exp $
---- ltmain.sh.orig	Sat Jun 21 22:42:02 2003
-+++ ltmain.sh	Sat Jun 21 22:43:28 2003
-@@ -1073,6 +1073,17 @@ compiler."
- 	continue
- 	;;
- 
-+      -pthread)
-+	case $host in
-+	*-*-openbsd*)
-+	  deplibs="$deplibs $arg"
-+	  ;;
-+	*)
-+	  continue
-+	  ;;
-+	esac
-+	;;
-+
-       -module)
- 	module=yes
- 	continue
-@@ -1530,6 +1541,9 @@ compiler."
- 	  fi
- 	  continue
- 	  ;;
-+	-pthread)
-+	  continue
-+	  ;;
- 	%DEPLIBS%)
- 	  alldeplibs=yes
- 	  continue
-@@ -4526,40 +4540,6 @@ relink_command=\"$relink_command\""
-     # Exit here if they wanted silent mode.
-     test "$show" = : && exit 0
- 
--    echo "----------------------------------------------------------------------"
--    echo "Libraries have been installed in:"
--    for libdir in $libdirs; do
--      echo "   $libdir"
--    done
--    echo
--    echo "If you ever happen to want to link against installed libraries"
--    echo "in a given directory, LIBDIR, you must either use libtool, and"
--    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
--    echo "flag during linking and do at least one of the following:"
--    if test -n "$shlibpath_var"; then
--      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
--      echo "     during execution"
--    fi
--    if test -n "$runpath_var"; then
--      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
--      echo "     during linking"
--    fi
--    if test -n "$hardcode_libdir_flag_spec"; then
--      libdir=LIBDIR
--      eval flag=\"$hardcode_libdir_flag_spec\"
--
--      echo "   - use the \`$flag' linker flag"
--    fi
--    if test -n "$admincmds"; then
--      echo "   - have your system administrator run these commands:$admincmds"
--    fi
--    if test -f /etc/ld.so.conf; then
--      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
--    fi
--    echo
--    echo "See any operating system documentation about shared libraries for"
--    echo "more information, such as the ld(1) and ld.so(8) manual pages."
--    echo "----------------------------------------------------------------------"
-     exit 0
-     ;;
- 

devel/popt/pkg/PFRAG.shared

@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.4 2004/08/10 09:43:46 espie Exp $
-@lib lib/libpopt.so.0.3
+@comment $OpenBSD: PFRAG.shared,v 1.5 2006/01/06 18:52:12 steven Exp $
+@lib lib/libpopt.so.${LIBpopt_VERSION}

devel/pth/Makefile

@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.12 2005/07/28 17:49:27 aanriot Exp $
+# $OpenBSD: Makefile,v 1.13 2006/01/06 18:52:12 steven Exp $
 
 COMMENT=	"GNU portable threads"
 
 DISTNAME=	pth-2.0.4
+PKGNAME=	${DISTNAME}p0
+SHARED_LIBS=	pth 20.24
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=pth/}
 
@@ -13,6 +15,8 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
+USE_LIBTOOL=	Yes
+
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
 CONFIGURE_ARGS+= --enable-static \

devel/pth/pkg/PFRAG.shared

@@ -1,2 +1,2 @@
-@comment $OpenBSD: PFRAG.shared,v 1.7 2005/07/28 17:49:27 aanriot Exp $
-@lib lib/libpth.so.20.24
+@comment $OpenBSD: PFRAG.shared,v 1.8 2006/01/06 18:52:12 steven Exp $
+@lib lib/libpth.so.${LIBpth_VERSION}