SHARED_LIBS and USE_LIBTOOL

graphics/ggi/Makefile

@@ -1,9 +1,13 @@
-# $OpenBSD: Makefile,v 1.32 2005/01/31 14:20:26 todd Exp $
+# $OpenBSD: Makefile,v 1.33 2005/12/27 13:13:28 steven Exp $
 # Uses pthreads
 
 COMMENT=	"Generic Graphics Library"
 DISTNAME=	libggi-2.1.0
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
+SHARED_LIBS=		ggi	2.1
+MODGNU_SHARED_LIBS=	ggi	''
+LIBggi_ALIAS=		realggi
+
 CATEGORIES=	graphics
 
 HOMEPAGE=	http://www.ggi-project.org/
@@ -22,6 +26,7 @@ LIB_DEPENDS=	gii.0.9,gg:libgii->=0.9*:graphics/gii
 
 USE_X11=	Yes
 USE_GMAKE=	Yes
+USE_LIBTOOL=	Yes
 
 CFLAGS+=	-pthread
 CONFIGURE_STYLE= gnu

graphics/ggi/patches/patch-ggi_Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-ggi_Makefile_in,v 1.1 2005/12/27 13:13:28 steven Exp $
+--- ggi/Makefile.in.orig	Tue Dec 27 13:59:07 2005
++++ ggi/Makefile.in	Tue Dec 27 13:59:34 2005
+@@ -239,7 +239,7 @@ lib_LTLIBRARIES = libggi.la
+ libggi_la_SOURCES = colormap.c db.c dl.c events.c gc.c init.c internal.c \
+ 	mode.c probe.c stubs.c unix.c visual.c
+ 
+-libggi_la_LDFLAGS = $(extra_libraries) -version-info 2:1:0 -no-undefined \
++libggi_la_LDFLAGS = $(extra_libraries) $(librealggi_la_LDFLAGS) -no-undefined \
+ 	-export-symbols $(srcdir)/EXPSYMS
+ 
+ EXTRA_DIST = EXPSYMS

graphics/ggi/patches/patch-ltmain_sh

@@ -1,55 +0,0 @@
---- ltmain.sh.orig	Fri Oct 29 14:53:22 2004
-+++ ltmain.sh	Sun Jan 30 15:23:51 2005
-@@ -1799,11 +1799,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
-@@ -4613,40 +4608,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
-     ;;
- 

graphics/ggi/pkg/PFRAG.shared

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.9 2005/01/14 19:57:05 todd Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.10 2005/12/27 13:13:28 steven Exp $
 lib/ggi/default/color.so
 lib/ggi/default/ilbm.so
 lib/ggi/default/iplanar_2p.so
@@ -36,4 +36,4 @@ lib/ggi/helper/helper_x_dga.so
 lib/ggi/helper/helper_x_evi.so
 lib/ggi/helper/helper_x_shm.so
 lib/ggi/helper/helper_x_vidmode.so
-@lib lib/libggi.so.2.1
+@lib lib/libggi.so.${LIBggi_VERSION}