diff options
| author | ade <ade@FreeBSD.org> | 2000-08-04 09:19:21 +0800 |
|---|---|---|
| committer | ade <ade@FreeBSD.org> | 2000-08-04 09:19:21 +0800 |
| commit | f710791a75a1a897078bc67c9d8d237aa98f6e36 (patch) | |
| tree | 9678346bea3d4ebce203fa7ff52257077ed4ac10 /x11 | |
| parent | cb57a6c30e8edc7db27081f1e42de38911b80a8c (diff) | |
| download | freebsd-ports-gnome-f710791a75a1a897078bc67c9d8d237aa98f6e36.tar.gz freebsd-ports-gnome-f710791a75a1a897078bc67c9d8d237aa98f6e36.tar.zst freebsd-ports-gnome-f710791a75a1a897078bc67c9d8d237aa98f6e36.zip | |
Extensive patchfile cleanups using sobomax's wonderful
post-extract rule
Diffstat (limited to 'x11')
29 files changed, 238 insertions, 485 deletions
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile index c3168966bde0..0e2d730a0852 100644 --- a/x11/gnome-applets/Makefile +++ b/x11/gnome-applets/Makefile @@ -31,4 +31,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" +post-extract: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + .include <bsd.port.mk> diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa index fb232739a509..929f5f5d20f8 100644 --- a/x11/gnome-applets/files/patch-aa +++ b/x11/gnome-applets/files/patch-aa @@ -8,12 +8,3 @@ esac -@@ -5703,7 +5704,7 @@ - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest* - INSTOBJEXT=.mo diff --git a/x11/gnome-applets/files/patch-af b/x11/gnome-applets/files/patch-af new file mode 100644 index 000000000000..7cfd670a862e --- /dev/null +++ b/x11/gnome-applets/files/patch-af @@ -0,0 +1,20 @@ +--- fifteen/fifteen.c.orig Thu May 4 07:23:57 2000 ++++ fifteen/fifteen.c Wed Aug 2 09:18:24 2000 +@@ -225,7 +225,7 @@ + int dir; + int x, y; + +- srand (time (NULL)); ++ srandom (time (NULL)); + + canvas = gtk_object_get_user_data (data); + board = gtk_object_get_user_data (GTK_OBJECT (canvas)); +@@ -241,7 +241,7 @@ + for (i = 0; i < SCRAMBLE_MOVES; i++) { + /* retry_scramble: */ + /* Yuck ;) --Tom. */ +- dir = rand () % 4; ++ dir = random () % 4; + + x = y = 0; + diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 5eca7664198c..90b311d64e31 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -39,4 +39,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gnome.1 gnome-config.1 MAN5= gnome-mime.5 +post-extract: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + .include <bsd.port.mk> diff --git a/x11/gnome-libs/files/patch-aa b/x11/gnome-libs/files/patch-aa index 4b1108a7aa4a..604dc409f06d 100644 --- a/x11/gnome-libs/files/patch-aa +++ b/x11/gnome-libs/files/patch-aa @@ -1,33 +1,15 @@ ---- configure.orig Tue Apr 27 14:24:19 1999 -+++ configure Mon Jun 7 20:27:21 1999 -@@ -2521,7 +2521,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- PTHREAD_LIB="-lc_r" -+ PTHREAD_LIB="" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for pthread_create""... $ac_c" 1>&6 -@@ -5215,7 +5215,7 @@ - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest* - INSTOBJEXT=.mo -@@ -7372,7 +7372,7 @@ +--- configure.orig Tue Aug 1 21:58:10 2000 ++++ configure Tue Aug 1 21:59:03 2000 +@@ -7214,7 +7214,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-ltiff -lm $LIBS" +LIBS="-ltiff -ljpeg -lz -lm $LIBS" cat > conftest.$ac_ext <<EOF - #line 7378 "configure" + #line 7220 "configure" #include "confdefs.h" -@@ -10853,13 +10853,13 @@ +@@ -10208,13 +10208,13 @@ SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support' ART_LIBS="-lart_lgpl" @@ -43,7 +25,15 @@ GNOME_IDLDIR='-I${datadir}/idl' -@@ -11724,10 +11724,6 @@ +@@ -10609,6 +10609,7 @@ + s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g + s%@MAINT@%$MAINT%g + s%@cflags_set@%$cflags_set%g ++s%@GLIB_CONFIG@%$GLIB_CONFIG%g + s%@GTK_CONFIG@%$GTK_CONFIG%g + s%@GTK_CFLAGS@%$GTK_CFLAGS%g + s%@GTK_LIBS@%$GTK_LIBS%g +@@ -11079,10 +11080,6 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac diff --git a/x11/gnome-libs/files/patch-ac b/x11/gnome-libs/files/patch-ac index 6b3a11c2a084..f73a45521ae8 100644 --- a/x11/gnome-libs/files/patch-ac +++ b/x11/gnome-libs/files/patch-ac @@ -14,13 +14,13 @@ Known values for LIBRARY are: - glib (calls glib-config) -+ glib (calls glib12-config) ++ glib (calls @GLIB_CONFIG@) idl (to be used with orbit-idl) gnome gnomeui gnorba - gtk (calls gtk-config) -+ gtk (calls gtk12-config) ++ gtk (calls @GTK_CONFIG@) gtkxmhtml (only --libs) zvt (only --libs) @@ -41,14 +41,14 @@ glib) - the_libs="$the_libs `glib-config --libs`" - the_flags="$the_flags `glib-config --cflags`" -+ the_libs="$the_libs `glib12-config --libs`" -+ the_flags="$the_flags `glib12-config --cflags`" ++ the_libs="$the_libs `@GLIB_CONFIG@ --libs`" ++ the_flags="$the_flags `@GLIB_CONFIG@ --cflags`" ;; gtk) - the_libs="$the_libs `gtk-config --libs`" - the_flags="$the_flags `gtk-config --cflags`" -+ the_libs="$the_libs `gtk12-config --libs`" -+ the_flags="$the_flags `gtk12-config --cflags`" ++ the_libs="$the_libs `@GTK_CONFIG@ --libs`" ++ the_flags="$the_flags `@GTK_CONFIG@ --cflags`" ;; gnome) the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@" diff --git a/x11/gnome-libs/files/patch-ag b/x11/gnome-libs/files/patch-ag index 8778bc26ffc9..6b5481c4e7b9 100644 --- a/x11/gnome-libs/files/patch-ag +++ b/x11/gnome-libs/files/patch-ag @@ -6,7 +6,7 @@ static char *shells [] = { - "/bin/bash", "/bin/zsh", "/bin/tcsh", "/bin/ksh", - "/bin/csh", "/bin/sh", 0 -+ "/bin/csh", "/bin/sh", "/usr/local/bin/tcsh", ++ "/bin/csh", "/bin/sh", "/bin/tcsh", "/usr/local/bin/tcsh", + "/usr/local/bin/bash", "/usr/local/bin/ksh", + "/usr/local/bin/zsh", "/usr/local/sbin/scsh", 0 }; diff --git a/x11/gnomeapplets/Makefile b/x11/gnomeapplets/Makefile index c3168966bde0..0e2d730a0852 100644 --- a/x11/gnomeapplets/Makefile +++ b/x11/gnomeapplets/Makefile @@ -31,4 +31,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" +post-extract: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + .include <bsd.port.mk> diff --git a/x11/gnomeapplets/files/patch-aa b/x11/gnomeapplets/files/patch-aa index fb232739a509..929f5f5d20f8 100644 --- a/x11/gnomeapplets/files/patch-aa +++ b/x11/gnomeapplets/files/patch-aa @@ -8,12 +8,3 @@ esac -@@ -5703,7 +5704,7 @@ - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest* - INSTOBJEXT=.mo diff --git a/x11/gnomeapplets/files/patch-af b/x11/gnomeapplets/files/patch-af new file mode 100644 index 000000000000..7cfd670a862e --- /dev/null +++ b/x11/gnomeapplets/files/patch-af @@ -0,0 +1,20 @@ +--- fifteen/fifteen.c.orig Thu May 4 07:23:57 2000 ++++ fifteen/fifteen.c Wed Aug 2 09:18:24 2000 +@@ -225,7 +225,7 @@ + int dir; + int x, y; + +- srand (time (NULL)); ++ srandom (time (NULL)); + + canvas = gtk_object_get_user_data (data); + board = gtk_object_get_user_data (GTK_OBJECT (canvas)); +@@ -241,7 +241,7 @@ + for (i = 0; i < SCRAMBLE_MOVES; i++) { + /* retry_scramble: */ + /* Yuck ;) --Tom. */ +- dir = rand () % 4; ++ dir = random () % 4; + + x = y = 0; + diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile index c3168966bde0..0e2d730a0852 100644 --- a/x11/gnomeapplets2/Makefile +++ b/x11/gnomeapplets2/Makefile @@ -31,4 +31,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GTK_CONFIG="${GTK_CONFIG}" \ LIBS="-L${LOCALBASE}/lib" +post-extract: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + .include <bsd.port.mk> diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa index fb232739a509..929f5f5d20f8 100644 --- a/x11/gnomeapplets2/files/patch-aa +++ b/x11/gnomeapplets2/files/patch-aa @@ -8,12 +8,3 @@ esac -@@ -5703,7 +5704,7 @@ - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest* - INSTOBJEXT=.mo diff --git a/x11/gnomeapplets2/files/patch-af b/x11/gnomeapplets2/files/patch-af new file mode 100644 index 000000000000..7cfd670a862e --- /dev/null +++ b/x11/gnomeapplets2/files/patch-af @@ -0,0 +1,20 @@ +--- fifteen/fifteen.c.orig Thu May 4 07:23:57 2000 ++++ fifteen/fifteen.c Wed Aug 2 09:18:24 2000 +@@ -225,7 +225,7 @@ + int dir; + int x, y; + +- srand (time (NULL)); ++ srandom (time (NULL)); + + canvas = gtk_object_get_user_data (data); + board = gtk_object_get_user_data (GTK_OBJECT (canvas)); +@@ -241,7 +241,7 @@ + for (i = 0; i < SCRAMBLE_MOVES; i++) { + /* retry_scramble: */ + /* Yuck ;) --Tom. */ +- dir = rand () % 4; ++ dir = random () % 4; + + x = y = 0; + diff --git a/x11/gnomecore/Makefile b/x11/gnomecore/Makefile index 5a9ce33009f4..e3c97ee59ef3 100644 --- a/x11/gnomecore/Makefile +++ b/x11/gnomecore/Makefile @@ -16,7 +16,8 @@ MAINTAINER= ade@FreeBSD.org LIB_DEPENDS= capplet.4:${PORTSDIR}/sysutils/gnomecontrolcenter \ gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \ - xml.5:${PORTSDIR}/textproc/libxml + xml.5:${PORTSDIR}/textproc/libxml \ + bz2.1:${PORTSDIR}/archivers/bzip2 GTK_CONFIG?= ${X11BASE}/bin/gtk12-config @@ -34,4 +35,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gnome-session.1 gnome-wm.1 save-session.1 MAN5= default.session.5 +post-extract: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + .include <bsd.port.mk> diff --git a/x11/gnomecore/files/patch-aa b/x11/gnomecore/files/patch-aa index f4586c109eec..843f8a3c3371 100644 --- a/x11/gnomecore/files/patch-aa +++ b/x11/gnomecore/files/patch-aa @@ -1,14 +1,31 @@ ---- configure.orig Tue May 23 00:35:01 2000 -+++ configure Fri May 26 14:29:09 2000 -@@ -4885,7 +4885,7 @@ - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest* - INSTOBJEXT=.mo +--- configure.orig Wed Aug 2 00:21:00 2000 ++++ configure Wed Aug 2 00:22:18 2000 +@@ -6074,9 +6074,9 @@ + LIBS="$oLIBS" + + oLIBS="$LIBS" +-echo $ac_n "checking for bzopen in -lbz2""... $ac_c" 1>&6 +-echo "configure:6079: checking for bzopen in -lbz2" >&5 +-ac_lib_var=`echo bz2'_'bzopen | sed 'y%./+-%__p_%'` ++echo $ac_n "checking for BZ2_bzopen in -lbz2""... $ac_c" 1>&6 ++echo "configure:6079: checking for BZ2_bzopen in -lbz2" >&5 ++ac_lib_var=`echo bz'_'bzopen | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -6088,10 +6088,10 @@ + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char bzopen(); ++char BZ2_bzopen(); + + int main() { +-bzopen() ++BZ2_bzopen() + ; return 0; } + EOF + if { (eval echo configure:6098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then --- app-docs.make.orig Thu Apr 20 02:25:57 2000 +++ app-docs.make Fri May 26 16:31:01 2000 @@ -1,4 +1,4 @@ diff --git a/x11/gnomecore/files/patch-ab b/x11/gnomecore/files/patch-ab index 72fcc097dcd6..f756bd164ac2 100644 --- a/x11/gnomecore/files/patch-ab +++ b/x11/gnomecore/files/patch-ab @@ -39,27 +39,9 @@ + { "/usr/X11R6/share/gnome/help", TOC_GHELP_TYPE }, { NULL, 0 } }; - + --- help-browser/Makefile.in.orig Tue May 23 04:25:07 2000 +++ help-browser/Makefile.in Fri May 26 16:15:53 2000 -@@ -143,7 +143,7 @@ - - @HELP_USE_GTKHTML_TRUE@htmlcflags = -DHELP_USE_GTKHTML - --INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOME_PREFIX=\""$(prefix)\"" -DGNOMELOCALEDIR=\""$(datadir)/locale\"" $(htmlcflags) -+INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOME_PREFIX=\""$(prefix)\"" -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" $(htmlcflags) - - @HELP_USE_GTKHTML_TRUE@htmllibs = $(GNOME_XML_LIB) @PIXBUF_LIBS@ $(GTK_HTML_PREFIX)/lib/libgtkhtml.a $(GNOME_PRINT_PREFIX)/lib/libgnomeprint.a - @HELP_USE_GTKHTML_FALSE@htmllibs = $(GTKXMHTML_LIBS) -@@ -186,7 +186,7 @@ - gnorbadir = $(sysconfdir)/CORBA/servers - gnorba_DATA = help-browser.gnorba - --sysdir = $(datadir)/gnome/apps -+sysdir = $(datadir)/apps - sys_DATA = gnome-help.desktop - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h @@ -558,7 +558,7 @@ help-caller.o gnome-help-browser.o: help-browser.h @@ -69,190 +51,35 @@ $(top_srcdir)/help-browser/gnome-convert $(DESTDIR)$(bindir)/ # Tell versions [3.59,3.63) of GNU make to not export all variables. ---- help-browser/help/C/Makefile.in.orig Tue May 23 04:25:10 2000 -+++ help-browser/help/C/Makefile.in Fri May 26 15:36:46 2000 -@@ -142,7 +142,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html gnome-logo-large.png sample-help.html sample-topic.dat - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/C -+help_browser_helpdir = $(datadir)/help/help-browser/C - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/ca/Makefile.in.orig Tue May 23 04:25:11 2000 -+++ help-browser/help/ca/Makefile.in Fri May 26 15:36:57 2000 -@@ -143,7 +143,7 @@ - - EXTRA_DIST = default-page.html - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/ca -+help_browser_helpdir = $(datadir)/help/help-browser/ca - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/da/Makefile.in.orig Tue May 23 04:25:12 2000 -+++ help-browser/help/da/Makefile.in Fri May 26 15:37:09 2000 -@@ -142,7 +142,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/da -+help_browser_helpdir = $(datadir)/help/help-browser/da - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/el/Makefile.in.orig Tue May 23 04:25:13 2000 -+++ help-browser/help/el/Makefile.in Fri May 26 15:37:16 2000 -@@ -143,7 +143,7 @@ - - EXTRA_DIST = default-page.html - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/el -+help_browser_helpdir = $(datadir)/help/help-browser/el - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/es/Makefile.in.orig Tue May 23 04:25:14 2000 -+++ help-browser/help/es/Makefile.in Fri May 26 15:37:46 2000 -@@ -142,7 +142,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/es -+help_browser_helpdir = $(datadir)/help/help-browser/es - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/et/Makefile.in.orig Tue May 23 04:25:15 2000 -+++ help-browser/help/et/Makefile.in Fri May 26 15:37:53 2000 -@@ -143,7 +143,7 @@ - - EXTRA_DIST = default-page.html - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/et -+help_browser_helpdir = $(datadir)/help/help-browser/et - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/eu/Makefile.in.orig Tue May 23 04:25:16 2000 -+++ help-browser/help/eu/Makefile.in Fri May 26 15:38:00 2000 -@@ -143,7 +143,7 @@ - - EXTRA_DIST = default-page.html - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/eu -+help_browser_helpdir = $(datadir)/help/help-browser/eu - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/fr/Makefile.in.orig Tue May 23 04:25:17 2000 -+++ help-browser/help/fr/Makefile.in Fri May 26 15:38:09 2000 -@@ -142,7 +142,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/fr -+help_browser_helpdir = $(datadir)/help/help-browser/fr - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/gl/Makefile.in.orig Tue May 23 04:25:18 2000 -+++ help-browser/help/gl/Makefile.in Fri May 26 15:38:16 2000 -@@ -142,7 +142,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/gl -+help_browser_helpdir = $(datadir)/help/help-browser/gl - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/hu/Makefile.in.orig Tue May 23 04:25:18 2000 -+++ help-browser/help/hu/Makefile.in Fri May 26 15:38:25 2000 -@@ -142,7 +142,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html sample-help.html sample-topic.dat - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/hu -+help_browser_helpdir = $(datadir)/help/help-browser/hu - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/it/Makefile.in.orig Tue May 23 04:25:19 2000 -+++ help-browser/help/it/Makefile.in Fri May 26 15:38:37 2000 -@@ -142,7 +142,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/it -+help_browser_helpdir = $(datadir)/help/help-browser/it - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/ja/Makefile.in.orig Tue May 23 04:25:20 2000 -+++ help-browser/help/ja/Makefile.in Fri May 26 15:38:47 2000 -@@ -142,7 +142,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html sample-help.html sample-topic.dat - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/ja -+help_browser_helpdir = $(datadir)/help/help-browser/ja - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/ko/Makefile.in.orig Tue May 23 04:25:21 2000 -+++ help-browser/help/ko/Makefile.in Fri May 26 15:38:54 2000 -@@ -142,7 +142,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/ko -+help_browser_helpdir = $(datadir)/help/help-browser/ko - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/lt/Makefile.in.orig Tue May 23 04:25:22 2000 -+++ help-browser/help/lt/Makefile.in Fri May 26 15:39:03 2000 -@@ -142,7 +142,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/lt -+help_browser_helpdir = $(datadir)/help/help-browser/lt - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/no/Makefile.in.orig Tue May 23 04:25:24 2000 -+++ help-browser/help/no/Makefile.in Fri May 26 15:39:12 2000 -@@ -142,7 +142,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/no -+help_browser_helpdir = $(datadir)/help/help-browser/no - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/uk/Makefile.in.orig Tue May 23 04:25:25 2000 -+++ help-browser/help/uk/Makefile.in Fri May 26 15:39:19 2000 -@@ -142,7 +142,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/uk -+help_browser_helpdir = $(datadir)/help/help-browser/uk - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- help-browser/help/wa/Makefile.in.orig Tue May 23 04:25:26 2000 -+++ help-browser/help/wa/Makefile.in Fri May 26 15:39:27 2000 -@@ -142,7 +142,7 @@ - EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html - - --help_browser_helpdir = $(datadir)/gnome/help/help-browser/wa -+help_browser_helpdir = $(datadir)/help/help-browser/wa - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = +--- help-browser/misc.c.orig Thu Apr 20 01:02:35 2000 ++++ help-browser/misc.c Wed Aug 2 00:24:41 2000 +@@ -162,10 +162,10 @@ + switch (bz) { + case 1: + #ifdef HAVE_LIBBZ2 +- if ((bf=bzopen(file, "r"))==NULL) ++ if ((bf=BZ2_bzopen(file, "r"))==NULL) + return -1; + +- bytes=bzread(bf, buf, 8192); ++ bytes=BZ2_bzread(bf, buf, 8192); + break; + #endif + default: +@@ -186,14 +186,14 @@ + len += bytes; + #ifdef HAVE_LIBBZ2 + if (bz == 1) +- bytes=bzread(bf, buf, 8192); ++ bytes=BZ2_bzread(bf, buf, 8192); + else + #endif + bytes=gzread(f, buf, 8192); + } + #ifdef HAVE_LIBBZ2 + if (bz == 1) +- bzclose(bf); ++ BZ2_bzclose(bf); + else + #endif + gzclose(f); diff --git a/x11/gnomecore/files/patch-ae b/x11/gnomecore/files/patch-ae index 797996b9e47a..fc502ff72910 100644 --- a/x11/gnomecore/files/patch-ae +++ b/x11/gnomecore/files/patch-ae @@ -9,28 +9,8 @@ user); } else mc->mail_file = g_strdup (mc->mail_file); ---- applets/desk-guide/Makefile.in.orig Tue May 23 04:25:59 2000 -+++ applets/desk-guide/Makefile.in Fri May 26 15:21:53 2000 -@@ -141,7 +141,7 @@ - - SUBDIRS = help - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" - - - bin_PROGRAMS = deskguide_applet --- applets/fish/Makefile.in.orig Tue May 23 04:26:04 2000 +++ applets/fish/Makefile.in Fri May 26 16:23:15 2000 -@@ -139,7 +139,7 @@ - gnomelocaledir = @gnomelocaledir@ - l = @l@ - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @PIXBUF_CFLAGS@ -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @PIXBUF_CFLAGS@ - - - SUBDIRS = help @@ -187,7 +187,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../.. @@ -42,15 +22,6 @@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) --- applets/gen_util/Makefile.in.orig Tue May 23 04:26:11 2000 +++ applets/gen_util/Makefile.in Fri May 26 16:23:39 2000 -@@ -141,7 +141,7 @@ - - SUBDIRS = help - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - lib_LTLIBRARIES = libgen_util_applet.la @@ -181,7 +181,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../.. @@ -60,14 +31,3 @@ libgen_util_applet_la_LIBADD = libgen_util_applet_la_OBJECTS = main.lo mailcheck.lo popcheck.lo \ printer.lo clock.lo ---- applets/tasklist/Makefile.in.orig Tue May 23 04:26:26 2000 -+++ applets/tasklist/Makefile.in Fri May 26 15:24:07 2000 -@@ -141,7 +141,7 @@ - - SUBDIRS = help - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(srcdir)/../desk-guide -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" @PIXBUF_CFLAGS@ -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(srcdir)/../desk-guide -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" @PIXBUF_CFLAGS@ - - - bin_PROGRAMS = tasklist_applet diff --git a/x11/gnomecore/files/patch-ah b/x11/gnomecore/files/patch-ah index afe5c26501d2..30c07e734189 100644 --- a/x11/gnomecore/files/patch-ah +++ b/x11/gnomecore/files/patch-ah @@ -1,14 +1,5 @@ --- panel/Makefile.in.orig Tue May 23 04:25:47 2000 +++ panel/Makefile.in Fri May 26 15:30:48 2000 -@@ -147,7 +147,7 @@ - - SUBDIRS = doc help - --INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS) @PIXBUF_CFLAGS@ -+INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(ORB_CFLAGS) @PIXBUF_CFLAGS@ - - - bin_PROGRAMS = panel gnome-panel-properties-capplet @@ -169,7 +169,7 @@ libpanel_appletinclude_HEADERS = applet-widget.h gnome-panel.h @@ -36,23 +27,6 @@ confexec_DATA = appletsConf.sh dockletsConf.sh panelgnorbadir = $(sysconfdir)/CORBA/servers -@@ -219,13 +219,13 @@ - soundlistdir = $(sysconfdir)/sound/events - soundlist_DATA = panel.soundlist - --hintsdir = $(datadir)/gnome/hints -+hintsdir = $(datadir)/hints - hints_DATA = panel.hints - - sysdir = $(datadir)/control-center/Desktop/ - sys_DATA = gnome-panel-properties.desktop - --deskdir = $(datadir)/gnome/apps/Settings/Desktop/ -+deskdir = $(datadir)/apps/Settings/Desktop/ - desk_DATA = gnome-panel-properties.desktop - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h - --- panel/foobar-widget.c.orig Sat May 6 20:48:27 2000 +++ panel/foobar-widget.c Wed May 31 12:51:56 2000 @@ -557,7 +557,7 @@ @@ -123,14 +97,3 @@ NULL }; int i; char *p; ---- panel/doc/Makefile.in.orig Tue May 23 04:25:49 2000 -+++ panel/doc/Makefile.in Fri May 26 16:45:35 2000 -@@ -150,7 +150,7 @@ - CFLAGS = "`gnome-config --cflags gnomeui applets docklets`" - LDFLAGS = "`gnome-config --libs gnomeui applets docklets`" - --HTML_DIR = $(datadir)/gnome/html -+HTML_DIR = $(datadir)/html - - TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) - diff --git a/x11/gnomecore/files/patch-am b/x11/gnomecore/files/patch-am index 63410295e912..c3586feca65e 100644 --- a/x11/gnomecore/files/patch-am +++ b/x11/gnomecore/files/patch-am @@ -36,34 +36,3 @@ }; static struct poptOption cb_options [] = { ---- gnome-terminal/Makefile.in.orig Tue May 23 04:25:29 2000 -+++ gnome-terminal/Makefile.in Fri May 26 15:46:43 2000 -@@ -143,7 +143,7 @@ - - SUBDIRS = C de da es it no - --INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -+INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" - - - LDADD = $(GNOME_LIBDIR) $(GNORBA_LIBS) $(ORB_LIBS) $(GNOMEUI_LIBS) $(ZVT_LIBS) $(INTLLIBS) -@@ -167,7 +167,7 @@ - gnorbadir = $(sysconfdir)/CORBA/servers - gnorba_DATA = gnome-terminal.gnorba - --utildir = $(datadir)/gnome/apps/System -+utildir = $(datadir)/apps/System - util_DATA = gnome-terminal.desktop - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h ---- gnome-terminal/de/Makefile.in.orig Tue May 23 04:25:31 2000 -+++ gnome-terminal/de/Makefile.in Fri May 26 15:53:04 2000 -@@ -139,7 +139,7 @@ - gnomelocaledir = @gnomelocaledir@ - l = @l@ - --gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/de -+gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/de - - gnome_terminal_help_DATA = index.html topic.dat - diff --git a/x11/gnomecore/files/patch-an b/x11/gnomecore/files/patch-an index 79a9c69d2695..521114be767a 100644 --- a/x11/gnomecore/files/patch-an +++ b/x11/gnomecore/files/patch-an @@ -1,23 +1,3 @@ ---- gmenu/Makefile.in.orig Tue May 23 04:25:39 2000 -+++ gmenu/Makefile.in Fri May 26 15:25:26 2000 -@@ -139,7 +139,7 @@ - gnomelocaledir = @gnomelocaledir@ - l = @l@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gmenu -@@ -152,7 +152,7 @@ - - EXTRA_DIST = gmenu.desktop top.xpm unknown.xpm - --sysdir = $(datadir)/gnome/apps/Settings -+sysdir = $(datadir)/apps/Settings - sys_DATA = gmenu.desktop - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h --- gmenu/main.c.orig Wed May 10 01:36:16 2000 +++ gmenu/main.c Fri May 26 15:09:49 2000 @@ -276,7 +276,7 @@ diff --git a/x11/gnomecore/files/patch-ap b/x11/gnomecore/files/patch-ap index a1e81ad131bd..09b57026b387 100644 --- a/x11/gnomecore/files/patch-ap +++ b/x11/gnomecore/files/patch-ap @@ -1,23 +1,7 @@ ---- gsm/Makefile.in.orig Tue May 23 04:24:59 2000 -+++ gsm/Makefile.in Fri May 26 15:28:56 2000 -@@ -141,9 +141,9 @@ - - SUBDIRS = help +--- gsm/Makefile.in.orig Tue Aug 1 23:56:19 2000 ++++ gsm/Makefile.in Tue Aug 1 23:59:25 2000 +@@ -143,3 +143,3 @@ -defaultdir = $(datadir)/gnome +defaultdir = $(datadir) --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DDEFAULTDIR="\"$(defaultdir)\"" -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DDEFAULTDIR="\"$(defaultdir)\"" - - - LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) -@@ -169,7 +169,7 @@ - - default_DATA = default.session default.wm - --desktopdir = $(datadir)/gnome/apps/Settings/Session/ -+desktopdir = $(datadir)/apps/Settings/Session/ - desktop_DATA = save-session.desktop session.desktop - - man_MANS = gnome-wm.1 save-session.1 default.session.5 gnome-session.1 diff --git a/x11/gnomelibs/Makefile b/x11/gnomelibs/Makefile index 5eca7664198c..90b311d64e31 100644 --- a/x11/gnomelibs/Makefile +++ b/x11/gnomelibs/Makefile @@ -39,4 +39,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gnome.1 gnome-config.1 MAN5= gnome-mime.5 +post-extract: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + .include <bsd.port.mk> diff --git a/x11/gnomelibs/files/patch-aa b/x11/gnomelibs/files/patch-aa index 4b1108a7aa4a..604dc409f06d 100644 --- a/x11/gnomelibs/files/patch-aa +++ b/x11/gnomelibs/files/patch-aa @@ -1,33 +1,15 @@ ---- configure.orig Tue Apr 27 14:24:19 1999 -+++ configure Mon Jun 7 20:27:21 1999 -@@ -2521,7 +2521,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- PTHREAD_LIB="-lc_r" -+ PTHREAD_LIB="" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for pthread_create""... $ac_c" 1>&6 -@@ -5215,7 +5215,7 @@ - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest* - INSTOBJEXT=.mo -@@ -7372,7 +7372,7 @@ +--- configure.orig Tue Aug 1 21:58:10 2000 ++++ configure Tue Aug 1 21:59:03 2000 +@@ -7214,7 +7214,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-ltiff -lm $LIBS" +LIBS="-ltiff -ljpeg -lz -lm $LIBS" cat > conftest.$ac_ext <<EOF - #line 7378 "configure" + #line 7220 "configure" #include "confdefs.h" -@@ -10853,13 +10853,13 @@ +@@ -10208,13 +10208,13 @@ SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support' ART_LIBS="-lart_lgpl" @@ -43,7 +25,15 @@ GNOME_IDLDIR='-I${datadir}/idl' -@@ -11724,10 +11724,6 @@ +@@ -10609,6 +10609,7 @@ + s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g + s%@MAINT@%$MAINT%g + s%@cflags_set@%$cflags_set%g ++s%@GLIB_CONFIG@%$GLIB_CONFIG%g + s%@GTK_CONFIG@%$GTK_CONFIG%g + s%@GTK_CFLAGS@%$GTK_CFLAGS%g + s%@GTK_LIBS@%$GTK_LIBS%g +@@ -11079,10 +11080,6 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac diff --git a/x11/gnomelibs/files/patch-ac b/x11/gnomelibs/files/patch-ac index 6b3a11c2a084..f73a45521ae8 100644 --- a/x11/gnomelibs/files/patch-ac +++ b/x11/gnomelibs/files/patch-ac @@ -14,13 +14,13 @@ Known values for LIBRARY are: - glib (calls glib-config) -+ glib (calls glib12-config) ++ glib (calls @GLIB_CONFIG@) idl (to be used with orbit-idl) gnome gnomeui gnorba - gtk (calls gtk-config) -+ gtk (calls gtk12-config) ++ gtk (calls @GTK_CONFIG@) gtkxmhtml (only --libs) zvt (only --libs) @@ -41,14 +41,14 @@ glib) - the_libs="$the_libs `glib-config --libs`" - the_flags="$the_flags `glib-config --cflags`" -+ the_libs="$the_libs `glib12-config --libs`" -+ the_flags="$the_flags `glib12-config --cflags`" ++ the_libs="$the_libs `@GLIB_CONFIG@ --libs`" ++ the_flags="$the_flags `@GLIB_CONFIG@ --cflags`" ;; gtk) - the_libs="$the_libs `gtk-config --libs`" - the_flags="$the_flags `gtk-config --cflags`" -+ the_libs="$the_libs `gtk12-config --libs`" -+ the_flags="$the_flags `gtk12-config --cflags`" ++ the_libs="$the_libs `@GTK_CONFIG@ --libs`" ++ the_flags="$the_flags `@GTK_CONFIG@ --cflags`" ;; gnome) the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@" diff --git a/x11/gnomelibs/files/patch-ag b/x11/gnomelibs/files/patch-ag index 8778bc26ffc9..6b5481c4e7b9 100644 --- a/x11/gnomelibs/files/patch-ag +++ b/x11/gnomelibs/files/patch-ag @@ -6,7 +6,7 @@ static char *shells [] = { - "/bin/bash", "/bin/zsh", "/bin/tcsh", "/bin/ksh", - "/bin/csh", "/bin/sh", 0 -+ "/bin/csh", "/bin/sh", "/usr/local/bin/tcsh", ++ "/bin/csh", "/bin/sh", "/bin/tcsh", "/usr/local/bin/tcsh", + "/usr/local/bin/bash", "/usr/local/bin/ksh", + "/usr/local/bin/zsh", "/usr/local/sbin/scsh", 0 }; diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile index 5eca7664198c..90b311d64e31 100644 --- a/x11/libgnome/Makefile +++ b/x11/libgnome/Makefile @@ -39,4 +39,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ MAN1= gnome.1 gnome-config.1 MAN5= gnome-mime.5 +post-extract: + @${PERL} -pi -e 's|-lpthread|-pthread|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure + @find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \ + 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ + s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' + .include <bsd.port.mk> diff --git a/x11/libgnome/files/patch-aa b/x11/libgnome/files/patch-aa index 4b1108a7aa4a..604dc409f06d 100644 --- a/x11/libgnome/files/patch-aa +++ b/x11/libgnome/files/patch-aa @@ -1,33 +1,15 @@ ---- configure.orig Tue Apr 27 14:24:19 1999 -+++ configure Mon Jun 7 20:27:21 1999 -@@ -2521,7 +2521,7 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- PTHREAD_LIB="-lc_r" -+ PTHREAD_LIB="" - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for pthread_create""... $ac_c" 1>&6 -@@ -5215,7 +5215,7 @@ - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest* - INSTOBJEXT=.mo -@@ -7372,7 +7372,7 @@ +--- configure.orig Tue Aug 1 21:58:10 2000 ++++ configure Tue Aug 1 21:59:03 2000 +@@ -7214,7 +7214,7 @@ echo $ac_n "(cached) $ac_c" 1>&6 else ac_save_LIBS="$LIBS" -LIBS="-ltiff -lm $LIBS" +LIBS="-ltiff -ljpeg -lz -lm $LIBS" cat > conftest.$ac_ext <<EOF - #line 7378 "configure" + #line 7220 "configure" #include "confdefs.h" -@@ -10853,13 +10853,13 @@ +@@ -10208,13 +10208,13 @@ SUPPORTINCS='-DNEED_GNOMESUPPORT_H -I$(top_builddir)/support -I$(top_srcdir)/support' ART_LIBS="-lart_lgpl" @@ -43,7 +25,15 @@ GNOME_IDLDIR='-I${datadir}/idl' -@@ -11724,10 +11724,6 @@ +@@ -10609,6 +10609,7 @@ + s%@MAINTAINER_MODE_FALSE@%$MAINTAINER_MODE_FALSE%g + s%@MAINT@%$MAINT%g + s%@cflags_set@%$cflags_set%g ++s%@GLIB_CONFIG@%$GLIB_CONFIG%g + s%@GTK_CONFIG@%$GTK_CONFIG%g + s%@GTK_CFLAGS@%$GTK_CFLAGS%g + s%@GTK_LIBS@%$GTK_LIBS%g +@@ -11079,10 +11080,6 @@ *) # Relative path. ac_sub_cache_file="$ac_dots$cache_file" ;; esac diff --git a/x11/libgnome/files/patch-ac b/x11/libgnome/files/patch-ac index 6b3a11c2a084..f73a45521ae8 100644 --- a/x11/libgnome/files/patch-ac +++ b/x11/libgnome/files/patch-ac @@ -14,13 +14,13 @@ Known values for LIBRARY are: - glib (calls glib-config) -+ glib (calls glib12-config) ++ glib (calls @GLIB_CONFIG@) idl (to be used with orbit-idl) gnome gnomeui gnorba - gtk (calls gtk-config) -+ gtk (calls gtk12-config) ++ gtk (calls @GTK_CONFIG@) gtkxmhtml (only --libs) zvt (only --libs) @@ -41,14 +41,14 @@ glib) - the_libs="$the_libs `glib-config --libs`" - the_flags="$the_flags `glib-config --cflags`" -+ the_libs="$the_libs `glib12-config --libs`" -+ the_flags="$the_flags `glib12-config --cflags`" ++ the_libs="$the_libs `@GLIB_CONFIG@ --libs`" ++ the_flags="$the_flags `@GLIB_CONFIG@ --cflags`" ;; gtk) - the_libs="$the_libs `gtk-config --libs`" - the_flags="$the_flags `gtk-config --cflags`" -+ the_libs="$the_libs `gtk12-config --libs`" -+ the_flags="$the_flags `gtk12-config --cflags`" ++ the_libs="$the_libs `@GTK_CONFIG@ --libs`" ++ the_flags="$the_flags `@GTK_CONFIG@ --cflags`" ;; gnome) the_libs="$the_libs @GNOME_LIBDIR@ @GNOME_LIBS@" diff --git a/x11/libgnome/files/patch-ag b/x11/libgnome/files/patch-ag index 8778bc26ffc9..6b5481c4e7b9 100644 --- a/x11/libgnome/files/patch-ag +++ b/x11/libgnome/files/patch-ag @@ -6,7 +6,7 @@ static char *shells [] = { - "/bin/bash", "/bin/zsh", "/bin/tcsh", "/bin/ksh", - "/bin/csh", "/bin/sh", 0 -+ "/bin/csh", "/bin/sh", "/usr/local/bin/tcsh", ++ "/bin/csh", "/bin/sh", "/bin/tcsh", "/usr/local/bin/tcsh", + "/usr/local/bin/bash", "/usr/local/bin/ksh", + "/usr/local/bin/zsh", "/usr/local/sbin/scsh", 0 }; |