new plist, ditch INSTALL script.

This commit is contained in:
espie 2004-08-09 15:00:56 +00:00
parent bd8574396d
commit 2c055d84af
10 changed files with 77 additions and 153 deletions

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ltmain_sh,v 1.1 2001/11/27 23:07:02 todd Exp $
$OpenBSD: patch-ltmain_sh,v 1.2 2004/08/09 15:00:56 espie Exp $
--- ltmain.sh.orig Mon Nov 26 23:49:54 2001
+++ ltmain.sh Tue Nov 27 21:33:19 2001
@@ -1031,6 +1031,17 @@ compiler."
+++ ltmain.sh Mon Aug 9 16:47:10 2004
@@ -1031,7 +1031,18 @@ compiler."
# These systems don't actually have a C library (as such)
test "X$arg" = "X-lc" && continue
;;
@ -9,16 +9,17 @@ $OpenBSD: patch-ltmain_sh,v 1.1 2001/11/27 23:07:02 todd Exp $
+ # Do not include libc due to us having libc/libc_r.
+ test "X$arg" = "X-lc" && continue
+ ;;
+ esac
esac
+ elif test "$arg" = "-lc_r"; then
+ case "$host" in
+ *-*-openbsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
esac
+ esac
fi
deplibs="$deplibs $arg"
continue
@@ -2408,6 +2419,9 @@ compiler."
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.

View File

@ -1,6 +1,6 @@
$OpenBSD: patch-sysdeps_freebsd_procmem.c,v 1.4 2001/11/27 23:07:02 todd Exp $
$OpenBSD: patch-sysdeps_freebsd_procmem.c,v 1.5 2004/08/09 15:00:56 espie Exp $
--- sysdeps/freebsd/procmem.c.orig Mon Nov 26 23:37:59 2001
+++ sysdeps/freebsd/procmem.c Tue Nov 27 21:30:45 2001
+++ sysdeps/freebsd/procmem.c Mon Aug 9 16:47:10 2004
@@ -31,8 +31,6 @@
#include <sys/param.h>
#include <sys/proc.h>
@ -21,17 +21,18 @@ $OpenBSD: patch-sysdeps_freebsd_procmem.c,v 1.4 2001/11/27 23:07:02 todd Exp $
/* Fixme ... */
#undef _KERNEL
#define _UVM_UVM_AMAP_I_H_ 1
@@ -61,9 +58,7 @@ static const unsigned long _glibtop_sysd
@@ -61,10 +58,8 @@ static const unsigned long _glibtop_sysd
(1L << GLIBTOP_PROC_MEM_RSS_RLIM);
static const unsigned long _glibtop_sysdeps_proc_mem_share =
-#if defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)
-(1L << GLIBTOP_PROC_MEM_SHARE);
-#elif defined(__FreeBSD__)
+#if (defined(__NetBSD__) && (__NetBSD_Version__ >= 104000000)) || defined(OpenBSD) || defined(__FreeBSD__)
(1L << GLIBTOP_PROC_MEM_SHARE);
-#elif defined(__FreeBSD__)
-(1L << GLIBTOP_PROC_MEM_SHARE);
#else
0;
#endif
@@ -111,7 +106,7 @@ glibtop_get_proc_mem_p (glibtop *server,
struct kinfo_proc *pinfo;
struct vm_map_entry entry, *first;

View File

@ -1,38 +0,0 @@
#!/bin/sh
#
# $OpenBSD: INSTALL,v 1.3 2003/04/14 15:02:09 wilfried Exp $
#
# libgtop, install .info correctly and set gid kmem for ligtop_server.
PREFIX=${PKG_PREFIX:-/usr/local}
do_post() {
chown root:kmem ${PREFIX}/bin/libgtop_server
chmod 2755 ${PREFIX}/bin/libgtop_server
install-info --section="Programming \& development tools" \
--entry="* libgtop: (libgtop). libgtop programming manual" \
${PREFIX}/info/libgtop.info ${PREFIX}/info/dir
}
# verify proper execution
#
if [ $# -ne 2 ]; then
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
fi
# Verify/process the command
#
case $2 in
PRE-INSTALL)
;;
POST-INSTALL)
do_post
;;
*)
echo "usage: $0 distname { PRE-INSTALL | POST-INSTALL }" >&2
exit 1
;;
esac
exit 0

View File

@ -1,9 +1,9 @@
@comment $OpenBSD: PFRAG.no-gnome,v 1.3 2001/11/27 23:07:02 todd Exp $
@comment $OpenBSD: PFRAG.no-gnome,v 1.4 2004/08/09 15:00:56 espie Exp $
@pkgcfl gnome-libs-*
include/popt-gnome.h
lib/libgnomesupport.a
lib/libgnomesupport.la
lib/libgtop/
lib/libgtop/include/
lib/libgtop/include/gnomesupport.h
@dirrm lib/libgtop/include
@dirrm lib/libgtop
%%SHARED-no-gnome%%

View File

@ -1,8 +1,10 @@
@comment $OpenBSD: PFRAG.shared,v 1.3 2001/11/27 23:07:02 todd Exp $
lib/libgtop.so.1.12
lib/libgtop_common.so.1.12
lib/libgtop_names.so.1.12
lib/libgtop_suid_common.so.1.12
lib/libgtop_sysdeps.so.1.12
lib/libgtop_sysdeps_suid.so.1.12
DYNLIBDIR(%D/lib)
@comment $OpenBSD: PFRAG.shared,v 1.4 2004/08/09 15:00:56 espie Exp $
@comment @lib lib/libgnomesupport.so.0.0
@lib lib/libgtop.so.1.12
@lib lib/libgtop_common.so.1.12
@comment @lib lib/libgtop_guile.so.1.12
@comment @lib lib/libgtop_guile_names.so.1.12
@lib lib/libgtop_names.so.1.12
@lib lib/libgtop_suid_common.so.1.12
@lib lib/libgtop_sysdeps.so.1.12
@lib lib/libgtop_sysdeps_suid.so.1.12

View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.shared.guile,v 1.1 2001/11/27 23:07:02 todd Exp $
lib/libgtop_guile.so.1.12
lib/libgtop_guile_names.so.1.12
@comment $OpenBSD: PFRAG.shared.guile,v 1.2 2004/08/09 15:00:56 espie Exp $
@lib lib/libgtop_guile.so.1.12
@lib lib/libgtop_guile_names.so.1.12

View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared.no-gnome,v 1.1 2001/11/27 23:07:02 todd Exp $
lib/libgnomesupport.so.0.0
@comment $OpenBSD: PFRAG.shared.no-gnome,v 1.2 2004/08/09 15:00:56 espie Exp $
@lib lib/libgnomesupport.so.0.0

View File

@ -1,8 +1,15 @@
@comment $OpenBSD: PLIST,v 1.4 2003/12/16 17:34:06 naddy Exp $
@unexec install-info --delete --info-dir=%D/info %D/info/libgtop.info
@comment $OpenBSD: PLIST,v 1.5 2004/08/09 15:00:56 espie Exp $
bin/libgtop-config
bin/libgtop_daemon
@mode 2755
@owner root
@group kmem
bin/libgtop_server
@mode
@owner
@group
include/libgtop-1.0/
include/libgtop-1.0/glibtop/
include/libgtop-1.0/glibtop.h
include/libgtop-1.0/glibtop/close.h
include/libgtop-1.0/glibtop/command.h
@ -47,7 +54,7 @@ include/libgtop-1.0/glibtop/xmalloc.h
include/libgtop-1.0/glibtop_machine.h
include/libgtop-1.0/glibtop_server.h
include/libgtop-1.0/glibtop_suid.h
info/libgtop.info
@info info/libgtop.info
lib/libgtop-features.def
lib/libgtop.a
lib/libgtop.la
@ -62,21 +69,41 @@ lib/libgtop_sysdeps.a
lib/libgtop_sysdeps.la
lib/libgtop_sysdeps_suid.a
lib/libgtop_sysdeps_suid.la
share/locale/az/
share/locale/az/LC_MESSAGES/
share/locale/az/LC_MESSAGES/libgtop.mo
share/locale/ca/
share/locale/ca/LC_MESSAGES/
share/locale/ca/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/
share/locale/es_DO/LC_MESSAGES/
share/locale/es_DO/LC_MESSAGES/libgtop.mo
share/locale/es_GT/
share/locale/es_GT/LC_MESSAGES/
share/locale/es_GT/LC_MESSAGES/libgtop.mo
share/locale/es_HN/
share/locale/es_HN/LC_MESSAGES/
share/locale/es_HN/LC_MESSAGES/libgtop.mo
share/locale/es_MX/
share/locale/es_MX/LC_MESSAGES/
share/locale/es_MX/LC_MESSAGES/libgtop.mo
share/locale/es_PA/
share/locale/es_PA/LC_MESSAGES/
share/locale/es_PA/LC_MESSAGES/libgtop.mo
share/locale/es_PE/
share/locale/es_PE/LC_MESSAGES/
share/locale/es_PE/LC_MESSAGES/libgtop.mo
share/locale/es_SV/
share/locale/es_SV/LC_MESSAGES/
share/locale/es_SV/LC_MESSAGES/libgtop.mo
share/locale/fi/LC_MESSAGES/libgtop.mo
share/locale/fr/LC_MESSAGES/libgtop.mo
share/locale/ga/
share/locale/ga/LC_MESSAGES/
share/locale/ga/LC_MESSAGES/libgtop.mo
share/locale/gl/LC_MESSAGES/libgtop.mo
share/locale/hu/LC_MESSAGES/libgtop.mo
@ -93,77 +120,10 @@ share/locale/sl/LC_MESSAGES/libgtop.mo
share/locale/sv/LC_MESSAGES/libgtop.mo
share/locale/tr/LC_MESSAGES/libgtop.mo
share/locale/uk/LC_MESSAGES/libgtop.mo
share/locale/zh_CN.GB2312/
share/locale/zh_CN.GB2312/LC_MESSAGES/
share/locale/zh_CN.GB2312/LC_MESSAGES/libgtop.mo
share/locale/zh_TW/LC_MESSAGES/libgtop.mo
!%%gnome%%
%%guile%%
%%SHARED%%
@dirrm share/locale/zh_TW/LC_MESSAGES
@dirrm share/locale/zh_TW
@dirrm share/locale/zh_CN.GB2312/LC_MESSAGES
@dirrm share/locale/zh_CN.GB2312
@dirrm share/locale/uk/LC_MESSAGES
@dirrm share/locale/uk
@dirrm share/locale/tr/LC_MESSAGES
@dirrm share/locale/tr
@dirrm share/locale/sv/LC_MESSAGES
@dirrm share/locale/sv
@dirrm share/locale/sl/LC_MESSAGES
@dirrm share/locale/sl
@dirrm share/locale/sk/LC_MESSAGES
@dirrm share/locale/sk
@dirrm share/locale/ru/LC_MESSAGES
@dirrm share/locale/ru
@dirrm share/locale/pt_BR/LC_MESSAGES
@dirrm share/locale/pt_BR
@dirrm share/locale/pt/LC_MESSAGES
@dirrm share/locale/pt
@dirrm share/locale/pl/LC_MESSAGES
@dirrm share/locale/pl
@dirrm share/locale/no/LC_MESSAGES
@dirrm share/locale/no
@dirrm share/locale/nl/LC_MESSAGES
@dirrm share/locale/nl
@dirrm share/locale/ko/LC_MESSAGES
@dirrm share/locale/ko
@dirrm share/locale/ja/LC_MESSAGES
@dirrm share/locale/ja
@dirrm share/locale/hu/LC_MESSAGES
@dirrm share/locale/hu
@dirrm share/locale/gl/LC_MESSAGES
@dirrm share/locale/gl
@dirrm share/locale/ga/LC_MESSAGES
@dirrm share/locale/ga
@dirrm share/locale/fr/LC_MESSAGES
@dirrm share/locale/fr
@dirrm share/locale/fi/LC_MESSAGES
@dirrm share/locale/fi
@dirrm share/locale/es_SV/LC_MESSAGES
@dirrm share/locale/es_SV
@dirrm share/locale/es_PE/LC_MESSAGES
@dirrm share/locale/es_PE
@dirrm share/locale/es_PA/LC_MESSAGES
@dirrm share/locale/es_PA
@dirrm share/locale/es_MX/LC_MESSAGES
@dirrm share/locale/es_MX
@dirrm share/locale/es_HN/LC_MESSAGES
@dirrm share/locale/es_HN
@dirrm share/locale/es_GT/LC_MESSAGES
@dirrm share/locale/es_GT
@dirrm share/locale/es_DO/LC_MESSAGES
@dirrm share/locale/es_DO
@dirrm share/locale/es/LC_MESSAGES
@dirrm share/locale/es
@dirrm share/locale/el/LC_MESSAGES
@dirrm share/locale/el
@dirrm share/locale/de/LC_MESSAGES
@dirrm share/locale/de
@dirrm share/locale/da/LC_MESSAGES
@dirrm share/locale/da
@dirrm share/locale/ca/LC_MESSAGES
@dirrm share/locale/ca
@dirrm share/locale/az/LC_MESSAGES
@dirrm share/locale/az
@dirrm share/locale
@dirrm include/libgtop-1.0/glibtop
@dirrm include/libgtop-1.0

View File

@ -1,4 +1,3 @@
@comment $OpenBSD: PFRAG.shared,v 1.2 2000/08/11 04:00:16 brad Exp $
lib/libguile.so.9.0
lib/libguilereadline.so.0.0
DYNLIBDIR(%B)
@comment $OpenBSD: PFRAG.shared,v 1.3 2004/08/09 15:00:56 espie Exp $
@lib lib/libguile.so.9.0
@lib lib/libguilereadline.so.0.0

View File

@ -1,12 +1,15 @@
@comment $OpenBSD: PLIST,v 1.5 2000/08/11 04:00:16 brad Exp $
@comment $OpenBSD: PLIST,v 1.6 2004/08/09 15:00:56 espie Exp $
bin/guile
bin/guile-config
bin/guile-doc-snarf
bin/guile-func-name-check
bin/guile-snarf
bin/guile-snarf.awk
include/guile/gh.h
include/guile/
include/guile-readline/
include/guile-readline/readline.h
include/guile/gh.h
include/libguile/
include/libguile.h
include/libguile/__scm.h
include/libguile/alist.h
@ -92,17 +95,17 @@ include/libguile/vectors.h
include/libguile/version.h
include/libguile/vports.h
include/libguile/weaks.h
@unexec install-info --delete %D/info/data-rep.info %D/info/dir
info/data-rep.info
@exec install-info %D/info/data-rep.info %D/info/dir
@info info/data-rep.info
lib/libguile.a
lib/libguile.la
lib/libguilereadline.a
lib/libguilereadline.la
%%SHARED%%
share/aclocal/
share/aclocal/guile.m4
share/aclocal/qthreads.m4
share/guile/guile-procedures.txt
share/guile/
share/guile/1.4/
share/guile/1.4/ice-9/
share/guile/1.4/ice-9/and-let*.scm
share/guile/1.4/ice-9/arrays.scm
share/guile/1.4/ice-9/boot-9.scm
@ -138,9 +141,5 @@ share/guile/1.4/ice-9/string-fun.scm
share/guile/1.4/ice-9/syncase.scm
share/guile/1.4/ice-9/tags.scm
share/guile/1.4/ice-9/threads.scm
@dirrm include/guile
@dirrm include/guile-readline
@dirrm include/libguile
@dirrm share/guile/1.4/ice-9
@dirrm share/guile/1.4
@dirrm share/guile
share/guile/guile-procedures.txt
%%SHARED%%