From 49a3a7b937722e85f141952c1b16282599b84b84 Mon Sep 17 00:00:00 2001 From: bernd Date: Sun, 8 Jan 2006 10:58:46 +0000 Subject: [PATCH] SHARED_LIBS, USE_LIBTOOL discussed with steven@ "go ahead" steven@ --- devel/physfs/Makefile | 7 +++- devel/physfs/patches/patch-ltmain_sh | 55 ---------------------------- devel/physfs/pkg/PFRAG.shared | 5 ++- 3 files changed, 9 insertions(+), 58 deletions(-) delete mode 100644 devel/physfs/patches/patch-ltmain_sh diff --git a/devel/physfs/Makefile b/devel/physfs/Makefile index d1807012665..a73fc4249be 100644 --- a/devel/physfs/Makefile +++ b/devel/physfs/Makefile @@ -1,7 +1,11 @@ -# $OpenBSD: Makefile,v 1.3 2004/11/24 00:11:03 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2006/01/08 10:58:46 bernd Exp $ COMMENT= "library to provide abstract access to various archives" DISTNAME= physfs-1.0.0 +PKGNAME= ${DISTNAME}p0 +SHARED_LIBS= physfs-1.0 0.0 \ + physfs 0.0 + CATEGORIES= devel MASTER_SITES= ${HOMEPAGE}downloads/ @@ -16,6 +20,7 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes WANTLIB= c curses pthread readline z +USE_LIBTOOL= Yes CONFIGURE_STYLE=gnu .include diff --git a/devel/physfs/patches/patch-ltmain_sh b/devel/physfs/patches/patch-ltmain_sh deleted file mode 100644 index 117f12cd8ab..00000000000 --- a/devel/physfs/patches/patch-ltmain_sh +++ /dev/null @@ -1,55 +0,0 @@ -$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/10/26 00:16:28 jolan Exp $ ---- ltmain.sh.orig 2003-07-22 23:07:35.000000000 -0500 -+++ ltmain.sh 2003-10-21 02:07:22.000000000 -0500 -@@ -4191,8 +4191,8 @@ relink_command=\"$relink_command\"" - for linkname - do - if test "$linkname" != "$realname"; then -- $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" -- $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)" -+ $show "(cd $destdir && $rm $linkname && $mv $realname $linkname)" -+ $run eval "(cd $destdir && $rm $linkname && $mv $realname $linkname)" - fi - done - fi -@@ -4446,40 +4446,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 - ;; - diff --git a/devel/physfs/pkg/PFRAG.shared b/devel/physfs/pkg/PFRAG.shared index e0569aefa75..69b326f6a4f 100644 --- a/devel/physfs/pkg/PFRAG.shared +++ b/devel/physfs/pkg/PFRAG.shared @@ -1,2 +1,3 @@ -@comment $OpenBSD: PFRAG.shared,v 1.3 2004/08/10 08:36:46 espie Exp $ -@lib lib/libphysfs.so.0.0 +@comment $OpenBSD: PFRAG.shared,v 1.4 2006/01/08 10:58:46 bernd Exp $ +@lib lib/libphysfs-1.0.so.${LIBphysfs-1.0_VERSION} +@lib lib/libphysfs.so.${LIBphysfs_VERSION}