diff --git a/graphics/gii/Makefile b/graphics/gii/Makefile
index 954aac6a58c..adbd0663628 100644
--- a/graphics/gii/Makefile
+++ b/graphics/gii/Makefile
@@ -1,8 +1,16 @@
-# $OpenBSD: Makefile,v 1.26 2005/01/14 19:56:47 todd Exp $
+# $OpenBSD: Makefile,v 1.27 2005/12/27 12:46:51 steven Exp $
 # Uses pthreads
 
 COMMENT=	"General Input Library (used by libggi)"
 DISTNAME=	libgii-0.9.0
+PKGNAME=	${DISTNAME}p0
+SHARED_LIBS=		gg	0.9	\
+			gii	0.9
+MODGNU_SHARED_LIBS=	gg	''	\
+			gii	''
+LIBgg_ALIAS=		realgg
+LIBgii_ALIAS=		realgii
+
 CATEGORIES=	graphics
 
 MAINTAINER=	Todd T. Fries <todd@openbsd.org>
@@ -18,6 +26,7 @@ EXTRACT_SUFX=	.src.tar.bz2
 
 USE_X11=	Yes
 USE_GMAKE=	Yes
+USE_LIBTOOL=	Yes
 
 CFLAGS+=	-pthread
 SEPARATE_BUILD= concurrent
diff --git a/graphics/gii/patches/patch-ltmain_sh b/graphics/gii/patches/patch-ltmain_sh
deleted file mode 100644
index 653184ab604..00000000000
--- a/graphics/gii/patches/patch-ltmain_sh
+++ /dev/null
@@ -1,55 +0,0 @@
---- ltmain.sh.orig	Fri Jan 16 14:01:17 2004
-+++ ltmain.sh	Fri Jan 16 14:03:28 2004
-@@ -1781,11 +1781,6 @@
- 	    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
-@@ -4583,40 +4578,6 @@
-     # 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/graphics/gii/pkg/PFRAG.shared b/graphics/gii/pkg/PFRAG.shared
index 33d1a3d6f6b..b5a3a3ce119 100644
--- a/graphics/gii/pkg/PFRAG.shared
+++ b/graphics/gii/pkg/PFRAG.shared
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PFRAG.shared,v 1.7 2005/01/14 19:56:47 todd Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.8 2005/12/27 12:46:51 steven Exp $
 lib/ggi/filter/keytrans.so
 lib/ggi/filter/mouse.so
 lib/ggi/filter/save.so
@@ -12,5 +12,5 @@ lib/ggi/input/stdin.so
 lib/ggi/input/tcp.so
 lib/ggi/input/x.so
 lib/ggi/input/xwin.so
-@lib lib/libgg.so.0.9
-@lib lib/libgii.so.0.9
+@lib lib/libgg.so.${LIBgg_VERSION}
+@lib lib/libgii.so.${LIBgii_VERSION}