From ee4e309313a13303eaef7bd94c12c920797bb296 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Wed, 19 Sep 2001 14:37:49 +0000
Subject: [PATCH] - fix message catalog installation - sync libtool patches -
 UVM is no longer an option - remove useless install message - add RCS Ids,
 clean up

---
 devel/libgtop/Makefile                        | 11 +--
 devel/libgtop/patches/patch-configure         | 14 ++++
 devel/libgtop/patches/patch-ltconfig          | 66 +++++++++++++-----
 devel/libgtop/patches/patch-ltmain.sh         | 48 ++++++-------
 devel/libgtop/patches/patch-po_Makefile_in_in | 67 +++++++++++++++++++
 .../patches/patch-support_gnomesupport.h      |  2 +-
 .../patches/patch-sysdeps_freebsd_mem.c       |  1 +
 .../patches/patch-sysdeps_freebsd_procmap.c   |  1 +
 .../patches/patch-sysdeps_freebsd_procmem.c   |  1 +
 .../patches/patch-sysdeps_freebsd_swap.c      |  1 +
 devel/libgtop/pkg/MESSAGE                     |  6 --
 devel/libgtop/pkg/PFRAG.shared                |  4 +-
 devel/libgtop/pkg/PLIST                       | 26 ++++++-
 13 files changed, 187 insertions(+), 61 deletions(-)
 create mode 100644 devel/libgtop/patches/patch-configure
 create mode 100644 devel/libgtop/patches/patch-po_Makefile_in_in
 delete mode 100644 devel/libgtop/pkg/MESSAGE

diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index ec5dca2af7f..8a15d085015 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.3 2001/09/14 14:41:29 todd Exp $
+# $OpenBSD: Makefile,v 1.4 2001/09/19 14:37:49 naddy Exp $
 
 COMMENT=		"portable library for obtaining system information"
 V=			1.0.12
@@ -24,7 +24,7 @@ PERMIT_DISTFILES_FTP=	Yes
 USE_GMAKE=		Yes
 CONFIGURE_STYLE= 	gnu
 CONFIGURE_ARGS+= 	${CONFIGURE_SHARED}
-CONFIGURE_ENV=  	CPPFLAGS="-I${LOCALBASE}/include -DUVM" \
+CONFIGURE_ENV=  	CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib"
 
 .if ${FLAVOR:L:Mgnome}
@@ -41,11 +41,4 @@ CONFIGURE_ARGS+=	--with-libgtop-guile=yes
 CONFIGURE_ARGS+=	--with-libgtop-guile=no
 .endif
 
-pre-fetch:
-        @echo \
-        echo "  WARNING: This application requires a kernel compiled" \
-        echo "  with 'option UVM' for proper operation.  The GENERIC" \
-        echo "  kernel contains this option." \
-        echo
-
 .include <bsd.port.mk>
diff --git a/devel/libgtop/patches/patch-configure b/devel/libgtop/patches/patch-configure
new file mode 100644
index 00000000000..293aa832f80
--- /dev/null
+++ b/devel/libgtop/patches/patch-configure
@@ -0,0 +1,14 @@
+$OpenBSD: patch-configure,v 1.1 2001/09/19 14:37:49 naddy Exp $
+--- configure.orig	Tue Feb 27 14:25:33 2001
++++ configure	Wed Sep 19 16:14:06 2001
+@@ -8334,6 +8334,10 @@ fi
+ 
+ 	   fi
+ 
++	   if test "$gt_cv_func_gettext_libintl" = "yes"; then
++	     LIBS="$LIBS -lintl";
++	   fi
++
+ 	   if test "$gt_cv_func_gettext_libc" = "yes" \
+ 	      || test "$gt_cv_func_gettext_libintl" = "yes"; then
+ 	      cat >> confdefs.h <<\EOF
diff --git a/devel/libgtop/patches/patch-ltconfig b/devel/libgtop/patches/patch-ltconfig
index 2e024dfa463..afb5f12bbe0 100644
--- a/devel/libgtop/patches/patch-ltconfig
+++ b/devel/libgtop/patches/patch-ltconfig
@@ -1,16 +1,34 @@
+$OpenBSD: patch-ltconfig,v 1.2 2001/09/19 14:37:49 naddy Exp $
 --- ltconfig.orig	Sun Nov 12 02:14:53 2000
-+++ ltconfig	Mon Aug 27 17:02:38 2001
-@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
++++ ltconfig	Wed Sep 19 16:06:49 2001
+@@ -501,7 +501,14 @@ fi
+ 
+ if test -n "$RANLIB"; then
+   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+-  old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++  case "$host_os" in 
++  openbsd*) 
++    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++  ;;
++  *)
++    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++  ;;
++  esac
+ fi
+ 
+ # Set sane defaults for `DLLTOOL', `OBJDUMP', and `AS', used on cygwin.
+@@ -1105,7 +1112,9 @@ cygwin* | mingw*)
      with_gnu_ld=no
    fi
    ;;
+-
 +openbsd*)
 +  with_gnu_ld=no
 +  ;;
- 
  esac
  
-@@ -1402,10 +1405,21 @@ else
+ ld_shlibs=yes
+@@ -1402,10 +1411,21 @@ else
      ;;
  
    openbsd*)
@@ -20,32 +38,44 @@
      hardcode_shlibpath_var=no
 +    case "$host_os" in
 +      openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-+       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
-+       hardcode_libdir_flag_spec='-R$libdir'
++	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
++	hardcode_libdir_flag_spec='-R$libdir'
 +      ;;
 +      *)
-+       archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
-+       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+       if [ "`/usr/bin/file /usr/lib/libc.so.* | grep ELF`" != "" ]; then
-+         export_dynamic_flag_spec='${wl}-E'
-+       fi
++	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linkopts'
++	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
++	if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++	  export_dynamic_flag_spec='${wl}-E'
++	fi
 +      ;;
 +    esac
      ;;
  
    os2*)
-@@ -2021,13 +2035,10 @@ netbsd*)
+@@ -2021,9 +2041,23 @@ netbsd*)
  
  openbsd*)
    version_type=sunos
 -  if test "$with_gnu_ld" = yes; then
 -    need_lib_prefix=no
 -    need_version=no
--  fi
++  need_lib_prefix=no
++  need_version=no
++  file_magic_cmd=/usr/bin/file
++  file_magic_test_file=`echo /usr/lib/libc.so.*`
++  if test "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++    deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
++    case "$host_os" in
++    openbsd2.[89] | openbsd2.[89].*)
++      shlibpath_overrides_runpath=no
++    ;;
++    *)
++      shlibpath_overrides_runpath=yes
++    ;;
++    esac
++  else
++    deplibs_check_method='file_magic OpenBSD.* shared library'
++    shlibpath_overrides_runpath=yes
+   fi
    library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-   shlibpath_var=LD_LIBRARY_PATH
-+  deplibs_check_method='pass_all'
-   ;;
- 
- os2*)
diff --git a/devel/libgtop/patches/patch-ltmain.sh b/devel/libgtop/patches/patch-ltmain.sh
index b914fa3b9f7..86cb776d61f 100644
--- a/devel/libgtop/patches/patch-ltmain.sh
+++ b/devel/libgtop/patches/patch-ltmain.sh
@@ -1,45 +1,45 @@
+$OpenBSD: patch-ltmain.sh,v 1.2 2001/09/19 14:37:49 naddy Exp $
 --- ltmain.sh.orig	Sun Nov 12 02:14:53 2000
-+++ ltmain.sh	Mon Aug 27 17:02:38 2001
-@@ -1079,7 +1079,18 @@ compiler."
++++ ltmain.sh	Wed Sep 19 16:06:52 2001
+@@ -1079,6 +1079,17 @@ compiler."
  	    # These systems don't actually have c library (as such)
  	    continue
  	    ;;
-+          *-*-openbsd*)
-+            # Do not include libc due to us having libc/libc_r.
-+            continue
-+            ;;
++	  *-*-openbsd*)
++	    # Do not include libc due to us having libc/libc_r.
++	    continue
++	    ;;
++	  esac
++	elif test "$arg" = "-lc_r"; then
++	  case "$host" in
++	  *-*-openbsd*)
++	    # Do not include libc_r directly, use -pthread flag.
++	    continue
++	    ;;
  	  esac
-+        elif test "$arg" = "-lc_r"; then
-+          case "$host" in
-+          *-*-openbsd*)
-+            # Do not include libc_r directly, use -pthread flag.
-+            continue
-+            ;;
-+          esac
  	elif test "$arg" = "-lm"; then
  	  case "$host" in
- 	  *-*-cygwin* | *-*-beos*)
 @@ -1091,6 +1102,10 @@ compiler."
  	deplibs="$deplibs $arg"
  	;;
  
 +      -?thread)
-+        deplibs="$deplibs $arg"
-+        ;;
++	deplibs="$deplibs $arg"
++	;;
 +
        -module)
  	module=yes
  	continue
-@@ -1799,6 +1814,9 @@ compiler."
+@@ -1795,6 +1810,9 @@ compiler."
+ 	*-*-cygwin* | *-*-mingw* | *-*-os2* | *-*-beos*)
+ 	  # these systems don't actually have a c library (as such)!
+ 	  ;;
++	*-*-openbsd*)
++	  # Do not include libc due to us having libc/libc_r.
++	  ;;
+         *-*-rhapsody*)
  	  # rhapsody is a little odd...
  	  deplibs="$deplibs -framework System"
- 	  ;;
-+        *-*-openbsd*)
-+          # Do not include libc due to us having libc/libc_r.
-+          ;;
- 	*)
- 	  # Add libc to deplibs on all other systems.
- 	  deplibs="$deplibs -lc"
 @@ -3567,40 +3585,6 @@ libdir='$install_libdir'\
      # Exit here if they wanted silent mode.
      test "$show" = : && exit 0
diff --git a/devel/libgtop/patches/patch-po_Makefile_in_in b/devel/libgtop/patches/patch-po_Makefile_in_in
new file mode 100644
index 00000000000..a1dcfdea013
--- /dev/null
+++ b/devel/libgtop/patches/patch-po_Makefile_in_in
@@ -0,0 +1,67 @@
+$OpenBSD: patch-po_Makefile_in_in,v 1.1 2001/09/19 14:37:49 naddy Exp $
+--- po/Makefile.in.in.orig	Sun Nov 12 02:14:53 2000
++++ po/Makefile.in.in	Wed Sep 19 16:10:59 2001
+@@ -24,6 +24,8 @@ gnulocaledir = $(prefix)/share/locale
+ gettextsrcdir = $(prefix)/share/gettext/po
+ subdir = po
+ 
++DESTDIR =
++
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
+@@ -111,16 +113,16 @@ install-data: install-data-@USE_NLS@
+ install-data-no: all
+ install-data-yes: all
+ 	if test -r "$(MKINSTALLDIRS)"; then \
+-	  $(MKINSTALLDIRS) $(datadir); \
++	  $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \
+ 	else \
+-	  $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
++	  $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \
+ 	fi
+ 	@catalogs='$(CATALOGS)'; \
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  case "$$cat" in \
+-	    *.gmo) destdir=$(gnulocaledir);; \
+-	    *)     destdir=$(localedir);; \
++	    *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
++	    *)     destdir=$(DESTDIR)$(localedir);; \
+ 	  esac; \
+ 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+ 	  dir=$$destdir/$$lang/LC_MESSAGES; \
+@@ -153,12 +155,12 @@ install-data-yes: all
+ 	done
+ 	if test "$(PACKAGE)" = "gettext"; then \
+ 	  if test -r "$(MKINSTALLDIRS)"; then \
+-	    $(MKINSTALLDIRS) $(gettextsrcdir); \
++	    $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \
+ 	  else \
+-	    $(SHELL) $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \
++	    $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \
+ 	  fi; \
+ 	  $(INSTALL_DATA) $(srcdir)/Makefile.in.in \
+-			  $(gettextsrcdir)/Makefile.in.in; \
++			  $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \
+ 	else \
+ 	  : ; \
+ 	fi
+@@ -171,12 +173,12 @@ uninstall:
+ 	for cat in $$catalogs; do \
+ 	  cat=`basename $$cat`; \
+ 	  lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
+-	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+-	  rm -f $(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
+-	  rm -f $(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
++	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
++	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
++	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \
++	  rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \
+ 	done
+-	rm -f $(gettextsrcdir)/po-Makefile.in.in
++	rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in
+ 
+ check: all
+ 
diff --git a/devel/libgtop/patches/patch-support_gnomesupport.h b/devel/libgtop/patches/patch-support_gnomesupport.h
index aa9d65c6ba2..c3d9ef1d0db 100644
--- a/devel/libgtop/patches/patch-support_gnomesupport.h
+++ b/devel/libgtop/patches/patch-support_gnomesupport.h
@@ -1,4 +1,4 @@
-# $OpenBSD: patch-support_gnomesupport.h,v 1.1.1.1 2001/09/13 20:45:46 todd Exp $
+ $OpenBSD: patch-support_gnomesupport.h,v 1.2 2001/09/19 14:37:49 naddy Exp $
 --- support/gnomesupport.h.orig	Tue Feb 27 14:27:58 2001
 +++ support/gnomesupport.h	Mon Aug 27 17:23:18 2001
 @@ -5,37 +5,11 @@
diff --git a/devel/libgtop/patches/patch-sysdeps_freebsd_mem.c b/devel/libgtop/patches/patch-sysdeps_freebsd_mem.c
index 51fe0a8d4c0..7eba1f94d5c 100644
--- a/devel/libgtop/patches/patch-sysdeps_freebsd_mem.c
+++ b/devel/libgtop/patches/patch-sysdeps_freebsd_mem.c
@@ -1,3 +1,4 @@
+$OpenBSD: patch-sysdeps_freebsd_mem.c,v 1.2 2001/09/19 14:37:49 naddy Exp $
 --- sysdeps/freebsd/mem.c.orig	Sun Feb 13 16:47:58 2000
 +++ sysdeps/freebsd/mem.c	Mon Aug 27 17:02:38 2001
 @@ -31,7 +31,7 @@
diff --git a/devel/libgtop/patches/patch-sysdeps_freebsd_procmap.c b/devel/libgtop/patches/patch-sysdeps_freebsd_procmap.c
index c9b9a23d816..861edc3f9c6 100644
--- a/devel/libgtop/patches/patch-sysdeps_freebsd_procmap.c
+++ b/devel/libgtop/patches/patch-sysdeps_freebsd_procmap.c
@@ -1,3 +1,4 @@
+$OpenBSD: patch-sysdeps_freebsd_procmap.c,v 1.2 2001/09/19 14:37:49 naddy Exp $
 --- sysdeps/freebsd/procmap.c.orig	Thu May 27 20:56:48 1999
 +++ sysdeps/freebsd/procmap.c	Mon Aug 27 17:26:53 2001
 @@ -32,9 +32,6 @@
diff --git a/devel/libgtop/patches/patch-sysdeps_freebsd_procmem.c b/devel/libgtop/patches/patch-sysdeps_freebsd_procmem.c
index 4e856e205dd..c30b03bc689 100644
--- a/devel/libgtop/patches/patch-sysdeps_freebsd_procmem.c
+++ b/devel/libgtop/patches/patch-sysdeps_freebsd_procmem.c
@@ -1,3 +1,4 @@
+$OpenBSD: patch-sysdeps_freebsd_procmem.c,v 1.2 2001/09/19 14:37:49 naddy Exp $
 --- sysdeps/freebsd/procmem.c.orig	Thu May 27 20:56:49 1999
 +++ sysdeps/freebsd/procmem.c	Mon Aug 27 17:24:33 2001
 @@ -31,8 +31,6 @@
diff --git a/devel/libgtop/patches/patch-sysdeps_freebsd_swap.c b/devel/libgtop/patches/patch-sysdeps_freebsd_swap.c
index 652a1da4ee0..b71a75ffdca 100644
--- a/devel/libgtop/patches/patch-sysdeps_freebsd_swap.c
+++ b/devel/libgtop/patches/patch-sysdeps_freebsd_swap.c
@@ -1,3 +1,4 @@
+$OpenBSD: patch-sysdeps_freebsd_swap.c,v 1.2 2001/09/19 14:37:49 naddy Exp $
 --- sysdeps/freebsd/swap.c.orig	Sun Feb 13 16:47:59 2000
 +++ sysdeps/freebsd/swap.c	Mon Aug 27 17:02:38 2001
 @@ -69,9 +69,9 @@ static struct nlist nlst [] = {
diff --git a/devel/libgtop/pkg/MESSAGE b/devel/libgtop/pkg/MESSAGE
deleted file mode 100644
index 21ac1bb39ea..00000000000
--- a/devel/libgtop/pkg/MESSAGE
+++ /dev/null
@@ -1,6 +0,0 @@
-
-*=================[ libgtop
-* libgtop_server has now been installed into ${PREFIX}/bin/
-* with setgid kmem.
-*================= libgtop ]
-
diff --git a/devel/libgtop/pkg/PFRAG.shared b/devel/libgtop/pkg/PFRAG.shared
index 84b3c2fedec..0ea1f27d5b9 100644
--- a/devel/libgtop/pkg/PFRAG.shared
+++ b/devel/libgtop/pkg/PFRAG.shared
@@ -1,8 +1,8 @@
-@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2001/09/13 20:45:46 todd Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.2 2001/09/19 14:37:49 naddy Exp $
 lib/libgtop.so.1.11
 lib/libgtop_common.so.1.11
 lib/libgtop_names.so.1.11
 lib/libgtop_suid_common.so.1.11
 lib/libgtop_sysdeps.so.1.11
 lib/libgtop_sysdeps_suid.so.1.11
-DYNLIBDIR(%D/lib)
+DYNLIBDIR(%B)
diff --git a/devel/libgtop/pkg/PLIST b/devel/libgtop/pkg/PLIST
index 872f240e3ad..c94f95b39bb 100644
--- a/devel/libgtop/pkg/PLIST
+++ b/devel/libgtop/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2001/09/13 20:45:46 todd Exp $
+@comment $OpenBSD: PLIST,v 1.2 2001/09/19 14:37:49 naddy Exp $
 @unexec install-info --delete --info-dir=%D/info %D/info/libgtop.info
 bin/libgtop-config
 bin/libgtop_daemon
@@ -62,6 +62,30 @@ lib/libgtop_sysdeps.a
 lib/libgtop_sysdeps.la
 lib/libgtop_sysdeps_suid.a
 lib/libgtop_sysdeps_suid.la
+share/locale/az/LC_MESSAGES/libgtop.mo
+share/locale/da/LC_MESSAGES/libgtop.mo
+share/locale/de/LC_MESSAGES/libgtop.mo
+share/locale/el/LC_MESSAGES/libgtop.mo
+share/locale/es/LC_MESSAGES/libgtop.mo
+share/locale/es_DO/LC_MESSAGES/libgtop.mo
+share/locale/es_GT/LC_MESSAGES/libgtop.mo
+share/locale/es_HN/LC_MESSAGES/libgtop.mo
+share/locale/es_MX/LC_MESSAGES/libgtop.mo
+share/locale/es_PA/LC_MESSAGES/libgtop.mo
+share/locale/es_PE/LC_MESSAGES/libgtop.mo
+share/locale/es_SV/LC_MESSAGES/libgtop.mo
+share/locale/fi/LC_MESSAGES/libgtop.mo
+share/locale/fr/LC_MESSAGES/libgtop.mo
+share/locale/gl/LC_MESSAGES/libgtop.mo
+share/locale/ja/LC_MESSAGES/libgtop.mo
+share/locale/ko/LC_MESSAGES/libgtop.mo
+share/locale/nl/LC_MESSAGES/libgtop.mo
+share/locale/no/LC_MESSAGES/libgtop.mo
+share/locale/pl/LC_MESSAGES/libgtop.mo
+share/locale/pt_BR/LC_MESSAGES/libgtop.mo
+share/locale/sk/LC_MESSAGES/libgtop.mo
+share/locale/sl/LC_MESSAGES/libgtop.mo
+share/locale/sv/LC_MESSAGES/libgtop.mo
 !%%gnome%%
 %%guile%%
 %%SHARED%%