fix extra libs, use_libtool, switch to m4 -g and bump

x11/gnomemm/Makefile

@@ -1,10 +1,11 @@
-# $OpenBSD: Makefile,v 1.9 2004/12/18 21:55:16 alek Exp $
+# $OpenBSD: Makefile,v 1.10 2005/11/20 13:29:19 wilfried Exp $
 
 COMMENT=		"C++ interface for the GNOME libraries"
 COMMENT-docs=		"C++ interface for the GNOME libraries documentation"
 
 VERSION=		1.2.3
 DISTNAME=		gnomemm-${VERSION}
+PKGNAME=		${DISTNAME}p0
 PKGNAME-docs=		gnomemm-docs-${VERSION}
 CATEGORIES=		devel x11
 
@@ -23,12 +24,12 @@ MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gtkmm/}
 MULTI_PACKAGES=		-docs
 SUBPACKAGE?=
 
-BUILD_DEPENDS=		gm4::devel/m4
 .if ${SUBPACKAGE} != "-docs"
-LIB_DEPENDS=		gdkmm.2,gtkmm.2::x11/gtkmm \
+MODULES=		devel/gettext
+LIB_DEPENDS=		::x11/gtkmm \
 			art_lgpl.4,gnome.36,gnomesupport.0,gnomeui.46::x11/gnome/libs
-WANTLIB=		ICE SM X11 Xext Xi audiofile c esd gdk gdk_imlib glib \
-			gmodule gtk iconv intl jpeg m png tiff ungif z
+WANTLIB=		ICE SM X11 Xext Xi audiofile esd gdk gdk_imlib glib \
+			gmodule gtk jpeg m png tiff ungif z
 .endif
 .if defined(PACKAGING) && ${SUBPACKAGE} == "-docs"
 PKG_ARCH=		*
@@ -36,12 +37,14 @@ PKG_ARCH=		*
 
 SEPARATE_BUILD=		concurrent
 USE_X11=		Yes
+USE_LIBTOOL=		Yes
 NO_REGRESS=		Yes
 USE_GMAKE=		Yes
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED} \
 			--enable-static \
 			--enable-docs
+CONFIGURE_ENV+=		M4='m4 -g'
 
 MODGNU_CONFIG_GUESS_DIRS=${WRKSRC}/scripts
 

x11/gnomemm/patches/patch-scripts_ltmain_sh

@@ -1,63 +0,0 @@
-# VERSION=1.4 TIMESTAMP=" (1.920 2001/04/24 23:26:18)"
-$OpenBSD: patch-scripts_ltmain_sh,v 1.1 2002/12/17 09:45:44 wilfried Exp $
---- scripts/ltmain.sh.orig	Tue Jul 23 14:11:59 2002
-+++ scripts/ltmain.sh	Mon Dec 16 18:33:31 2002
-@@ -1037,6 +1037,17 @@ compiler."
- 	continue
- 	;;
- 
-+      -pthread)
-+	case $host in
-+	*-*-openbsd*)
-+	  deplibs="$deplibs $arg"
-+	  ;;
-+	*)
-+	  continue
-+	  ;;
-+	esac
-+	;;
-+
-       -module)
- 	module=yes
- 	continue
-@@ -4412,40 +4423,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
-     ;;
- 

x11/gnomemm/pkg/PLIST

@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.2 2004/09/15 19:26:29 espie Exp $
+@comment $OpenBSD: PLIST,v 1.3 2005/11/20 13:29:19 wilfried Exp $
 include/gnome--/
 include/gnome--.h
 include/gnome--/about.h
@@ -121,6 +121,5 @@ include/gnome--/types.h
 lib/gnomemmConf.sh
 lib/libgnomemm.a
 lib/libgnomemm.la
-share/aclocal/
 share/aclocal/gnome--.m4
 %%SHARED%%