From b6b9bdd87176defd51447a530af41f1b6ee07117 Mon Sep 17 00:00:00 2001 From: steven Date: Fri, 6 Jan 2006 08:36:18 +0000 Subject: [PATCH] SHARED_LIBS, USE_LIBTOOL where necessary --- devel/sdl-gfx/Makefile | 6 +- devel/sdl-gfx/pkg/PFRAG.shared | 4 +- devel/sdl-image/Makefile | 3 +- devel/sdl-image/pkg/PFRAG.shared | 4 +- devel/sdl-mixer/Makefile | 3 +- devel/sdl-mixer/pkg/PFRAG.shared | 4 +- devel/sdl-net/Makefile | 6 +- devel/sdl-net/pkg/PFRAG.shared | 4 +- devel/sdl-sound/Makefile | 6 +- devel/sdl-sound/patches/patch-Makefile_in | 11 +++ devel/sdl-sound/patches/patch-ltmain_sh | 95 ----------------------- devel/sdl-sound/pkg/PFRAG.shared | 4 +- devel/sdl-ttf/Makefile | 6 +- devel/sdl-ttf/pkg/PFRAG.shared | 4 +- 14 files changed, 43 insertions(+), 117 deletions(-) create mode 100644 devel/sdl-sound/patches/patch-Makefile_in delete mode 100644 devel/sdl-sound/patches/patch-ltmain_sh diff --git a/devel/sdl-gfx/Makefile b/devel/sdl-gfx/Makefile index c972e73796b..d878feeb6a7 100644 --- a/devel/sdl-gfx/Makefile +++ b/devel/sdl-gfx/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.5 2004/09/28 01:36:32 jolan Exp $ +# $OpenBSD: Makefile,v 1.6 2006/01/06 08:36:18 steven Exp $ COMMENT= "primitives drawing/other support functions for SDL" DISTNAME= SDL_gfx-2.0.12 -PKGNAME= ${DISTNAME:L:S/_/-/} +PKGNAME= ${DISTNAME:L:S/_/-/}p0 +SHARED_LIBS= SDL_gfx 11.0 CATEGORIES= devel graphics x11 MASTER_SITES= ${HOMEPAGE} @@ -14,6 +15,7 @@ PERMIT_DISTFILES_FTP= Yes PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes +USE_LIBTOOL= Yes USE_GMAKE= Yes USE_X11= Yes diff --git a/devel/sdl-gfx/pkg/PFRAG.shared b/devel/sdl-gfx/pkg/PFRAG.shared index 697fe1bc018..f8b2eecef76 100644 --- a/devel/sdl-gfx/pkg/PFRAG.shared +++ b/devel/sdl-gfx/pkg/PFRAG.shared @@ -1,2 +1,2 @@ -@comment $OpenBSD: PFRAG.shared,v 1.5 2004/08/10 09:43:46 espie Exp $ -@lib lib/libSDL_gfx.so.11.0 +@comment $OpenBSD: PFRAG.shared,v 1.6 2006/01/06 08:36:18 steven Exp $ +@lib lib/libSDL_gfx.so.${LIBSDL_gfx_VERSION} diff --git a/devel/sdl-image/Makefile b/devel/sdl-image/Makefile index a48ef458e96..00c4f5cef82 100644 --- a/devel/sdl-image/Makefile +++ b/devel/sdl-image/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.17 2005/07/03 21:35:57 jolan Exp $ +# $OpenBSD: Makefile,v 1.18 2006/01/06 08:36:18 steven Exp $ COMMENT= "SDL image library" DISTNAME= SDL_image-1.2.4 PKGNAME= ${DISTNAME:L:S/_/-/} +SHARED_LIBS= SDL_image 1.3 CATEGORIES= devel graphics MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/ diff --git a/devel/sdl-image/pkg/PFRAG.shared b/devel/sdl-image/pkg/PFRAG.shared index b67e23673fe..d815960aa2e 100644 --- a/devel/sdl-image/pkg/PFRAG.shared +++ b/devel/sdl-image/pkg/PFRAG.shared @@ -1,2 +1,2 @@ -@comment $OpenBSD: PFRAG.shared,v 1.6 2005/07/03 21:35:57 jolan Exp $ -@lib lib/libSDL_image.so.1.3 +@comment $OpenBSD: PFRAG.shared,v 1.7 2006/01/06 08:36:18 steven Exp $ +@lib lib/libSDL_image.so.${LIBSDL_image_VERSION} diff --git a/devel/sdl-mixer/Makefile b/devel/sdl-mixer/Makefile index 012b12a5b6a..299c748d319 100644 --- a/devel/sdl-mixer/Makefile +++ b/devel/sdl-mixer/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.24 2005/09/10 18:18:41 espie Exp $ +# $OpenBSD: Makefile,v 1.25 2006/01/06 08:36:18 steven Exp $ COMMENT= "SDL multi-channel audio mixer library" DISTNAME= SDL_mixer-1.2.6 PKGNAME= ${DISTNAME:L:S/_/-/}p1 +SHARED_LIBS= SDL_mixer 2.4 CATEGORIES= devel audio MASTER_SITES= ${HOMEPAGE}release/ diff --git a/devel/sdl-mixer/pkg/PFRAG.shared b/devel/sdl-mixer/pkg/PFRAG.shared index f690611ae13..935995a6190 100644 --- a/devel/sdl-mixer/pkg/PFRAG.shared +++ b/devel/sdl-mixer/pkg/PFRAG.shared @@ -1,2 +1,2 @@ -@comment $OpenBSD: PFRAG.shared,v 1.6 2005/07/03 21:36:35 jolan Exp $ -@lib lib/libSDL_mixer.so.2.4 +@comment $OpenBSD: PFRAG.shared,v 1.7 2006/01/06 08:36:18 steven Exp $ +@lib lib/libSDL_mixer.so.${LIBSDL_mixer_VERSION} diff --git a/devel/sdl-net/Makefile b/devel/sdl-net/Makefile index f697e19456d..511ea0bd85b 100644 --- a/devel/sdl-net/Makefile +++ b/devel/sdl-net/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.14 2004/11/24 00:11:03 espie Exp $ +# $OpenBSD: Makefile,v 1.15 2006/01/06 08:36:18 steven Exp $ COMMENT= "SDL cross-platform networking library" DISTNAME= SDL_net-1.2.5 -PKGNAME= ${DISTNAME:L:S/_/-/} +PKGNAME= ${DISTNAME:L:S/_/-/}p0 +SHARED_LIBS= SDL_net 0.5 CATEGORIES= devel net MASTER_SITES= http://www.libsdl.org/projects/SDL_net/release/ @@ -21,6 +22,7 @@ WANTLIB= X11 Xext usbhid LIB_DEPENDS= SDL::devel/sdl USE_X11= Yes +USE_LIBTOOL= Yes SEPARATE_BUILD= concurrent CONFIGURE_STYLE= gnu diff --git a/devel/sdl-net/pkg/PFRAG.shared b/devel/sdl-net/pkg/PFRAG.shared index 682a7b7ab2d..48ab27f45ea 100644 --- a/devel/sdl-net/pkg/PFRAG.shared +++ b/devel/sdl-net/pkg/PFRAG.shared @@ -1,2 +1,2 @@ -@comment $OpenBSD: PFRAG.shared,v 1.6 2004/09/14 23:44:01 espie Exp $ -@lib lib/libSDL_net.so.0.5 +@comment $OpenBSD: PFRAG.shared,v 1.7 2006/01/06 08:36:18 steven Exp $ +@lib lib/libSDL_net.so.${LIBSDL_net_VERSION} diff --git a/devel/sdl-sound/Makefile b/devel/sdl-sound/Makefile index 906378efa55..9ffd51e16a5 100644 --- a/devel/sdl-sound/Makefile +++ b/devel/sdl-sound/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.3 2004/11/24 00:11:04 espie Exp $ +# $OpenBSD: Makefile,v 1.4 2006/01/06 08:36:18 steven Exp $ COMMENT= "library that handles the decoding of sound file formats" DISTNAME= SDL_sound-1.0.1 -PKGNAME= ${DISTNAME:L:S/_/-/}p0 +PKGNAME= ${DISTNAME:L:S/_/-/}p1 +SHARED_LIBS= SDL_sound 1.0 CATEGORIES= devel audio MASTER_SITES= ${HOMEPAGE}downloads/ @@ -25,6 +26,7 @@ LIB_DEPENDS+= physfs.0.0::devel/physfs \ FLAC.5.2::audio/flac \ speex.2.2::audio/speex +USE_LIBTOOL= Yes CONFIGURE_STYLE=gnu CONFIGURE_ARGS+=--disable-modplug CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib" diff --git a/devel/sdl-sound/patches/patch-Makefile_in b/devel/sdl-sound/patches/patch-Makefile_in new file mode 100644 index 00000000000..a5797de91b2 --- /dev/null +++ b/devel/sdl-sound/patches/patch-Makefile_in @@ -0,0 +1,11 @@ +$OpenBSD: patch-Makefile_in,v 1.1 2006/01/06 08:36:18 steven Exp $ +--- Makefile.in.orig Fri Jan 6 09:24:05 2006 ++++ Makefile.in Fri Jan 6 09:24:54 2006 +@@ -127,7 +127,6 @@ libSDL_sound_la_SOURCES = \ + @USE_MPGLIB_FALSE@MPGLIB_LIB = + + libSDL_sound_la_LDFLAGS = \ +- -release $(LT_RELEASE) \ + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) + + libSDL_sound_la_LIBADD = \ diff --git a/devel/sdl-sound/patches/patch-ltmain_sh b/devel/sdl-sound/patches/patch-ltmain_sh deleted file mode 100644 index f9e1c1356cc..00000000000 --- a/devel/sdl-sound/patches/patch-ltmain_sh +++ /dev/null @@ -1,95 +0,0 @@ -$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/10/27 03:07:33 jolan Exp $ ---- ltmain.sh.orig 2003-10-12 13:54:54.000000000 -0500 -+++ ltmain.sh 2003-10-25 00:36:34.000000000 -0500 -@@ -1060,6 +1060,17 @@ compiler." - continue - ;; - -+ -pthread) -+ case $host in -+ *-*-openbsd*) -+ deplibs="$deplibs $arg" -+ ;; -+ *) -+ continue -+ ;; -+ esac -+ ;; -+ - -module) - module=yes - continue -@@ -1496,6 +1507,9 @@ compiler." - fi - continue - ;; -+ -pthread) -+ continue -+ ;; - %DEPLIBS%) - alldeplibs=yes - continue -@@ -1737,11 +1751,6 @@ compiler." - continue - fi - -- if test "$installed" = no; then -- notinst_deplibs="$notinst_deplibs $lib" -- need_relink=yes -- fi -- - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names -@@ -4191,8 +4200,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 +4455,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/sdl-sound/pkg/PFRAG.shared b/devel/sdl-sound/pkg/PFRAG.shared index a97cbbf6ee1..1fbd343f638 100644 --- a/devel/sdl-sound/pkg/PFRAG.shared +++ b/devel/sdl-sound/pkg/PFRAG.shared @@ -1,2 +1,2 @@ -@comment $OpenBSD: PFRAG.shared,v 1.2 2004/09/14 23:44:01 espie Exp $ -@lib lib/libSDL_sound.so.1.0 +@comment $OpenBSD: PFRAG.shared,v 1.3 2006/01/06 08:36:18 steven Exp $ +@lib lib/libSDL_sound.so.${LIBSDL_sound_VERSION} diff --git a/devel/sdl-ttf/Makefile b/devel/sdl-ttf/Makefile index 539d75e1dd9..537675ce7ff 100644 --- a/devel/sdl-ttf/Makefile +++ b/devel/sdl-ttf/Makefile @@ -1,9 +1,10 @@ -# $OpenBSD: Makefile,v 1.18 2004/11/24 00:11:04 espie Exp $ +# $OpenBSD: Makefile,v 1.19 2006/01/06 08:36:18 steven Exp $ COMMENT= "SDL TrueType fonts library" DISTNAME= SDL_ttf-2.0.6 -PKGNAME= ${DISTNAME:L:S/_/-/} +PKGNAME= ${DISTNAME:L:S/_/-/}p0 +SHARED_LIBS= SDL_ttf 6.0 CATEGORIES= devel graphics MASTER_SITES= http://www.libsdl.org/projects/SDL_ttf/release/ @@ -21,6 +22,7 @@ WANTLIB= X11 Xext freetype usbhid LIB_DEPENDS= SDL::devel/sdl USE_X11= Yes +USE_LIBTOOL= Yes SEPARATE_BUILD= concurrent CONFIGURE_STYLE= gnu diff --git a/devel/sdl-ttf/pkg/PFRAG.shared b/devel/sdl-ttf/pkg/PFRAG.shared index cdce23889ea..80827481135 100644 --- a/devel/sdl-ttf/pkg/PFRAG.shared +++ b/devel/sdl-ttf/pkg/PFRAG.shared @@ -1,2 +1,2 @@ -@comment $OpenBSD: PFRAG.shared,v 1.6 2004/09/14 23:44:01 espie Exp $ -@lib lib/libSDL_ttf.so.6.0 +@comment $OpenBSD: PFRAG.shared,v 1.7 2006/01/06 08:36:18 steven Exp $ +@lib lib/libSDL_ttf.so.${LIBSDL_ttf_VERSION}