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

- Update to 1.115.0 (version found in GNOME2 beta4);

Browse Source 
- use USE_LIBTOOL.
This commit is contained in:
Maxim Sobolev 2002-04-26 10:34:49 +00:00
parent 51aab4018a
commit 70f997c306
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=58163
7 changed files with 80 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
x11/libgnome/Makefile
View File

@ -6,11 +6,10 @@
#
PORTNAME= libgnome
PORTVERSION= 1.114.0
PORTREVISION= 1
PORTVERSION= 1.115.0
CATEGORIES?= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta3
MASTER_SITE_SUBDIR= pre-gnome2/releases/gnome-2.0-desktop-beta4
DIST_SUBDIR= gnome2
MAINTAINER?= gnome@FreeBSD.org
@ -25,7 +24,7 @@ USE_GMAKE= yes
USE_ESOUND= yes
USE_BISON= yes
INSTALLS_SHLIB= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome2 \
--datadir=${PREFIX}/share/gnome2 \
--with-html-dir=${PREFIX}/share/doc

2
x11/libgnome/distinfo
View File

@ -1 +1 @@
MD5 (gnome2/libgnome-1.114.0.tar.bz2) = 7ba43857ca90bb6fb2a6f899952f3289
MD5 (gnome2/libgnome-1.115.0.tar.bz2) = b9f851259656a5aeaf2f6c0a983cf4bb

22
x11/libgnome/files/patch-ag Normal file
View File

@ -0,0 +1,22 @@
$FreeBSD$
--- libgnome/gnome-util.c 2002/03/19 17:16:21 1.1
+++ libgnome/gnome-util.c 2002/03/19 17:21:31
@@ -67,11 +67,11 @@
static char *shells [] = {
/* Note that on some systems shells can also
* be installed in /usr/bin */
- "/bin/bash", "/usr/bin/bash",
- "/bin/zsh", "/usr/bin/zsh",
- "/bin/tcsh", "/usr/bin/tcsh",
- "/bin/ksh", "/usr/bin/ksh",
- "/bin/csh", "/bin/sh", 0
+ "/bin/csh", "/bin/sh",
+ LOCALBASE "/bin/bash",
+ LOCALBASE "/bin/zsh",
+ LOCALBASE "/bin/ksh",
+ 0
};
if (geteuid () == getuid () &&

13
x11/libgnome/files/patch-configure Normal file
View File

@ -0,0 +1,13 @@
$FreeBSD$
--- configure 2002/04/26 10:15:23 1.1
+++ configure 2002/04/26 10:15:59
@@ -7186,6 +7186,7 @@
# This can be used to rebuild libtool when needed
LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'

24
x11/libgnome/files/patch-libgnome::Makefile.in
View File

@ -1,9 +1,9 @@
$FreeBSD$
--- libgnome/Makefile.in.orig Tue Mar 19 19:15:47 2002
+++ libgnome/Makefile.in Thu Mar 28 13:32:17 2002
@@ -147,7 +147,7 @@
--- libgnome/Makefile.in.orig Fri Apr 26 13:14:03 2002
+++ libgnome/Makefile.in Fri Apr 26 13:14:03 2002
@@ -149,7 +149,7 @@
libgnomeincludedir = $(includedir)/libgnome-2.0/libgnome
@ -12,21 +12,3 @@ $FreeBSD$
libgnome_2_la_SOURCES = libgnometypebuiltins.h libgnometypebuiltins.c gnome-config.c gnome-sound.c gnome-triggers.c gnome-triggersP.h gnome-program.c gnome-help.c gnome-exec.c gnome-gconf.c gnome-gconfP.h gnome-i18n.c gnome-i18nP.h gnome-url.c gnome-util.c gnome-score.c gnome-init.c
@@ -171,7 +171,7 @@
libgnome_2_la_LIBADD = $(LIBGNOME_LIBS)
-noinst_PROGRAMS = test-libgnome
+noinst_PROGRAMS =
test_libgnome_SOURCES = test-libgnome.c
@@ -193,7 +193,7 @@
gnome-sound.lo gnome-triggers.lo gnome-program.lo gnome-help.lo \
gnome-exec.lo gnome-gconf.lo gnome-i18n.lo gnome-url.lo gnome-util.lo \
gnome-score.lo gnome-init.lo
-noinst_PROGRAMS = test-libgnome$(EXEEXT)
+noinst_PROGRAMS =
PROGRAMS = $(noinst_PROGRAMS)
test_libgnome_OBJECTS = test-libgnome.$(OBJEXT)

45
x11/libgnome/files/patch-ltmain.sh
View File

@ -1,45 +0,0 @@
$FreeBSD$
--- ltmain.sh.orig Wed Jan 23 11:38:40 2002
+++ ltmain.sh Sun Feb 3 01:44:17 2002
@@ -1037,8 +1037,16 @@
continue
;;
+ -pthread)
+ compile_command="$compile_command -pthread"
+ finalize_command="$finalize_command -pthread"
+ compiler_flags="$compiler_flags -pthread"
+ continue
+ ;;
+
-module)
module=yes
+ build_old_libs=no
continue
;;
@@ -2412,6 +2420,9 @@
*-*-netbsd*)
# Don't link with libc until the a.out ld.so is fixed.
;;
+ *-*-freebsd*)
+ # FreeBSD doesn't need this...
+ ;;
*)
# Add libc to deplibs on all other systems if necessary.
if test "$build_libtool_need_lc" = "yes"; then
@@ -4179,10 +4190,12 @@
fi
# Install the pseudo-library for information purposes.
+ if /usr/bin/false; then
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
$show "$install_prog $instname $destdir/$name"
$run eval "$install_prog $instname $destdir/$name" || exit $?
+ fi
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

41
x11/libgnome/pkg-plist
View File

@ -3,6 +3,8 @@ bin/gnome2-info2html
bin/gnome2-man2html
etc/gconf/gconf.xml.defaults/desktop/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/keyboard/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/applications/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/applications/browser/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/applications/editor/%gconf.xml
@ -15,9 +17,18 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/interface/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/sound/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ftp/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man/%gconf.xml
etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/unknown/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/keyboard/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/browser/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/editor/%gconf.xml
@ -30,7 +41,14 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/interface/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ftp/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man/%gconf.xml
etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/unknown/%gconf.xml
etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas
etc/gconf/schemas/desktop_gnome_applications_browser.schemas
etc/gconf/schemas/desktop_gnome_applications_editor.schemas
@ -87,8 +105,8 @@ share/doc/libgnome/libgnome-libgnometypebuiltins.html
share/doc/libgnome/libgnome.html
share/doc/libgnome/x1277.html
share/doc/libgnome/x2848.html
share/doc/libgnome/x3212.html
share/doc/libgnome/x4054.html
share/doc/libgnome/x3213.html
share/doc/libgnome/x4055.html
share/doc/libgnome/x9.html
share/gnome2/sgml/docbook/gnome-customization-0.1/gnome-custom.xsl
share/gnome2/sgml/docbook/gnome-customization-0.1/gnome-customization.xsl
@ -121,13 +139,19 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
@dirrm share/gnome2/sgml/docbook/gnome-customization-0.1
@dirrm share/gnome2/sgml/docbook
@dirrm share/gnome2/sgml
@dirrm share/gnome2
@dirrm share/doc/libgnome
@dirrm include/libgnome-2.0/libgnome
@dirrm include/libgnome-2.0
@dirrm etc/sound/events
@dirrm etc/sound
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/unknown
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/http
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ftp
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals
@ -140,9 +164,18 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/editor
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/browser
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/keyboard
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome
@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/unknown
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/http
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ftp
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/sound
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals
@ -155,5 +188,7 @@ share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/editor
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/browser
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/keyboard
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility
@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome
@dirrm etc/gconf/gconf.xml.defaults/desktop