cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix message catalog installation

Browse Source 
- add libtool patches
- clean
This commit is contained in:
naddy 2001-09-19 14:54:41 +00:00
parent ee4e309313
commit 769d89d04a
6 changed files with 274 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gtop/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.3 2001/09/14 14:41:30 todd Exp $
# $OpenBSD: Makefile,v 1.4 2001/09/19 14:54:41 naddy Exp $
COMMENT= "the GNOME version of top"
COMMENT= "GNOME version of top"
V= 1.0.13
DISTNAME= gtop-${V}
CATEGORIES= x11

22
x11/gtop/patches/patch-configure
View File

@ -1,12 +1,14 @@
$OpenBSD: patch-configure,v 1.1.1.1 2001/09/13 20:49:57 todd Exp $
--- configure.orig Sat Sep 8 16:31:35 2001
+++ configure Sat Sep 8 16:31:53 2001
@@ -4401,7 +4401,7 @@ fi
done
$OpenBSD: patch-configure,v 1.2 2001/09/19 14:54:41 naddy Exp $
--- configure.orig Wed Mar 14 22:23:37 2001
+++ configure Wed Sep 19 16:42:09 2001
@@ -4776,6 +4776,10 @@ fi
fi
-ALL_LINGUAS="az ca cs da de el es fr ga gl hu it ja ko lt no pt pt_BR ro ru sk sl sv pl tr uk zh_CN.GB2312 zh_TW.Big5"
+ALL_LINGUAS="az ca cs da de el es fr ga gl hu it ja ko lt no pt pt_BR ro ru sk sl sv pl tr uk zh_CN.GB2312"
for ac_hdr in argz.h limits.h locale.h nl_types.h malloc.h string.h \
unistd.h sys/param.h
+ 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

81
x11/gtop/patches/patch-ltconfig Normal file
View File

@ -0,0 +1,81 @@
$OpenBSD: patch-ltconfig,v 1.1 2001/09/19 14:54:41 naddy Exp $
--- ltconfig.orig Wed Mar 14 22:23:35 2001
+++ ltconfig Wed Sep 19 16:41:40 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
ld_shlibs=yes
@@ -1402,10 +1411,21 @@ else
;;
openbsd*)
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linkopts'
- hardcode_libdir_flag_spec='-R$libdir'
hardcode_direct=yes
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='$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,9 +2041,23 @@ netbsd*)
openbsd*)
version_type=sunos
- if test "$with_gnu_ld" = yes; then
- need_lib_prefix=no
- need_version=no
+ 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'

83
x11/gtop/patches/patch-ltmain_sh Normal file
View File

@ -0,0 +1,83 @@
$OpenBSD: patch-ltmain_sh,v 1.1 2001/09/19 14:54:41 naddy Exp $
--- ltmain.sh.orig Wed Mar 14 22:23:35 2001
+++ ltmain.sh Wed Sep 19 16:41:43 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
+ ;;
+ 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
@@ -1091,6 +1102,10 @@ compiler."
deplibs="$deplibs $arg"
;;
+ -?thread)
+ deplibs="$deplibs $arg"
+ ;;
+
-module)
module=yes
continue
@@ -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"
@@ -3567,40 +3585,6 @@ libdir='$install_libdir'\
# 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 \`-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
;;

67
x11/gtop/patches/patch-po_Makefile_in_in Normal file
View File

@ -0,0 +1,67 @@
$OpenBSD: patch-po_Makefile_in_in,v 1.1 2001/09/19 14:54:41 naddy Exp $
--- po/Makefile.in.in.orig Wed Mar 14 22:23:35 2001
+++ po/Makefile.in.in Wed Sep 19 16:44:20 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

30
x11/gtop/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2001/09/13 20:49:57 todd Exp $
@comment $OpenBSD: PLIST,v 1.2 2001/09/19 14:54:41 naddy Exp $
bin/gtop
share/gnome/apps/System/gtop.desktop
share/gnome/help/gtop/C/figs/gtop-fs-1.png
@ -12,6 +12,34 @@ share/gnome/help/gtop/C/figs/gtop-prefs.png
share/gnome/help/gtop/C/figs/gtop-proc.png
share/gnome/help/gtop/C/topic.dat
share/gtoprc
share/locale/az/LC_MESSAGES/gtop.mo
share/locale/ca/LC_MESSAGES/gtop.mo
share/locale/cs/LC_MESSAGES/gtop.mo
share/locale/da/LC_MESSAGES/gtop.mo
share/locale/de/LC_MESSAGES/gtop.mo
share/locale/el/LC_MESSAGES/gtop.mo
share/locale/es/LC_MESSAGES/gtop.mo
share/locale/fr/LC_MESSAGES/gtop.mo
share/locale/ga/LC_MESSAGES/gtop.mo
share/locale/gl/LC_MESSAGES/gtop.mo
share/locale/hu/LC_MESSAGES/gtop.mo
share/locale/it/LC_MESSAGES/gtop.mo
share/locale/ja/LC_MESSAGES/gtop.mo
share/locale/ko/LC_MESSAGES/gtop.mo
share/locale/lt/LC_MESSAGES/gtop.mo
share/locale/no/LC_MESSAGES/gtop.mo
share/locale/pl/LC_MESSAGES/gtop.mo
share/locale/pt/LC_MESSAGES/gtop.mo
share/locale/pt_BR/LC_MESSAGES/gtop.mo
share/locale/ro/LC_MESSAGES/gtop.mo
share/locale/ru/LC_MESSAGES/gtop.mo
share/locale/sk/LC_MESSAGES/gtop.mo
share/locale/sl/LC_MESSAGES/gtop.mo
share/locale/sv/LC_MESSAGES/gtop.mo
share/locale/tr/LC_MESSAGES/gtop.mo
share/locale/uk/LC_MESSAGES/gtop.mo
share/locale/zh_CN.GB2312/LC_MESSAGES/gtop.mo
share/locale/zh_TW.Big5/LC_MESSAGES/gtop.mo
share/pixmaps/gnome-gtop.png
@dirrm share/gnome/help/gtop/C/figs
@dirrm share/gnome/help/gtop/C