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

- fix message catalog installation

Browse Source 
- sync libtool patches
- use .bz2 distfile
- clean-up
This commit is contained in:
naddy 2001-09-19 13:37:58 +00:00
parent 9222517c5a
commit 4acd746f16
8 changed files with 204 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
x11/gnome/core/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.3 2001/09/14 14:41:29 todd Exp $
# $OpenBSD: Makefile,v 1.4 2001/09/19 13:37:58 naddy Exp $
COMMENT= "the core GNOME system"
COMMENT= "core GNOME system"
V= 1.4.0.4
DISTNAME= gnome-core-${V}
CATEGORIES= x11
@ -10,6 +10,7 @@ MAINTAINER= Nils Nordman <nino@nforced.com>
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= stable/sources/gnome-core
EXTRACT_SUFX= .tar.bz2
LIB_DEPENDS= glade.4::devel/libglade,gnome \
gnome.36::x11/gnome/libs \
@ -36,7 +37,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
post-install:
@install -d ${PREFIX}/share/gnome-core; \
cp -r ${PREFIX}/../../etc/* ${PREFIX}/share/gnome-core/
@${INSTALL_DATA_DIR} ${PREFIX}/share/gnome-core; \
cp -pr ${PREFIX}/../../etc/* ${PREFIX}/share/gnome-core/
.include <bsd.port.mk>

6
x11/gnome/core/files/md5
View File

@ -1,3 +1,3 @@
MD5 (gnome-core-1.4.0.4.tar.gz) = 5225e6afa09f2396136af247b3d022ad
RMD160 (gnome-core-1.4.0.4.tar.gz) = 2313373ceb730043af60b042251137361531abcc
SHA1 (gnome-core-1.4.0.4.tar.gz) = ec6c441af8804a6ebce93a2db6a54d7ab9b019c7
MD5 (gnome-core-1.4.0.4.tar.bz2) = d0b22c000a40d9804e8fbbeca634a162
RMD160 (gnome-core-1.4.0.4.tar.bz2) = 5a28014a5d1003ddb26b69fcaf32841306d409db
SHA1 (gnome-core-1.4.0.4.tar.bz2) = 6613ae320f949be5c12bbab17c5fee39e5f66fd9

24
x11/gnome/core/patches/patch-configure
View File

@ -1,16 +1,18 @@
$OpenBSD: patch-configure,v 1.1.1.1 2001/09/13 20:33:28 todd Exp $
$OpenBSD: patch-configure,v 1.2 2001/09/19 13:37:58 naddy Exp $
--- configure.orig Wed May 9 17:40:06 2001
+++ configure Tue Aug 28 00:27:57 2001
@@ -3755,7 +3755,7 @@ else
FALSE_FALSE=
fi
+++ configure Wed Sep 19 01:20:34 2001
@@ -4811,6 +4811,10 @@ fi
-ALL_LINGUAS="az bg ca cs da de el en_GB es et eu fi fr ga gl hu it ja ko lt lv nl nn no pl pt pt_BR ro ru sk sl sp sr sv ta tr uk wa zh_TW.Big5 zh_CN.GB2312"
+ALL_LINGUAS="az bg ca cs da de el en_GB es et eu fi fr ga gl hu it ja ko lt lv nl nn no pl pt pt_BR ro ru sk sl sp sr sv ta tr uk wa"
echo $ac_n "checking for working const""... $ac_c" 1>&6
echo "configure:3761: checking for working const" >&5
if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
@@ -6418,11 +6418,11 @@ cat >> confdefs.h <<EOF
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
@@ -6418,11 +6422,11 @@ cat >> confdefs.h <<EOF
EOF
cat >> confdefs.h <<EOF

66
x11/gnome/core/patches/patch-ltconfig
View File

@ -1,16 +1,34 @@
$OpenBSD: patch-ltconfig,v 1.2 2001/09/19 13:37:58 naddy Exp $
--- ltconfig.orig Wed Apr 25 17:53:24 2001
+++ ltconfig Mon Aug 27 23:34:52 2001
@@ -1105,6 +1105,9 @@ cygwin* | mingw*)
+++ ltconfig Tue Sep 18 22:53:43 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*)
@@ -2022,13 +2036,10 @@ netbsd*)
@@ -2022,9 +2042,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*)

48
x11/gnome/core/patches/patch-ltmain.sh
View File

@ -1,45 +1,45 @@
$OpenBSD: patch-ltmain.sh,v 1.2 2001/09/19 13:37:58 naddy Exp $
--- ltmain.sh.orig Wed Apr 25 17:53:24 2001
+++ ltmain.sh Mon Aug 27 23:34:52 2001
@@ -1079,7 +1079,18 @@ compiler."
+++ ltmain.sh Tue Sep 18 22:53:46 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

67
x11/gnome/core/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 13:37:58 naddy Exp $
--- po/Makefile.in.in.orig Wed Apr 25 17:53:24 2001
+++ po/Makefile.in.in Tue Sep 18 22:55:26 2001
@@ -25,6 +25,8 @@ gnulocaledir = $(prefix)/share/locale
gettextsrcdir = $(prefix)/share/gettext/po
subdir = po
+DESTDIR =
+
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@
@@ -112,16 +114,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; \
@@ -154,12 +156,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
@@ -172,12 +174,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

4
x11/gnome/core/pkg/PFRAG.shared
View File

@ -1,6 +1,6 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2001/09/13 20:33:28 todd Exp $
@comment $OpenBSD: PFRAG.shared,v 1.2 2001/09/19 13:37:58 naddy Exp $
lib/libfish_applet.so.0.0
lib/libgen_util_applet.so.0.0
lib/libpanel_applet.so.0.1
lib/libpanel_status.so.0.0
DYNLIBDIR(%D/lib)
DYNLIBDIR(%B)

44
x11/gnome/core/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2001/09/13 20:33:28 todd Exp $
@comment $OpenBSD: PLIST,v 1.2 2001/09/19 13:37:58 naddy Exp $
bin/deskguide_applet
bin/gmenu
bin/gnome-about
@ -1131,6 +1131,46 @@ share/gnome/html/panel/unnamed6.html
share/idl/Terminal.idl
share/idl/gnome-panel.idl
share/idl/help-browser.idl
share/locale/az/LC_MESSAGES/gnome-core.mo
share/locale/bg/LC_MESSAGES/gnome-core.mo
share/locale/ca/LC_MESSAGES/gnome-core.mo
share/locale/cs/LC_MESSAGES/gnome-core.mo
share/locale/da/LC_MESSAGES/gnome-core.mo
share/locale/de/LC_MESSAGES/gnome-core.mo
share/locale/el/LC_MESSAGES/gnome-core.mo
share/locale/en_GB/LC_MESSAGES/gnome-core.mo
share/locale/es/LC_MESSAGES/gnome-core.mo
share/locale/et/LC_MESSAGES/gnome-core.mo
share/locale/eu/LC_MESSAGES/gnome-core.mo
share/locale/fi/LC_MESSAGES/gnome-core.mo
share/locale/fr/LC_MESSAGES/gnome-core.mo
share/locale/ga/LC_MESSAGES/gnome-core.mo
share/locale/gl/LC_MESSAGES/gnome-core.mo
share/locale/hu/LC_MESSAGES/gnome-core.mo
share/locale/it/LC_MESSAGES/gnome-core.mo
share/locale/ja/LC_MESSAGES/gnome-core.mo
share/locale/ko/LC_MESSAGES/gnome-core.mo
share/locale/lt/LC_MESSAGES/gnome-core.mo
share/locale/lv/LC_MESSAGES/gnome-core.mo
share/locale/nl/LC_MESSAGES/gnome-core.mo
share/locale/nn/LC_MESSAGES/gnome-core.mo
share/locale/no/LC_MESSAGES/gnome-core.mo
share/locale/pl/LC_MESSAGES/gnome-core.mo
share/locale/pt/LC_MESSAGES/gnome-core.mo
share/locale/pt_BR/LC_MESSAGES/gnome-core.mo
share/locale/ro/LC_MESSAGES/gnome-core.mo
share/locale/ru/LC_MESSAGES/gnome-core.mo
share/locale/sk/LC_MESSAGES/gnome-core.mo
share/locale/sl/LC_MESSAGES/gnome-core.mo
share/locale/sp/LC_MESSAGES/gnome-core.mo
share/locale/sr/LC_MESSAGES/gnome-core.mo
share/locale/sv/LC_MESSAGES/gnome-core.mo
share/locale/ta/LC_MESSAGES/gnome-core.mo
share/locale/tr/LC_MESSAGES/gnome-core.mo
share/locale/uk/LC_MESSAGES/gnome-core.mo
share/locale/wa/LC_MESSAGES/gnome-core.mo
share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-core.mo
share/locale/zh_TW.Big5/LC_MESSAGES/gnome-core.mo
share/mc/templates/GIMP.desktop
share/omf/gnome-core/clock_applet-C.omf
share/omf/gnome-core/clock_applet-da.omf
@ -1484,4 +1524,4 @@ share/pixmaps/vnterm.xpm
@dirrm share/applets/Monitors
@dirrm share/applets/Clocks
@dirrm share/applets/Amusements
@dirrm share/applets
@dirrm share/applets