Update to gnome-core 1.4.0.6
* many fixes to session management, translucent panel, fixes for crashes in panel on startup, screenshot functionality added, support multiple mailboxes in mailcheck applet, support multiline output from imap servers in mailcheck applet, compile/warning/robustness fixes, multibyte support in gnome-terminal, copy menu item added in gnome-terminal, fixes for underlining of urls in gnome-terminal, paste the clipboard - not the selection in gnome-terminal, disable remote browsing in gnome-help-browser, fix crashes in help-browser, fix leaks in the panel, fix crashes in the panel when running programs in a terminal from the run dialog, plus a lot of other minor fixes. Ok naddy@, with additional testing by fries@.
This commit is contained in:
parent
41ef9b5994
commit
e4e07ebd91
@ -1,21 +1,18 @@
|
|||||||
# $OpenBSD: Makefile,v 1.10 2001/11/30 09:18:42 wilfried Exp $
|
# $OpenBSD: Makefile,v 1.11 2002/02/15 19:18:52 nino Exp $
|
||||||
|
|
||||||
COMMENT= "core GNOME system"
|
COMMENT= "core GNOME system"
|
||||||
V= 1.4.0.4
|
|
||||||
DISTNAME= gnome-core-${V}
|
DISTNAME= gnome-core-1.4.0.6
|
||||||
CATEGORIES= x11 x11/gnome
|
CATEGORIES= x11 x11/gnome
|
||||||
NEED_VERSION= 1.498
|
NEED_VERSION= 1.504
|
||||||
HOMEPAGE= http://www.gnome.org
|
HOMEPAGE= http://www.gnome.org/
|
||||||
|
|
||||||
MAINTAINER= Nils Nordman <nino@nforced.com>
|
MAINTAINER= Nils Nordman <nino@nforced.com>
|
||||||
|
|
||||||
MASTER_SITES= ${MASTER_SITE_GNOME}
|
MASTER_SITES= ${MASTER_SITE_GNOME}
|
||||||
MASTER_SITE_SUBDIR= stable/sources/gnome-core
|
MASTER_SITE_SUBDIR= stable/sources/gnome-core
|
||||||
EXTRACT_SUFX= .tar.bz2
|
EXTRACT_SUFX= .tar.bz2
|
||||||
|
|
||||||
PATCH_LIST= ${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltconfig \
|
|
||||||
${PORTSDIR}/infrastructure/patches/patch-lt1.3.5-ltmain_sh \
|
|
||||||
patch-*
|
|
||||||
|
|
||||||
LIB_DEPENDS= glade.4,glade-gnome::devel/libglade,gnome \
|
LIB_DEPENDS= glade.4,glade-gnome::devel/libglade,gnome \
|
||||||
gnome.36,gnorba,zvt::x11/gnome/libs \
|
gnome.36,gnorba,zvt::x11/gnome/libs \
|
||||||
ghttp.1::www/libghttp \
|
ghttp.1::www/libghttp \
|
||||||
@ -25,6 +22,7 @@ LIB_DEPENDS= glade.4,glade-gnome::devel/libglade,gnome \
|
|||||||
BUILD_DEPENDS= :scrollkeeper-*:textproc/scrollkeeper
|
BUILD_DEPENDS= :scrollkeeper-*:textproc/scrollkeeper
|
||||||
RUN_DEPENDS= :scrollkeeper-*:textproc/scrollkeeper
|
RUN_DEPENDS= :scrollkeeper-*:textproc/scrollkeeper
|
||||||
|
|
||||||
|
# GPL
|
||||||
PERMIT_PACKAGE_CDROM= Yes
|
PERMIT_PACKAGE_CDROM= Yes
|
||||||
PERMIT_PACKAGE_FTP= Yes
|
PERMIT_PACKAGE_FTP= Yes
|
||||||
PERMIT_DISTFILES_CDROM= Yes
|
PERMIT_DISTFILES_CDROM= Yes
|
||||||
@ -39,6 +37,11 @@ CONFIGURE_ARGS+= --localstatedir=/var/gnome
|
|||||||
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
|
||||||
LDFLAGS="-L${LOCALBASE}/lib"
|
LDFLAGS="-L${LOCALBASE}/lib"
|
||||||
|
|
||||||
|
pre-build:
|
||||||
|
@cd ${WRKSRC}; \
|
||||||
|
for f in `find . \( -name '*.desktop.in' -or -name '*.soundlist.in' \) -and ! -path '*desktop-links/*'`; \
|
||||||
|
do ./xml-i18n-merge po $$f $${f%.in} -d -p; done
|
||||||
|
|
||||||
post-install:
|
post-install:
|
||||||
@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gnome-core; \
|
@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gnome-core; \
|
||||||
cp -Rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/gnome-core/
|
cp -Rp ${WRKINST}/${SYSCONFDIR}/* ${PREFIX}/share/examples/gnome-core/
|
||||||
|
@ -1,3 +1,3 @@
|
|||||||
MD5 (gnome-core-1.4.0.4.tar.bz2) = d0b22c000a40d9804e8fbbeca634a162
|
MD5 (gnome-core-1.4.0.6.tar.bz2) = 86395834dc18d3034b47c9dc2e1036a4
|
||||||
RMD160 (gnome-core-1.4.0.4.tar.bz2) = 5a28014a5d1003ddb26b69fcaf32841306d409db
|
RMD160 (gnome-core-1.4.0.6.tar.bz2) = b75d241b6c9a48c7db4dd3937e3046f714d2b456
|
||||||
SHA1 (gnome-core-1.4.0.4.tar.bz2) = 6613ae320f949be5c12bbab17c5fee39e5f66fd9
|
SHA1 (gnome-core-1.4.0.6.tar.bz2) = d2c055d3b56416e732042369241d1b0d7423a312
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
$OpenBSD: patch-configure,v 1.2 2001/09/19 13:37:58 naddy Exp $
|
$OpenBSD: patch-configure,v 1.3 2002/02/15 19:18:52 nino Exp $
|
||||||
--- configure.orig Wed May 9 17:40:06 2001
|
--- configure.orig Sun Jan 27 00:19:48 2002
|
||||||
+++ configure Wed Sep 19 01:20:34 2001
|
+++ configure Sun Feb 3 14:24:28 2002
|
||||||
@@ -4811,6 +4811,10 @@ fi
|
@@ -8418,6 +8418,10 @@ fi
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -12,7 +12,7 @@ $OpenBSD: patch-configure,v 1.2 2001/09/19 13:37:58 naddy Exp $
|
|||||||
if test "$gt_cv_func_gettext_libc" = "yes" \
|
if test "$gt_cv_func_gettext_libc" = "yes" \
|
||||||
|| test "$gt_cv_func_gettext_libintl" = "yes"; then
|
|| test "$gt_cv_func_gettext_libintl" = "yes"; then
|
||||||
cat >> confdefs.h <<\EOF
|
cat >> confdefs.h <<\EOF
|
||||||
@@ -6418,11 +6422,11 @@ cat >> confdefs.h <<EOF
|
@@ -10196,11 +10200,11 @@ cat >> confdefs.h <<EOF
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
cat >> confdefs.h <<EOF
|
cat >> confdefs.h <<EOF
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
$OpenBSD: patch-help-browser_Makefile_in,v 1.1 2001/09/20 18:39:13 naddy Exp $
|
$OpenBSD: patch-help-browser_Makefile_in,v 1.2 2002/02/15 19:18:52 nino Exp $
|
||||||
--- help-browser/Makefile.in.orig Thu Sep 20 15:49:00 2001
|
--- help-browser/Makefile.in.orig Sun Jan 27 00:24:00 2002
|
||||||
+++ help-browser/Makefile.in Thu Sep 20 15:49:13 2001
|
+++ help-browser/Makefile.in Sun Feb 3 14:24:28 2002
|
||||||
@@ -602,7 +602,7 @@ mostlyclean distclean maintainer-clean
|
@@ -720,7 +720,7 @@ mostlyclean distclean maintainer-clean
|
||||||
$(ORBIT_GENERATED_SOURCEFILES): my_help_browser_idl
|
$(ORBIT_GENERATED_SOURCEFILES): my_help_browser_idl
|
||||||
|
|
||||||
my_help_browser_idl: $(top_srcdir)/idl/help-browser.idl $(ORBIT_IDL)
|
my_help_browser_idl: $(top_srcdir)/idl/help-browser.idl $(ORBIT_IDL)
|
||||||
|
@ -0,0 +1,12 @@
|
|||||||
|
$OpenBSD: patch-help-browser_help_es_Makefile_in,v 1.1 2002/02/15 19:18:52 nino Exp $
|
||||||
|
--- help-browser/help/es/Makefile.in.orig Tue Feb 5 14:28:14 2002
|
||||||
|
+++ help-browser/help/es/Makefile.in Tue Feb 5 14:28:48 2002
|
||||||
|
@@ -182,7 +182,7 @@ EXTRA_DIST = gnome-help-browser-help.htm
|
||||||
|
default-page.html
|
||||||
|
|
||||||
|
|
||||||
|
-help_browser_helpdir = $(datadir)/gnome/help/help-browser/C
|
||||||
|
+help_browser_helpdir = $(datadir)/gnome/help/help-browser/es
|
||||||
|
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
|
||||||
|
CONFIG_HEADER = ../../../config.h
|
||||||
|
CONFIG_CLEAN_FILES =
|
@ -1,7 +1,7 @@
|
|||||||
$OpenBSD: patch-help-browser_toc2-info_c,v 1.1 2001/10/06 00:33:37 naddy Exp $
|
$OpenBSD: patch-help-browser_toc2-info_c,v 1.2 2002/02/15 19:18:52 nino Exp $
|
||||||
--- help-browser/toc2-info.c.orig Sat Oct 6 00:12:35 2001
|
--- help-browser/toc2-info.c.orig Wed Jan 9 22:13:56 2002
|
||||||
+++ help-browser/toc2-info.c Sat Oct 6 00:13:03 2001
|
+++ help-browser/toc2-info.c Sun Feb 3 14:24:28 2002
|
||||||
@@ -202,13 +202,14 @@ gint expandInfoTable(GList *table, gchar
|
@@ -205,13 +205,14 @@ gint expandInfoTable(GList *table, gchar
|
||||||
gchar *s;
|
gchar *s;
|
||||||
gchar *anchor;
|
gchar *anchor;
|
||||||
struct _big_table_entry *entry;
|
struct _big_table_entry *entry;
|
||||||
|
81
x11/gnome/core/patches/patch-ltmain_sh
Normal file
81
x11/gnome/core/patches/patch-ltmain_sh
Normal file
@ -0,0 +1,81 @@
|
|||||||
|
$OpenBSD: patch-ltmain_sh,v 1.1 2002/02/15 19:18:52 nino Exp $
|
||||||
|
--- ltmain.sh.orig Fri Jan 25 01:45:33 2002
|
||||||
|
+++ ltmain.sh Tue Feb 12 21:02:54 2002
|
||||||
|
@@ -1060,6 +1060,17 @@ compiler."
|
||||||
|
continue
|
||||||
|
;;
|
||||||
|
|
||||||
|
+ -pthread)
|
||||||
|
+ case $host in
|
||||||
|
+ *-*-openbsd*)
|
||||||
|
+ deplibs="$deplibs $arg"
|
||||||
|
+ ;;
|
||||||
|
+ *)
|
||||||
|
+ continue
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
+ ;;
|
||||||
|
+
|
||||||
|
-module)
|
||||||
|
module=yes
|
||||||
|
continue
|
||||||
|
@@ -2060,6 +2071,10 @@ compiler."
|
||||||
|
eval tmp_libs=\"\$$var\"
|
||||||
|
new_libs=
|
||||||
|
for deplib in $tmp_libs; do
|
||||||
|
+ # work around bug in our ksh (segfault)
|
||||||
|
+ case " $new_libs " in
|
||||||
|
+ *" $deplib "*);;
|
||||||
|
+ *)
|
||||||
|
case $deplib in
|
||||||
|
-L*) new_libs="$deplib $new_libs" ;;
|
||||||
|
*)
|
||||||
|
@@ -2074,6 +2089,7 @@ compiler."
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
+ esac
|
||||||
|
done
|
||||||
|
tmp_libs=
|
||||||
|
for deplib in $new_libs; do
|
||||||
|
@@ -4457,40 +4473,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
|
||||||
|
;;
|
||||||
|
|
@ -1,7 +1,7 @@
|
|||||||
$OpenBSD: patch-omf-install_Makefile_in,v 1.1.1.1 2001/09/13 20:33:28 todd Exp $
|
$OpenBSD: patch-omf-install_Makefile_in,v 1.2 2002/02/15 19:18:52 nino Exp $
|
||||||
--- omf-install/Makefile.in.orig Thu Sep 13 19:18:18 2001
|
--- omf-install/Makefile.in.orig Sun Jan 27 00:27:36 2002
|
||||||
+++ omf-install/Makefile.in Thu Sep 13 19:18:29 2001
|
+++ omf-install/Makefile.in Sun Feb 3 14:24:28 2002
|
||||||
@@ -278,7 +278,6 @@ install-data-local:
|
@@ -300,7 +300,6 @@ install-data-local:
|
||||||
-for file in $(srcdir)/*.omf; do \
|
-for file in $(srcdir)/*.omf; do \
|
||||||
$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \
|
$(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(omf_dest_dir); \
|
||||||
done
|
done
|
||||||
|
@ -1,7 +1,16 @@
|
|||||||
$OpenBSD: patch-panel_Makefile_in,v 1.1 2001/09/20 18:39:13 naddy Exp $
|
$OpenBSD: patch-panel_Makefile_in,v 1.2 2002/02/15 19:18:53 nino Exp $
|
||||||
--- panel/Makefile.in.orig Thu Sep 20 15:59:42 2001
|
--- panel/Makefile.in.orig Sun Jan 27 00:25:40 2002
|
||||||
+++ panel/Makefile.in Thu Sep 20 16:00:08 2001
|
+++ panel/Makefile.in Mon Feb 11 11:37:45 2002
|
||||||
@@ -1071,7 +1071,7 @@ maintainer-clean-generic clean mostlycle
|
@@ -239,7 +239,7 @@ libpanel_appletinclude_HEADERS = \
|
||||||
|
gnome-panel.h
|
||||||
|
|
||||||
|
|
||||||
|
-libpanel_applet_la_LDFLAGS = -version-info 0:1:0 -rpath $(libdir)
|
||||||
|
+libpanel_applet_la_LDFLAGS = -version-info 0:2:0 -rpath $(libdir)
|
||||||
|
libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB)
|
||||||
|
|
||||||
|
libpanel_status_la_SOURCES = \
|
||||||
|
@@ -1385,7 +1385,7 @@ maintainer-clean-generic clean mostlycle
|
||||||
$(CORBA_SRCLIST): my_gnome_panel_idl
|
$(CORBA_SRCLIST): my_gnome_panel_idl
|
||||||
|
|
||||||
my_gnome_panel_idl: $(top_srcdir)/idl/gnome-panel.idl $(ORBIT_IDL)
|
my_gnome_panel_idl: $(top_srcdir)/idl/gnome-panel.idl $(ORBIT_IDL)
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
$OpenBSD: patch-panel_doc_Makefile_in,v 1.1 2001/09/20 18:39:13 naddy Exp $
|
$OpenBSD: patch-panel_doc_Makefile_in,v 1.2 2002/02/15 19:18:53 nino Exp $
|
||||||
--- panel/doc/Makefile.in.orig Thu Sep 20 18:03:48 2001
|
--- panel/doc/Makefile.in.orig Sun Jan 27 00:25:43 2002
|
||||||
+++ panel/doc/Makefile.in Thu Sep 20 18:04:15 2001
|
+++ panel/doc/Makefile.in Sun Feb 3 14:24:28 2002
|
||||||
@@ -363,7 +363,7 @@ install-data-local:
|
@@ -392,7 +392,7 @@ install-data-local:
|
||||||
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
|
$(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
|
||||||
done; \
|
done; \
|
||||||
echo '-- Installing $(srcdir)/html/index.sgml' ; \
|
echo '-- Installing $(srcdir)/html/index.sgml' ; \
|
||||||
|
@ -1,12 +1,12 @@
|
|||||||
$OpenBSD: patch-panel_menu_c,v 1.1.1.1 2001/09/13 20:33:28 todd Exp $
|
$OpenBSD: patch-panel_menu_c,v 1.2 2002/02/15 19:18:53 nino Exp $
|
||||||
--- panel/menu.c.orig Tue Aug 28 00:18:55 2001
|
--- panel/menu.c.orig Fri Oct 26 11:13:46 2001
|
||||||
+++ panel/menu.c Tue Aug 28 00:18:07 2001
|
+++ panel/menu.c Sun Feb 3 14:24:49 2002
|
||||||
@@ -5098,7 +5098,7 @@ add_kde_submenu (GtkWidget *root_menu, g
|
@@ -3804,7 +3804,7 @@ create_kde_menu (GtkWidget *menu, gboole
|
||||||
|
{
|
||||||
|
char *pixmap_name;
|
||||||
|
|
||||||
menu = create_kde_menu (NULL, fake_submenus, TRUE, TRUE,
|
- pixmap_name = g_concat_dir_and_file (kde_icondir, "exec.xpm");
|
||||||
TRUE, launcher_add);
|
+ pixmap_name = g_concat_dir_and_file (kde_icondir, "go.png");
|
||||||
- pixmap_path = g_concat_dir_and_file (kde_icondir, "exec.xpm");
|
|
||||||
+ pixmap_path = g_concat_dir_and_file (kde_icondir, "go.png");
|
|
||||||
|
|
||||||
if (panel_file_exists(pixmap_path)) {
|
if(!fake || menu) {
|
||||||
pixmap = fake_pixmap_at_size (pixmap_path, size);
|
menu = create_menu_at (menu,
|
||||||
|
@ -1,67 +0,0 @@
|
|||||||
$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
|
|
||||||
|
|
@ -1,34 +1,39 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
# $OpenBSD: DEINSTALL,v 1.2 2001/09/20 18:58:42 naddy Exp $
|
# $OpenBSD: DEINSTALL,v 1.3 2002/02/15 19:18:53 nino Exp $
|
||||||
#
|
#
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
PATH=/bin:/usr/bin:/sbin:/usr/sbin
|
PATH=/bin:/usr/bin:/sbin:/usr/sbin
|
||||||
|
|
||||||
echo
|
FILES='
|
||||||
echo "+--------------- $1"
|
CORBA/servers/deskguide_applet.gnorba
|
||||||
echo "| To really remove $1 from your system you should also"
|
CORBA/servers/fish_applet.gnorba
|
||||||
echo "| remove the configuration files from the ${SYSCONFDIR} directory."
|
CORBA/servers/gen_util.gnorba
|
||||||
echo "| If you are planning on installing $1 again in the future"
|
CORBA/servers/gnome-terminal.gnorba
|
||||||
echo "| you can leave it as it is."
|
CORBA/servers/help-browser.gnorba
|
||||||
echo "|"
|
CORBA/servers/panel.gnorba
|
||||||
echo "| FYI, the following configuration files belongs to this package:"
|
CORBA/servers/tasklist_applet.gnorba
|
||||||
echo "|"
|
gnome/panel-config/panel
|
||||||
for f in \
|
gnome/panel-config/panel.d/default/Applet_Config
|
||||||
CORBA/servers/deskguide_applet.gnorba \
|
gnome/panel-config/panel.d/default/panel
|
||||||
CORBA/servers/fish_applet.gnorba \
|
sound/events/mailcheck.soundlist
|
||||||
CORBA/servers/gen_util.gnorba \
|
sound/events/panel.soundlist
|
||||||
CORBA/servers/gnome-terminal.gnorba \
|
'
|
||||||
CORBA/servers/help-browser.gnorba \
|
|
||||||
CORBA/servers/panel.gnorba \
|
echo
|
||||||
CORBA/servers/tasklist_applet.gnorba \
|
echo "+--------------- $1"
|
||||||
sound/events/mailcheck.soundlist \
|
echo "| To really remove $1 from your system you should also"
|
||||||
sound/events/panel.soundlist
|
echo "| remove the configuration files from the ${SYSCONFDIR} directory."
|
||||||
do
|
echo "| If you are planning on installing $1 again in the future"
|
||||||
echo "| ${SYSCONFDIR}/$f"
|
echo "| you can leave it as it is."
|
||||||
done
|
echo "|"
|
||||||
echo "+--------------- $1"
|
echo "| FYI, the following configuration files belongs to this package:"
|
||||||
echo
|
echo "|"
|
||||||
|
for f in ${FILES}; do
|
||||||
|
echo "| ${SYSCONFDIR}/$f"
|
||||||
|
done
|
||||||
|
echo "+--------------- $1"
|
||||||
|
echo
|
||||||
|
|
||||||
exit 0
|
exit 0
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
#
|
#
|
||||||
# $OpenBSD: INSTALL,v 1.2 2001/09/20 18:58:42 naddy Exp $
|
# $OpenBSD: INSTALL,v 1.3 2002/02/15 19:18:53 nino Exp $
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
PATH=/bin:/usr/bin:/sbin:/usr/sbin
|
PATH=/bin:/usr/bin:/sbin:/usr/sbin
|
||||||
@ -9,24 +9,31 @@ P_NAME=gnome-core
|
|||||||
DEST_PFX=${SYSCONFDIR}
|
DEST_PFX=${SYSCONFDIR}
|
||||||
SOURCE_PFX=${PREFIX}/share/examples/${P_NAME}
|
SOURCE_PFX=${PREFIX}/share/examples/${P_NAME}
|
||||||
|
|
||||||
|
FILES='
|
||||||
|
CORBA/servers/deskguide_applet.gnorba
|
||||||
|
CORBA/servers/fish_applet.gnorba
|
||||||
|
CORBA/servers/gen_util.gnorba
|
||||||
|
CORBA/servers/gnome-terminal.gnorba
|
||||||
|
CORBA/servers/help-browser.gnorba
|
||||||
|
CORBA/servers/panel.gnorba
|
||||||
|
CORBA/servers/tasklist_applet.gnorba
|
||||||
|
gnome/panel-config/panel
|
||||||
|
gnome/panel-config/panel.d/default/Applet_Config
|
||||||
|
gnome/panel-config/panel.d/default/panel
|
||||||
|
sound/events/mailcheck.soundlist
|
||||||
|
sound/events/panel.soundlist
|
||||||
|
'
|
||||||
|
|
||||||
do_post() {
|
do_post() {
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo "+--------------- ${P_NAME}"
|
echo "+--------------- ${P_NAME}"
|
||||||
|
|
||||||
|
# install dirs if neccesary
|
||||||
|
install -d ${DEST_PFX}/gnome/panel-config/panel.d/default
|
||||||
|
|
||||||
# install or take note of existing config files
|
# install or take note of existing config files
|
||||||
for f in \
|
for f in ${FILES}; do
|
||||||
CORBA/servers/deskguide_applet.gnorba \
|
|
||||||
CORBA/servers/fish_applet.gnorba \
|
|
||||||
CORBA/servers/gen_util.gnorba \
|
|
||||||
CORBA/servers/gnome-terminal.gnorba \
|
|
||||||
CORBA/servers/help-browser.gnorba \
|
|
||||||
CORBA/servers/panel.gnorba \
|
|
||||||
CORBA/servers/tasklist_applet.gnorba \
|
|
||||||
sound/events/mailcheck.soundlist \
|
|
||||||
sound/events/panel.soundlist
|
|
||||||
do
|
|
||||||
if [ -f "${DEST_PFX}/$f" ]; then
|
if [ -f "${DEST_PFX}/$f" ]; then
|
||||||
OLD_CONFS="${OLD_CONFS} $f"
|
OLD_CONFS="${OLD_CONFS} $f"
|
||||||
else
|
else
|
||||||
@ -52,7 +59,10 @@ do_post() {
|
|||||||
echo "|"
|
echo "|"
|
||||||
fi
|
fi
|
||||||
echo "| The following OLD configuration files was found and have NOT been overwritten:"
|
echo "| The following OLD configuration files was found and have NOT been overwritten:"
|
||||||
echo "| You should however manually compare it to it's equivalent in ${SOURCE_PFX}"
|
echo "| You should however manually compare them to their equivalents in "
|
||||||
|
echo "|"
|
||||||
|
echo "| ${SOURCE_PFX}"
|
||||||
|
echo "|"
|
||||||
echo "| and update your configuration if needed."
|
echo "| and update your configuration if needed."
|
||||||
echo "|"
|
echo "|"
|
||||||
for f in ${OLD_CONFS}; do
|
for f in ${OLD_CONFS}; do
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
@comment $OpenBSD: PFRAG.shared,v 1.2 2001/09/19 13:37:58 naddy Exp $
|
@comment $OpenBSD: PFRAG.shared,v 1.3 2002/02/15 19:18:53 nino Exp $
|
||||||
lib/libfish_applet.so.0.0
|
lib/libfish_applet.so.0.0
|
||||||
lib/libgen_util_applet.so.0.0
|
lib/libgen_util_applet.so.0.0
|
||||||
lib/libpanel_applet.so.0.1
|
lib/libpanel_applet.so.0.2
|
||||||
lib/libpanel_status.so.0.0
|
lib/libpanel_status.so.0.0
|
||||||
DYNLIBDIR(%B)
|
DYNLIBDIR(%D/lib)
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user