diff options
80 files changed, 611 insertions, 2079 deletions
diff --git a/audio/gnome-media/Makefile b/audio/gnome-media/Makefile index 52ff91c7cb86..2d6d0d40b3f5 100644 --- a/audio/gnome-media/Makefile +++ b/audio/gnome-media/Makefile @@ -27,4 +27,11 @@ CONFIGURE_ARGS= --without-ncurses \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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/audio/gnome-media/files/patch-ac b/audio/gnome-media/files/patch-ac index d234ced223d5..550d1e6d083c 100644 --- a/audio/gnome-media/files/patch-ac +++ b/audio/gnome-media/files/patch-ac @@ -1,67 +1,14 @@ --- cddbslave/Makefile.in.orig Wed May 24 14:53:10 2000 +++ cddbslave/Makefile.in Tue May 30 15:13:02 2000 -@@ -125,3 +125,3 @@ - --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - @@ -139,3 +139,3 @@ -gnomedatadir = $(datadir)/gnome +gnomedatadir = $(datadir) ---- gmix/Makefile.in.orig Wed May 24 14:53:13 2000 -+++ gmix/Makefile.in Tue May 30 15:11:42 2000 -@@ -125,3 +125,3 @@ - --Audiodir = $(datadir)/gnome/apps/Multimedia -+Audiodir = $(datadir)/apps/Multimedia - pixmapdir = $(datadir)/pixmaps -@@ -131,3 +131,3 @@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" - ---- grecord/Makefile.in.orig Wed May 24 14:53:19 2000 -+++ grecord/Makefile.in Tue May 30 15:39:21 2000 -@@ -130,3 +130,3 @@ - --Applicationsdir = $(datadir)/gnome/apps/Multimedia -+Applicationsdir = $(datadir)/apps/Multimedia - Applications_DATA = Soundrecorder.desktop ---- grecord/src/Makefile.in.orig Wed May 24 14:53:21 2000 -+++ grecord/src/Makefile.in Tue May 30 15:39:42 2000 -@@ -125,3 +125,3 @@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_srcdir)/intl $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(top_srcdir)/intl $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" - --- tcd/Makefile.in.orig Wed May 24 14:53:16 2000 +++ tcd/Makefile.in Tue May 30 15:12:38 2000 -@@ -125,3 +125,3 @@ - --Audiodir = $(datadir)/gnome/apps/Multimedia -+Audiodir = $(datadir)/apps/Multimedia - Pixmapdir = $(datadir)/pixmaps @@ -147,3 +147,3 @@ -tcd_LDADD = $(GNOME_LIBDIR) -lglib -lm $(CURSES_LIBS) $(INTLLIBS) +tcd_LDADD = `$(GLIB_CONFIG) --libs` -lm $(CURSES_LIBS) $(INTLLIBS) -@@ -151,3 +151,3 @@ - --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(USE_CD_CHANGER) -DGNOME_ICONDIR=\""$(Pixmapdir)"\" -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(USE_CD_CHANGER) -DGNOME_ICONDIR=\""$(Pixmapdir)"\" - ---- vu-meter/Makefile.in.orig Wed May 24 14:53:11 2000 -+++ vu-meter/Makefile.in Tue May 30 15:11:23 2000 -@@ -125,3 +125,3 @@ - --Audiodir = $(datadir)/gnome/apps/Multimedia -+Audiodir = $(datadir)/apps/Multimedia - -@@ -129,3 +129,3 @@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" - diff --git a/audio/gnomemedia/Makefile b/audio/gnomemedia/Makefile index 52ff91c7cb86..2d6d0d40b3f5 100644 --- a/audio/gnomemedia/Makefile +++ b/audio/gnomemedia/Makefile @@ -27,4 +27,11 @@ CONFIGURE_ARGS= --without-ncurses \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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/audio/gnomemedia/files/patch-ac b/audio/gnomemedia/files/patch-ac index d234ced223d5..550d1e6d083c 100644 --- a/audio/gnomemedia/files/patch-ac +++ b/audio/gnomemedia/files/patch-ac @@ -1,67 +1,14 @@ --- cddbslave/Makefile.in.orig Wed May 24 14:53:10 2000 +++ cddbslave/Makefile.in Tue May 30 15:13:02 2000 -@@ -125,3 +125,3 @@ - --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - @@ -139,3 +139,3 @@ -gnomedatadir = $(datadir)/gnome +gnomedatadir = $(datadir) ---- gmix/Makefile.in.orig Wed May 24 14:53:13 2000 -+++ gmix/Makefile.in Tue May 30 15:11:42 2000 -@@ -125,3 +125,3 @@ - --Audiodir = $(datadir)/gnome/apps/Multimedia -+Audiodir = $(datadir)/apps/Multimedia - pixmapdir = $(datadir)/pixmaps -@@ -131,3 +131,3 @@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" - ---- grecord/Makefile.in.orig Wed May 24 14:53:19 2000 -+++ grecord/Makefile.in Tue May 30 15:39:21 2000 -@@ -130,3 +130,3 @@ - --Applicationsdir = $(datadir)/gnome/apps/Multimedia -+Applicationsdir = $(datadir)/apps/Multimedia - Applications_DATA = Soundrecorder.desktop ---- grecord/src/Makefile.in.orig Wed May 24 14:53:21 2000 -+++ grecord/src/Makefile.in Tue May 30 15:39:42 2000 -@@ -125,3 +125,3 @@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_srcdir)/intl $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(top_srcdir)/intl $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" - --- tcd/Makefile.in.orig Wed May 24 14:53:16 2000 +++ tcd/Makefile.in Tue May 30 15:12:38 2000 -@@ -125,3 +125,3 @@ - --Audiodir = $(datadir)/gnome/apps/Multimedia -+Audiodir = $(datadir)/apps/Multimedia - Pixmapdir = $(datadir)/pixmaps @@ -147,3 +147,3 @@ -tcd_LDADD = $(GNOME_LIBDIR) -lglib -lm $(CURSES_LIBS) $(INTLLIBS) +tcd_LDADD = `$(GLIB_CONFIG) --libs` -lm $(CURSES_LIBS) $(INTLLIBS) -@@ -151,3 +151,3 @@ - --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(USE_CD_CHANGER) -DGNOME_ICONDIR=\""$(Pixmapdir)"\" -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(USE_CD_CHANGER) -DGNOME_ICONDIR=\""$(Pixmapdir)"\" - ---- vu-meter/Makefile.in.orig Wed May 24 14:53:11 2000 -+++ vu-meter/Makefile.in Tue May 30 15:11:23 2000 -@@ -125,3 +125,3 @@ - --Audiodir = $(datadir)/gnome/apps/Multimedia -+Audiodir = $(datadir)/apps/Multimedia - -@@ -129,3 +129,3 @@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" - diff --git a/audio/gnomemedia2/Makefile b/audio/gnomemedia2/Makefile index 52ff91c7cb86..2d6d0d40b3f5 100644 --- a/audio/gnomemedia2/Makefile +++ b/audio/gnomemedia2/Makefile @@ -27,4 +27,11 @@ CONFIGURE_ARGS= --without-ncurses \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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/audio/gnomemedia2/files/patch-ac b/audio/gnomemedia2/files/patch-ac index d234ced223d5..550d1e6d083c 100644 --- a/audio/gnomemedia2/files/patch-ac +++ b/audio/gnomemedia2/files/patch-ac @@ -1,67 +1,14 @@ --- cddbslave/Makefile.in.orig Wed May 24 14:53:10 2000 +++ cddbslave/Makefile.in Tue May 30 15:13:02 2000 -@@ -125,3 +125,3 @@ - --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - @@ -139,3 +139,3 @@ -gnomedatadir = $(datadir)/gnome +gnomedatadir = $(datadir) ---- gmix/Makefile.in.orig Wed May 24 14:53:13 2000 -+++ gmix/Makefile.in Tue May 30 15:11:42 2000 -@@ -125,3 +125,3 @@ - --Audiodir = $(datadir)/gnome/apps/Multimedia -+Audiodir = $(datadir)/apps/Multimedia - pixmapdir = $(datadir)/pixmaps -@@ -131,3 +131,3 @@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" - ---- grecord/Makefile.in.orig Wed May 24 14:53:19 2000 -+++ grecord/Makefile.in Tue May 30 15:39:21 2000 -@@ -130,3 +130,3 @@ - --Applicationsdir = $(datadir)/gnome/apps/Multimedia -+Applicationsdir = $(datadir)/apps/Multimedia - Applications_DATA = Soundrecorder.desktop ---- grecord/src/Makefile.in.orig Wed May 24 14:53:21 2000 -+++ grecord/src/Makefile.in Tue May 30 15:39:42 2000 -@@ -125,3 +125,3 @@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_srcdir)/intl $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(top_srcdir)/intl $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\" - --- tcd/Makefile.in.orig Wed May 24 14:53:16 2000 +++ tcd/Makefile.in Tue May 30 15:12:38 2000 -@@ -125,3 +125,3 @@ - --Audiodir = $(datadir)/gnome/apps/Multimedia -+Audiodir = $(datadir)/apps/Multimedia - Pixmapdir = $(datadir)/pixmaps @@ -147,3 +147,3 @@ -tcd_LDADD = $(GNOME_LIBDIR) -lglib -lm $(CURSES_LIBS) $(INTLLIBS) +tcd_LDADD = `$(GLIB_CONFIG) --libs` -lm $(CURSES_LIBS) $(INTLLIBS) -@@ -151,3 +151,3 @@ - --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(USE_CD_CHANGER) -DGNOME_ICONDIR=\""$(Pixmapdir)"\" -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(USE_CD_CHANGER) -DGNOME_ICONDIR=\""$(Pixmapdir)"\" - ---- vu-meter/Makefile.in.orig Wed May 24 14:53:11 2000 -+++ vu-meter/Makefile.in Tue May 30 15:11:23 2000 -@@ -125,3 +125,3 @@ - --Audiodir = $(datadir)/gnome/apps/Multimedia -+Audiodir = $(datadir)/apps/Multimedia - -@@ -129,3 +129,3 @@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) -DGNOME_ICONDIR=\""$(pixmapdir)"\" - diff --git a/deskutils/gnome-pim/Makefile b/deskutils/gnome-pim/Makefile index 97587191e04a..cafdfe23a1a9 100644 --- a/deskutils/gnome-pim/Makefile +++ b/deskutils/gnome-pim/Makefile @@ -41,6 +41,13 @@ pre-extract: @${ECHO} "You can add gnomepilot support by defining WITH_GNOMEPILOT" .endif +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' + .if defined(WITH_GNOMEPILOT) post-install: @${CAT} ${PKGDIR}/PLIST.pilot >> ${TMPPLIST} diff --git a/deskutils/gnome-pim/files/patch-ab b/deskutils/gnome-pim/files/patch-ab index a90fec35121a..a64463dc909a 100644 --- a/deskutils/gnome-pim/files/patch-ab +++ b/deskutils/gnome-pim/files/patch-ab @@ -1,79 +1,17 @@ --- gncal/Makefile.in.orig Sat May 20 20:52:50 2000 -+++ gncal/Makefile.in Fri Jun 2 12:41:34 2000 -@@ -141,12 +141,12 @@ - gnorbadir = $(sysconfdir)/CORBA/servers - gnorba_DATA = gnomecal.gnorba ++++ gncal/Makefile.in Wed Aug 2 10:27:30 2000 +@@ -143,3 +143,3 @@ --help_base = $(datadir)/gnome/help/cal +-help_base = $(datadir)/help/cal +help_base = $(datadir)/help/gnomecal - @HAVE_GNOME_PILOT_TRUE@extra_pilot_bins = calendar-conduit-control-applet calendar-pilot-sync - bin_PROGRAMS = gnomecal $(extra_pilot_bins) - --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(GNOME_CONDUIT_INCLUDEDIR) $(PISOCK_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(GNOME_CONDUIT_INCLUDEDIR) $(PISOCK_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - - - GNOMECAL_CORBA_GENERATED = GnomeCal.h GnomeCal.c GnomeCal-common.c GnomeCal-skels.c GnomeCal-stubs.c -@@ -172,7 +172,7 @@ - libcalendar_conduit_la_SOURCES = GnomeCal-common.c GnomeCal-stubs.c calendar-conduit.c calobj.c alarm.c calendar.c timeutil.c - +@@ -174,3 +174,3 @@ -libcalendar_conduit_la_LDFLAGS = -rpath $(libdir) +libcalendar_conduit_la_LDFLAGS = -rpath $(libdir) -avoid-version - - libcalendar_conduit_la_LIBADD = ../libversit/libversit.la $(PISOCK_LIBDIR) $(PISOCK_LIBS) $(GNOME_LIBDIR) $(GNOME_LIBS) -@@ -221,7 +221,7 @@ - @HAVE_GNOME_PILOT_TRUE@ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits - @HAVE_GNOME_PILOT_TRUE@ccenterConduits_DATA = calendar-conduit-control-applet.desktop - --@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits -+@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits - @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA) - - @HAVE_GNOME_PILOT_TRUE@Conduitdir = $(datadir)/gnome-pilot/conduits/ -@@ -233,7 +233,7 @@ - appicondir = $(datadir)/pixmaps - appicon_DATA = gnome-calendar-conduit.png - --Productivitydir = $(datadir)/gnome/apps/Applications -+Productivitydir = $(datadir)/apps/Applications - - Productivity_DATA = gncal.desktop - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- gnomecard/Makefile.in.orig Sat May 20 20:52:58 2000 +++ gnomecard/Makefile.in Fri Jun 2 12:42:28 2000 -@@ -135,9 +135,9 @@ - - nSUBDIRS = help - --xpmhelp_base = $(datadir)/gnome/help/cal -+xpmhelp_base = $(datadir)/help/cal - --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(PISOCK_INCLUDEDIR) -I../../gcalendar -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(PISOCK_INCLUDEDIR) -I../../gcalendar - - - @HAVE_GNOME_PILOT_TRUE@extra_pilot_bins = address-conduit-capplet -@@ -183,7 +183,7 @@ - - @HAVE_GNOME_PILOT_TRUE@ccenterConduits_DATA = address-conduit-capplet.desktop - --@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits -+@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits - @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA) - - @HAVE_GNOME_PILOT_TRUE@Conduitdir = $(datadir)/gnome-pilot/conduits/ -@@ -192,7 +192,7 @@ - EXTRA_DIST = addr.xpm addrtool.xpm cardedit.xpm cardnew.xpm cardfind.xpm email.xpm expl.xpm first.xpm geo.xpm ident.xpm last.xpm org.xpm sec.xpm tel.xpm teltool.xpm phone.xpm world.xpm gnome-card.xpm gnomecard.desktop address-conduit-capplet.desktop gnomecard.conduit gnome-gnomecard.png gnomecard.gnorba ChangeLog BUGS - - --Productivitydir = $(datadir)/gnome/apps/Applications -+Productivitydir = $(datadir)/apps/Applications - - Productivity_DATA = gnomecard.desktop - @@ -206,7 +206,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.. diff --git a/deskutils/gnome-utils/Makefile b/deskutils/gnome-utils/Makefile index 57efddb91aa9..e87071ccd9af 100644 --- a/deskutils/gnome-utils/Makefile +++ b/deskutils/gnome-utils/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ade@FreeBSD.org LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ gtop.1:${PORTSDIR}/devel/libgtop \ - guile.6:${PORTSDIR}/lang/guile \ + guile.9:${PORTSDIR}/lang/guile \ glade.4:${PORTSDIR}/devel/libglade RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter @@ -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/deskutils/gnome-utils/files/patch-aa b/deskutils/gnome-utils/files/patch-aa index 149087c84669..6f97cad1373c 100644 --- a/deskutils/gnome-utils/files/patch-aa +++ b/deskutils/gnome-utils/files/patch-aa @@ -1,14 +1,5 @@ --- configure.orig Fri May 19 14:49:06 2000 +++ configure Tue May 30 13:31:24 2000 -@@ -5101,7 +5101,7 @@ - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest* - INSTOBJEXT=.mo @@ -6350,17 +6350,13 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 diff --git a/deskutils/gnomepim/Makefile b/deskutils/gnomepim/Makefile index 97587191e04a..cafdfe23a1a9 100644 --- a/deskutils/gnomepim/Makefile +++ b/deskutils/gnomepim/Makefile @@ -41,6 +41,13 @@ pre-extract: @${ECHO} "You can add gnomepilot support by defining WITH_GNOMEPILOT" .endif +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' + .if defined(WITH_GNOMEPILOT) post-install: @${CAT} ${PKGDIR}/PLIST.pilot >> ${TMPPLIST} diff --git a/deskutils/gnomepim/files/patch-ab b/deskutils/gnomepim/files/patch-ab index a90fec35121a..a64463dc909a 100644 --- a/deskutils/gnomepim/files/patch-ab +++ b/deskutils/gnomepim/files/patch-ab @@ -1,79 +1,17 @@ --- gncal/Makefile.in.orig Sat May 20 20:52:50 2000 -+++ gncal/Makefile.in Fri Jun 2 12:41:34 2000 -@@ -141,12 +141,12 @@ - gnorbadir = $(sysconfdir)/CORBA/servers - gnorba_DATA = gnomecal.gnorba ++++ gncal/Makefile.in Wed Aug 2 10:27:30 2000 +@@ -143,3 +143,3 @@ --help_base = $(datadir)/gnome/help/cal +-help_base = $(datadir)/help/cal +help_base = $(datadir)/help/gnomecal - @HAVE_GNOME_PILOT_TRUE@extra_pilot_bins = calendar-conduit-control-applet calendar-pilot-sync - bin_PROGRAMS = gnomecal $(extra_pilot_bins) - --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(GNOME_CONDUIT_INCLUDEDIR) $(PISOCK_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) $(GNOME_CONDUIT_INCLUDEDIR) $(PISOCK_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - - - GNOMECAL_CORBA_GENERATED = GnomeCal.h GnomeCal.c GnomeCal-common.c GnomeCal-skels.c GnomeCal-stubs.c -@@ -172,7 +172,7 @@ - libcalendar_conduit_la_SOURCES = GnomeCal-common.c GnomeCal-stubs.c calendar-conduit.c calobj.c alarm.c calendar.c timeutil.c - +@@ -174,3 +174,3 @@ -libcalendar_conduit_la_LDFLAGS = -rpath $(libdir) +libcalendar_conduit_la_LDFLAGS = -rpath $(libdir) -avoid-version - - libcalendar_conduit_la_LIBADD = ../libversit/libversit.la $(PISOCK_LIBDIR) $(PISOCK_LIBS) $(GNOME_LIBDIR) $(GNOME_LIBS) -@@ -221,7 +221,7 @@ - @HAVE_GNOME_PILOT_TRUE@ccenterConduitsdir = $(ccenterPalmPilotdir)/Conduits - @HAVE_GNOME_PILOT_TRUE@ccenterConduits_DATA = calendar-conduit-control-applet.desktop - --@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits -+@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits - @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA) - - @HAVE_GNOME_PILOT_TRUE@Conduitdir = $(datadir)/gnome-pilot/conduits/ -@@ -233,7 +233,7 @@ - appicondir = $(datadir)/pixmaps - appicon_DATA = gnome-calendar-conduit.png - --Productivitydir = $(datadir)/gnome/apps/Applications -+Productivitydir = $(datadir)/apps/Applications - - Productivity_DATA = gncal.desktop - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- gnomecard/Makefile.in.orig Sat May 20 20:52:58 2000 +++ gnomecard/Makefile.in Fri Jun 2 12:42:28 2000 -@@ -135,9 +135,9 @@ - - nSUBDIRS = help - --xpmhelp_base = $(datadir)/gnome/help/cal -+xpmhelp_base = $(datadir)/help/cal - --INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(PISOCK_INCLUDEDIR) -I../../gcalendar -+INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(PISOCK_INCLUDEDIR) -I../../gcalendar - - - @HAVE_GNOME_PILOT_TRUE@extra_pilot_bins = address-conduit-capplet -@@ -183,7 +183,7 @@ - - @HAVE_GNOME_PILOT_TRUE@ccenterConduits_DATA = address-conduit-capplet.desktop - --@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/gnome/apps/Settings/Peripherals/Conduits -+@HAVE_GNOME_PILOT_TRUE@panelConduitsdir = $(datadir)/apps/Settings/Peripherals/Conduits - @HAVE_GNOME_PILOT_TRUE@panelConduits_DATA = $(ccenterConduits_DATA) - - @HAVE_GNOME_PILOT_TRUE@Conduitdir = $(datadir)/gnome-pilot/conduits/ -@@ -192,7 +192,7 @@ - EXTRA_DIST = addr.xpm addrtool.xpm cardedit.xpm cardnew.xpm cardfind.xpm email.xpm expl.xpm first.xpm geo.xpm ident.xpm last.xpm org.xpm sec.xpm tel.xpm teltool.xpm phone.xpm world.xpm gnome-card.xpm gnomecard.desktop address-conduit-capplet.desktop gnomecard.conduit gnome-gnomecard.png gnomecard.gnorba ChangeLog BUGS - - --Productivitydir = $(datadir)/gnome/apps/Applications -+Productivitydir = $(datadir)/apps/Applications - - Productivity_DATA = gnomecard.desktop - @@ -206,7 +206,7 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.. diff --git a/deskutils/gnomeutils2/Makefile b/deskutils/gnomeutils2/Makefile index 57efddb91aa9..e87071ccd9af 100644 --- a/deskutils/gnomeutils2/Makefile +++ b/deskutils/gnomeutils2/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ade@FreeBSD.org LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ gtop.1:${PORTSDIR}/devel/libgtop \ - guile.6:${PORTSDIR}/lang/guile \ + guile.9:${PORTSDIR}/lang/guile \ glade.4:${PORTSDIR}/devel/libglade RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter @@ -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/deskutils/gnomeutils2/files/patch-aa b/deskutils/gnomeutils2/files/patch-aa index 149087c84669..6f97cad1373c 100644 --- a/deskutils/gnomeutils2/files/patch-aa +++ b/deskutils/gnomeutils2/files/patch-aa @@ -1,14 +1,5 @@ --- configure.orig Fri May 19 14:49:06 2000 +++ configure Tue May 30 13:31:24 2000 -@@ -5101,7 +5101,7 @@ - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest* - INSTOBJEXT=.mo @@ -6350,17 +6350,13 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 diff --git a/devel/bug-buddy/Makefile b/devel/bug-buddy/Makefile index 8d8212389e40..ec9a64f65f1c 100644 --- a/devel/bug-buddy/Makefile +++ b/devel/bug-buddy/Makefile @@ -25,4 +25,11 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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/devel/bugbuddy/Makefile b/devel/bugbuddy/Makefile index 8d8212389e40..ec9a64f65f1c 100644 --- a/devel/bugbuddy/Makefile +++ b/devel/bugbuddy/Makefile @@ -25,4 +25,11 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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/devel/bugbuddy2/Makefile b/devel/bugbuddy2/Makefile index 8d8212389e40..ec9a64f65f1c 100644 --- a/devel/bugbuddy2/Makefile +++ b/devel/bugbuddy2/Makefile @@ -25,4 +25,11 @@ CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ 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/devel/libgtop/Makefile b/devel/libgtop/Makefile index c7a65e1a2f1d..efd81e044497 100644 --- a/devel/libgtop/Makefile +++ b/devel/libgtop/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= stable/sources/libgtop MAINTAINER= ade@FreeBSD.org LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - guile.6:${PORTSDIR}/lang/guile + guile.9:${PORTSDIR}/lang/guile GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config @@ -27,6 +27,13 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GLIB_CONFIG="${GLIB_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' + post-install: install-info --section="Programming \& development tools" \ --entry="* libgtop: (libgtop). libgtop programming manual" \ diff --git a/devel/libgtop/files/patch-ac b/devel/libgtop/files/patch-ac index 9db028375fb8..f2e96066aab2 100644 --- a/devel/libgtop/files/patch-ac +++ b/devel/libgtop/files/patch-ac @@ -13,12 +13,3 @@ LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}' -@@ -8005,7 +8005,7 @@ - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest* - INSTOBJEXT=.mo diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile index c7a65e1a2f1d..efd81e044497 100644 --- a/devel/libgtop2/Makefile +++ b/devel/libgtop2/Makefile @@ -14,7 +14,7 @@ MASTER_SITE_SUBDIR= stable/sources/libgtop MAINTAINER= ade@FreeBSD.org LIB_DEPENDS= gnome.4:${PORTSDIR}/x11/gnomelibs \ - guile.6:${PORTSDIR}/lang/guile + guile.9:${PORTSDIR}/lang/guile GLIB_CONFIG?= ${LOCALBASE}/bin/glib12-config @@ -27,6 +27,13 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ GLIB_CONFIG="${GLIB_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' + post-install: install-info --section="Programming \& development tools" \ --entry="* libgtop: (libgtop). libgtop programming manual" \ diff --git a/devel/libgtop2/files/patch-ac b/devel/libgtop2/files/patch-ac index 9db028375fb8..f2e96066aab2 100644 --- a/devel/libgtop2/files/patch-ac +++ b/devel/libgtop2/files/patch-ac @@ -13,12 +13,3 @@ LT_VERSION_INFO='-version-info ${LT_CURRENT}:${LT_REVISION}:${LT_AGE}' -@@ -8005,7 +8005,7 @@ - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest* - INSTOBJEXT=.mo diff --git a/games/gnome-games/Makefile b/games/gnome-games/Makefile index 560e68782204..82fe646ec4b1 100644 --- a/games/gnome-games/Makefile +++ b/games/gnome-games/Makefile @@ -15,7 +15,7 @@ DISTNAME= gnome-games-${PORTVERSION} MAINTAINER= ade@FreeBSD.org LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - guile.6:${PORTSDIR}/lang/guile + guile.9:${PORTSDIR}/lang/guile RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter GTK_CONFIG?= ${X11BASE}/bin/gtk12-config @@ -30,4 +30,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/games/gnome-games/files/patch-ab b/games/gnome-games/files/patch-ab index 9b356b08e058..84838dd2151e 100644 --- a/games/gnome-games/files/patch-ab +++ b/games/gnome-games/files/patch-ab @@ -1,174 +1,5 @@ ---- aisleriot/Makefile.in.orig Sun Sep 26 13:29:13 1999 -+++ aisleriot/Makefile.in Mon Sep 27 09:30:04 1999 -@@ -128,12 +128,12 @@ - scoredir = $(localstatedir)/games - cardimagedir = $(datadir)/pixmaps/cards - icondir = $(datadir)/pixmaps --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - typesdir = $(datadir)/sol-games - --SUBDIRS = docs pixmaps -+SUBDIRS = pixmaps - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(GUILE_INCS) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(GUILE_INCS) - - - bin_PROGRAMS = sol -@@ -154,7 +154,7 @@ - EXTRA_DIST = AUTHORS $(types_DATA) $(cardimage_DATA) $(icon_DATA) sol.desktop SCHEME_GAMES.h - - --sysdir = $(datadir)/gnome/apps/Games -+sysdir = $(datadir)/apps/Games - sys_DATA = sol.desktop - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h ---- aisleriot/docs/Makefile.in.orig Sun Sep 26 13:29:29 1999 -+++ aisleriot/docs/Makefile.in Mon Sep 27 09:30:38 1999 -@@ -131,7 +131,7 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --helpdir = $(datadir)/gnome/help/aisleriot/C -+helpdir = $(datadir)/help/aisleriot/C - - help_DATA = index.html intro.html glossary.html gpl.html camelot.html canfield.html clock.html doublets.html eagle-wing.html elevator.html fortunes.html kansas.html klondike.html first-law.html fourteen.html pileon.html auld-lang-syne.html hopscotch.html scorpion.html thumb-and-pouch.html neighbor.html odessa.html osmosis.html spider.html yukon.html westhaven.html royal-east.html beleaguered-castle.html thirteen.html thieves.html freecell.html bristol.html union-square.html camelot-goal.gif clock-rules.gif docbook.css topic.dat straight-up.html zebra.html lady-jane.html - ---- freecell/src/Makefile.in.orig Sun Sep 26 13:28:36 1999 -+++ freecell/src/Makefile.in Mon Sep 27 09:31:48 1999 -@@ -125,9 +125,9 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I$(srcdir)/../gdk-card-image -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I$(srcdir)/../gdk-card-image - - - bin_PROGRAMS = freecell ---- gataxx/Makefile.in.orig Sun Sep 26 13:29:41 1999 -+++ gataxx/Makefile.in Mon Sep 27 09:47:28 1999 -@@ -127,10 +127,10 @@ - - scoredir = $(localstatedir)/games - pixmapdir = $(datadir)/pixmaps/gataxx --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - appicondir = $(datadir)/pixmaps - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I. -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I. - - - bin_PROGRAMS = gataxx ---- glines/Makefile.in.orig Sun Sep 26 13:29:40 1999 -+++ glines/Makefile.in Mon Sep 27 09:48:33 1999 -@@ -128,11 +128,11 @@ - scoredir = $(localstatedir)/games - pixmapdir = $(datadir)/pixmaps/glines - icondir = $(datadir)/pixmaps --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - - #SUBDIRS = help - --INCLUDES = -I.. -I$(srcdir)/.. -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I.. -I$(srcdir)/.. -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = glines ---- gnibbles/Makefile.in.orig Sun Sep 26 13:29:38 1999 -+++ gnibbles/Makefile.in Mon Sep 27 09:32:42 1999 -@@ -129,10 +129,10 @@ - configdir = $(datadir)/gnibbles - icondir = $(datadir)/pixmaps - soundlistdir = $(sysconfdir)/sound/events --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - scoredir = $(localstatedir)/games - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gnibbles ---- gnobots2/Makefile.in.orig Sun Sep 26 13:29:01 1999 -+++ gnobots2/Makefile.in Mon Sep 27 09:33:16 1999 -@@ -131,11 +131,11 @@ - soundlistdir = $(sysconfdir)/sound/events - sounddir = $(datadir)/sounds/gnobots2 - appicondir = $(datadir)/pixmaps --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - - SUBDIRS = help - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gnobots2 ---- gnobots2/help/C/Makefile.in.orig Sun Sep 26 13:29:03 1999 -+++ gnobots2/help/C/Makefile.in Mon Sep 27 09:34:12 1999 -@@ -128,7 +128,7 @@ - EXTRA_DIST = index.html topic.dat - - --gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/C -+gnobots2_helpdir = $(datadir)/help/gnobots2/C - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- gnobots2/help/da/Makefile.in.orig Sun May 21 23:51:03 2000 -+++ gnobots2/help/da/Makefile.in Tue May 30 17:11:59 2000 -@@ -131,3 +131,3 @@ - --gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/da -+gnobots2_helpdir = $(datadir)/help/gnobots2/da - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ---- gnobots2/help/es/Makefile.in.orig Sun Sep 26 13:29:04 1999 -+++ gnobots2/help/es/Makefile.in Mon Sep 27 09:34:44 1999 -@@ -128,7 +128,7 @@ - EXTRA_DIST = index.html topic.dat - - --gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/es -+gnobots2_helpdir = $(datadir)/help/gnobots2/es - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- gnobots2/help/it/Makefile.in.orig Sun Sep 26 13:29:05 1999 -+++ gnobots2/help/it/Makefile.in Mon Sep 27 09:34:56 1999 -@@ -128,7 +128,7 @@ - EXTRA_DIST = index.html topic.dat - - --gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/it -+gnobots2_helpdir = $(datadir)/help/gnobots2/it - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = --- gnome-stones/Makefile.in.orig Sun Sep 26 13:29:10 1999 +++ gnome-stones/Makefile.in Mon Sep 27 09:36:59 1999 -@@ -127,12 +127,12 @@ - - SUBDIRS = objects graphics - --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - scoredir = $(localstatedir)/games - Pixmapdir = $(datadir)/pixmaps - Cavesdir = $(datadir)/gnome-stones - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\" -DCAVESDIR=\""$(Cavesdir)"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\" -DCAVESDIR=\""$(Cavesdir)"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gnome-stones @@ -147,7 +147,7 @@ Games_DATA = gnome-stones.desktop Caves_DATA = default.caves tutorial.caves gnomekoban.caves @@ -180,18 +11,13 @@ Mimedir = $(datadir)/mime-info --- gnome-stones/objects/Makefile.in.orig Sun Sep 26 13:29:11 1999 +++ gnome-stones/objects/Makefile.in Mon Sep 27 09:36:59 1999 -@@ -127,9 +127,9 @@ +@@ -127,5 +127,5 @@ GSTONES_SRC_DIR = $(srcdir)/../ -objectdir = $(libdir)/gnome-stones/objects +objectdir = $(datadir)/gnome-stones/objects --INCLUDES = -I$(GSTONES_SRC_DIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I$(GSTONES_SRC_DIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - object_LTLIBRARIES = libgnome-stones.la libgnomekoban.la @@ -144,10 +144,10 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../.. @@ -205,226 +31,3 @@ libgnomekoban_la_LIBADD = libgnomekoban_la_OBJECTS = gnomekoban.lo COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ---- gnometris/Makefile.in.orig Sun May 21 23:51:13 2000 -+++ gnometris/Makefile.in Tue May 30 16:14:41 2000 -@@ -127,10 +127,10 @@ - - SUBDIRS = pix - scoredir = $(localstatedir)/games --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - - CPPFLAGS = -pedantic -Wall --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gnometris ---- gnomine/Makefile.in.orig Sun Sep 26 13:28:37 1999 -+++ gnomine/Makefile.in Mon Sep 27 09:36:59 1999 -@@ -126,9 +126,9 @@ - l = @l@ - - scoredir = $(localstatedir)/games --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gnomine ---- gnotravex/Makefile.in.orig Sun Sep 26 13:29:09 1999 -+++ gnotravex/Makefile.in Mon Sep 27 09:37:08 1999 -@@ -127,9 +127,9 @@ - - scoredir = $(localstatedir)/games - pixmapdir = $(datadir)/pixmaps/gnotravex --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gnotravex ---- gnotski/Makefile.in.orig Sun May 21 23:51:10 2000 -+++ gnotski/Makefile.in Tue May 30 16:46:09 2000 -@@ -128,9 +128,9 @@ - - scoredir = $(localstatedir)/games - pixmapdir = $(datadir)/pixmaps/gnotski --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gnotski ---- gtali/Makefile.in.orig Sun Sep 26 13:28:57 1999 -+++ gtali/Makefile.in Mon Sep 27 09:44:54 1999 -@@ -125,12 +125,12 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - scoredir = $(localstatedir)/games - - SUBDIRS = pix help - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) - - - @HAS_CURSES_TRUE@CTALI = ctali ---- gtali/help/C/Makefile.in.orig Sun Sep 26 13:29:00 1999 -+++ gtali/help/C/Makefile.in Mon Sep 27 09:45:28 1999 -@@ -128,7 +128,7 @@ - EXTRA_DIST = index.html topic.dat - - --gtali_helpdir = $(datadir)/gnome/help/gtali/C -+gtali_helpdir = $(datadir)/help/gtali/C - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- gtali/help/da/Makefile.in.orig Sun May 21 23:50:59 2000 -+++ gtali/help/da/Makefile.in Tue May 30 17:12:32 2000 -@@ -131,3 +131,3 @@ - --gtali_helpdir = $(datadir)/gnome/help/gtali/da -+gtali_helpdir = $(datadir)/help/gtali/da - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ---- gturing/Makefile.in.orig Sun Sep 26 13:28:54 1999 -+++ gturing/Makefile.in Mon Sep 27 09:37:08 1999 -@@ -125,12 +125,12 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --SUBDIRS = help -+# SUBDIRS = help - --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - examplesdir = $(datadir)/gturing/examples - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -DGTURING_EXAMPLES_DIR=\""$(examplesdir)"\" -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -DGTURING_EXAMPLES_DIR=\""$(examplesdir)"\" - - - bin_PROGRAMS = gturing ---- gturing/help/C/Makefile.in.orig Sun Sep 26 13:28:56 1999 -+++ gturing/help/C/Makefile.in Mon Sep 27 09:37:08 1999 -@@ -125,7 +125,7 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --gturing_helpdir = $(datadir)/gnome/help/gturing/C -+gturing_helpdir = $(datadir)/help/gturing/C - - gturing_help_DATA = index.html topic.dat - ---- iagno/Makefile.in.orig Sun Sep 26 13:29:07 1999 -+++ iagno/Makefile.in Mon Sep 27 09:49:30 1999 -@@ -127,10 +127,10 @@ - - scoredir = $(localstatedir)/games - pixmapdir = $(datadir)/pixmaps/iagno --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - appicondir = $(datadir)/pixmaps - --INCLUDES = -DHAVE_ORBIT -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I. -+INCLUDES = -DHAVE_ORBIT -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I. - - - bin_PROGRAMS = iagno ---- iagno/help/C/Makefile.in.orig Sun May 21 23:51:06 2000 -+++ iagno/help/C/Makefile.in Tue May 30 17:13:41 2000 -@@ -128,3 +128,3 @@ - --iagno_helpdir = $(datadir)/gnome/help/iagno/C -+iagno_helpdir = $(datadir)/help/iagno/C - ---- mahjongg/Makefile.in.orig Sun Sep 26 13:28:53 1999 -+++ mahjongg/Makefile.in Mon Sep 27 09:46:10 1999 -@@ -128,10 +128,10 @@ - scoredir = $(localstatedir)/games - pixmapdir = $(datadir)/pixmaps/mahjongg - bgdir = $(datadir)/pixmaps/mahjongg/bg --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - appicondir = $(datadir)/pixmaps - --INCLUDES = -I.. -I$(srcdir)/.. -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I.. -I$(srcdir)/.. -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = mahjongg ---- same-gnome/Makefile.in.orig Sun Sep 26 13:28:38 1999 -+++ same-gnome/Makefile.in Mon Sep 27 09:50:47 1999 -@@ -127,11 +127,11 @@ - - scoredir = $(localstatedir)/games - pixmapdir = $(datadir)/pixmaps/same-gnome --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - - SUBDIRS = help - --INCLUDES = -I.. -I$(srcdir)/.. -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I.. -I$(srcdir)/.. -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = same-gnome ---- same-gnome/help/C/Makefile.in.orig Sun Sep 26 13:28:50 1999 -+++ same-gnome/help/C/Makefile.in Mon Sep 27 09:51:19 1999 -@@ -125,7 +125,7 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --same_gnome_helpdir = $(datadir)/gnome/help/samegnome/C -+same_gnome_helpdir = $(datadir)/help/samegnome/C - - same_gnome_help_DATA = index.html topic.dat - ---- same-gnome/help/ru/Makefile.in.orig Sun May 21 23:50:51 2000 -+++ same-gnome/help/ru/Makefile.in Tue May 30 17:13:02 2000 -@@ -128,3 +128,3 @@ - --same_gnome_helpdir = $(datadir)/gnome/help/samegnome/ru -+same_gnome_helpdir = $(datadir)/help/samegnome/ru - ---- scottfree/Makefile.in.orig Sun Sep 26 13:28:52 1999 -+++ scottfree/Makefile.in Mon Sep 27 09:52:29 1999 -@@ -125,7 +125,7 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = GnomeScott ---- xbill/Makefile.in.orig Sun May 21 23:51:14 2000 -+++ xbill/Makefile.in Tue May 30 16:30:13 2000 -@@ -131,7 +131,7 @@ - # This is where the high score file goes ... - scoredir = $(localstatedir)/games - --INCLUDES = $(GNOME_INCLUDEDIR) -DGNOMELOCALDIR=\""$(datadir)/local"\" -+INCLUDES = $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - bin_PROGRAMS = gnome-xbill - - gnome_xbill_SOURCES = Bucket.cc Bucket.h Cable.cc Cable.h Computer.cc Computer.h Game.cc Game.h Horde.cc Horde.h Library.cc Library.h MCursor.cc MCursor.h Monster.cc Monster.h Network.cc Network.h Picture.cc Picture.h Spark.cc Spark.h Strings.h UI.cc UI.h objects.h x11-gtk.cc x11.h -@@ -144,7 +144,7 @@ - pixmapdir = $(datadir)/pixmaps - pixmap_DATA = xbill.png - --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - Games_DATA = xbill.desktop - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h diff --git a/games/gnome-games/pkg-plist b/games/gnome-games/pkg-plist index 7d76ab59aac3..d62ac3c356c7 100644 --- a/games/gnome-games/pkg-plist +++ b/games/gnome-games/pkg-plist @@ -150,6 +150,46 @@ share/gnome/gturing/examples/bin2dec.tur share/gnome/gturing/examples/dashnumbers.tur share/gnome/gturing/examples/dec2bin.tur share/gnome/gturing/examples/subst.tur +share/gnome/help/aisleriot/C/auld-lang-syne.html +share/gnome/help/aisleriot/C/beleaguered-castle.html +share/gnome/help/aisleriot/C/bristol.html +share/gnome/help/aisleriot/C/camelot-goal.gif +share/gnome/help/aisleriot/C/camelot.html +share/gnome/help/aisleriot/C/canfield.html +share/gnome/help/aisleriot/C/clock-rules.gif +share/gnome/help/aisleriot/C/clock.html +share/gnome/help/aisleriot/C/docbook.css +share/gnome/help/aisleriot/C/doublets.html +share/gnome/help/aisleriot/C/eagle-wing.html +share/gnome/help/aisleriot/C/elevator.html +share/gnome/help/aisleriot/C/first-law.html +share/gnome/help/aisleriot/C/fortunes.html +share/gnome/help/aisleriot/C/fourteen.html +share/gnome/help/aisleriot/C/freecell.html +share/gnome/help/aisleriot/C/glossary.html +share/gnome/help/aisleriot/C/gpl.html +share/gnome/help/aisleriot/C/hopscotch.html +share/gnome/help/aisleriot/C/index.html +share/gnome/help/aisleriot/C/intro.html +share/gnome/help/aisleriot/C/kansas.html +share/gnome/help/aisleriot/C/klondike.html +share/gnome/help/aisleriot/C/lady-jane.html +share/gnome/help/aisleriot/C/neighbor.html +share/gnome/help/aisleriot/C/odessa.html +share/gnome/help/aisleriot/C/osmosis.html +share/gnome/help/aisleriot/C/pileon.html +share/gnome/help/aisleriot/C/royal-east.html +share/gnome/help/aisleriot/C/scorpion.html +share/gnome/help/aisleriot/C/spider.html +share/gnome/help/aisleriot/C/straight-up.html +share/gnome/help/aisleriot/C/thieves.html +share/gnome/help/aisleriot/C/thirteen.html +share/gnome/help/aisleriot/C/thumb-and-pouch.html +share/gnome/help/aisleriot/C/topic.dat +share/gnome/help/aisleriot/C/union-square.html +share/gnome/help/aisleriot/C/westhaven.html +share/gnome/help/aisleriot/C/yukon.html +share/gnome/help/aisleriot/C/zebra.html share/gnome/help/gnobots2/C/index.html share/gnome/help/gnobots2/C/topic.dat share/gnome/help/gnobots2/da/index.html @@ -162,6 +202,8 @@ share/gnome/help/gtali/C/index.html share/gnome/help/gtali/C/topic.dat share/gnome/help/gtali/da/index.html share/gnome/help/gtali/da/topic.dat +share/gnome/help/gturing/C/topic.dat +share/gnome/help/gturing/it/topic.dat share/gnome/help/iagno/C/ANIMATION.png share/gnome/help/iagno/C/BLOCK.png share/gnome/help/iagno/C/FIRST.png @@ -503,6 +545,9 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/help/iagno/C/stylesheet-images @dirrm share/gnome/help/iagno/C @dirrm share/gnome/help/iagno +@dirrm share/gnome/help/gturing/it +@dirrm share/gnome/help/gturing/C +@dirrm share/gnome/help/gturing @dirrm share/gnome/help/gtali/da @dirrm share/gnome/help/gtali/C @dirrm share/gnome/help/gtali @@ -511,6 +556,8 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/help/gnobots2/da @dirrm share/gnome/help/gnobots2/C @dirrm share/gnome/help/gnobots2 +@dirrm share/gnome/help/aisleriot/C +@dirrm share/gnome/help/aisleriot @dirrm share/gnome/gturing/examples @dirrm share/gnome/gturing @dirrm share/gnome/gnome-stones/objects diff --git a/games/gnomegames/Makefile b/games/gnomegames/Makefile index 560e68782204..82fe646ec4b1 100644 --- a/games/gnomegames/Makefile +++ b/games/gnomegames/Makefile @@ -15,7 +15,7 @@ DISTNAME= gnome-games-${PORTVERSION} MAINTAINER= ade@FreeBSD.org LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - guile.6:${PORTSDIR}/lang/guile + guile.9:${PORTSDIR}/lang/guile RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter GTK_CONFIG?= ${X11BASE}/bin/gtk12-config @@ -30,4 +30,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/games/gnomegames/files/patch-ab b/games/gnomegames/files/patch-ab index 9b356b08e058..84838dd2151e 100644 --- a/games/gnomegames/files/patch-ab +++ b/games/gnomegames/files/patch-ab @@ -1,174 +1,5 @@ ---- aisleriot/Makefile.in.orig Sun Sep 26 13:29:13 1999 -+++ aisleriot/Makefile.in Mon Sep 27 09:30:04 1999 -@@ -128,12 +128,12 @@ - scoredir = $(localstatedir)/games - cardimagedir = $(datadir)/pixmaps/cards - icondir = $(datadir)/pixmaps --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - typesdir = $(datadir)/sol-games - --SUBDIRS = docs pixmaps -+SUBDIRS = pixmaps - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(GUILE_INCS) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(GUILE_INCS) - - - bin_PROGRAMS = sol -@@ -154,7 +154,7 @@ - EXTRA_DIST = AUTHORS $(types_DATA) $(cardimage_DATA) $(icon_DATA) sol.desktop SCHEME_GAMES.h - - --sysdir = $(datadir)/gnome/apps/Games -+sysdir = $(datadir)/apps/Games - sys_DATA = sol.desktop - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h ---- aisleriot/docs/Makefile.in.orig Sun Sep 26 13:29:29 1999 -+++ aisleriot/docs/Makefile.in Mon Sep 27 09:30:38 1999 -@@ -131,7 +131,7 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --helpdir = $(datadir)/gnome/help/aisleriot/C -+helpdir = $(datadir)/help/aisleriot/C - - help_DATA = index.html intro.html glossary.html gpl.html camelot.html canfield.html clock.html doublets.html eagle-wing.html elevator.html fortunes.html kansas.html klondike.html first-law.html fourteen.html pileon.html auld-lang-syne.html hopscotch.html scorpion.html thumb-and-pouch.html neighbor.html odessa.html osmosis.html spider.html yukon.html westhaven.html royal-east.html beleaguered-castle.html thirteen.html thieves.html freecell.html bristol.html union-square.html camelot-goal.gif clock-rules.gif docbook.css topic.dat straight-up.html zebra.html lady-jane.html - ---- freecell/src/Makefile.in.orig Sun Sep 26 13:28:36 1999 -+++ freecell/src/Makefile.in Mon Sep 27 09:31:48 1999 -@@ -125,9 +125,9 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I$(srcdir)/../gdk-card-image -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I$(srcdir)/../gdk-card-image - - - bin_PROGRAMS = freecell ---- gataxx/Makefile.in.orig Sun Sep 26 13:29:41 1999 -+++ gataxx/Makefile.in Mon Sep 27 09:47:28 1999 -@@ -127,10 +127,10 @@ - - scoredir = $(localstatedir)/games - pixmapdir = $(datadir)/pixmaps/gataxx --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - appicondir = $(datadir)/pixmaps - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I. -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I. - - - bin_PROGRAMS = gataxx ---- glines/Makefile.in.orig Sun Sep 26 13:29:40 1999 -+++ glines/Makefile.in Mon Sep 27 09:48:33 1999 -@@ -128,11 +128,11 @@ - scoredir = $(localstatedir)/games - pixmapdir = $(datadir)/pixmaps/glines - icondir = $(datadir)/pixmaps --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - - #SUBDIRS = help - --INCLUDES = -I.. -I$(srcdir)/.. -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I.. -I$(srcdir)/.. -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = glines ---- gnibbles/Makefile.in.orig Sun Sep 26 13:29:38 1999 -+++ gnibbles/Makefile.in Mon Sep 27 09:32:42 1999 -@@ -129,10 +129,10 @@ - configdir = $(datadir)/gnibbles - icondir = $(datadir)/pixmaps - soundlistdir = $(sysconfdir)/sound/events --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - scoredir = $(localstatedir)/games - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gnibbles ---- gnobots2/Makefile.in.orig Sun Sep 26 13:29:01 1999 -+++ gnobots2/Makefile.in Mon Sep 27 09:33:16 1999 -@@ -131,11 +131,11 @@ - soundlistdir = $(sysconfdir)/sound/events - sounddir = $(datadir)/sounds/gnobots2 - appicondir = $(datadir)/pixmaps --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - - SUBDIRS = help - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gnobots2 ---- gnobots2/help/C/Makefile.in.orig Sun Sep 26 13:29:03 1999 -+++ gnobots2/help/C/Makefile.in Mon Sep 27 09:34:12 1999 -@@ -128,7 +128,7 @@ - EXTRA_DIST = index.html topic.dat - - --gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/C -+gnobots2_helpdir = $(datadir)/help/gnobots2/C - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- gnobots2/help/da/Makefile.in.orig Sun May 21 23:51:03 2000 -+++ gnobots2/help/da/Makefile.in Tue May 30 17:11:59 2000 -@@ -131,3 +131,3 @@ - --gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/da -+gnobots2_helpdir = $(datadir)/help/gnobots2/da - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ---- gnobots2/help/es/Makefile.in.orig Sun Sep 26 13:29:04 1999 -+++ gnobots2/help/es/Makefile.in Mon Sep 27 09:34:44 1999 -@@ -128,7 +128,7 @@ - EXTRA_DIST = index.html topic.dat - - --gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/es -+gnobots2_helpdir = $(datadir)/help/gnobots2/es - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- gnobots2/help/it/Makefile.in.orig Sun Sep 26 13:29:05 1999 -+++ gnobots2/help/it/Makefile.in Mon Sep 27 09:34:56 1999 -@@ -128,7 +128,7 @@ - EXTRA_DIST = index.html topic.dat - - --gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/it -+gnobots2_helpdir = $(datadir)/help/gnobots2/it - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = --- gnome-stones/Makefile.in.orig Sun Sep 26 13:29:10 1999 +++ gnome-stones/Makefile.in Mon Sep 27 09:36:59 1999 -@@ -127,12 +127,12 @@ - - SUBDIRS = objects graphics - --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - scoredir = $(localstatedir)/games - Pixmapdir = $(datadir)/pixmaps - Cavesdir = $(datadir)/gnome-stones - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\" -DCAVESDIR=\""$(Cavesdir)"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\" -DCAVESDIR=\""$(Cavesdir)"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gnome-stones @@ -147,7 +147,7 @@ Games_DATA = gnome-stones.desktop Caves_DATA = default.caves tutorial.caves gnomekoban.caves @@ -180,18 +11,13 @@ Mimedir = $(datadir)/mime-info --- gnome-stones/objects/Makefile.in.orig Sun Sep 26 13:29:11 1999 +++ gnome-stones/objects/Makefile.in Mon Sep 27 09:36:59 1999 -@@ -127,9 +127,9 @@ +@@ -127,5 +127,5 @@ GSTONES_SRC_DIR = $(srcdir)/../ -objectdir = $(libdir)/gnome-stones/objects +objectdir = $(datadir)/gnome-stones/objects --INCLUDES = -I$(GSTONES_SRC_DIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I$(GSTONES_SRC_DIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - object_LTLIBRARIES = libgnome-stones.la libgnomekoban.la @@ -144,10 +144,10 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../.. @@ -205,226 +31,3 @@ libgnomekoban_la_LIBADD = libgnomekoban_la_OBJECTS = gnomekoban.lo COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ---- gnometris/Makefile.in.orig Sun May 21 23:51:13 2000 -+++ gnometris/Makefile.in Tue May 30 16:14:41 2000 -@@ -127,10 +127,10 @@ - - SUBDIRS = pix - scoredir = $(localstatedir)/games --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - - CPPFLAGS = -pedantic -Wall --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gnometris ---- gnomine/Makefile.in.orig Sun Sep 26 13:28:37 1999 -+++ gnomine/Makefile.in Mon Sep 27 09:36:59 1999 -@@ -126,9 +126,9 @@ - l = @l@ - - scoredir = $(localstatedir)/games --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gnomine ---- gnotravex/Makefile.in.orig Sun Sep 26 13:29:09 1999 -+++ gnotravex/Makefile.in Mon Sep 27 09:37:08 1999 -@@ -127,9 +127,9 @@ - - scoredir = $(localstatedir)/games - pixmapdir = $(datadir)/pixmaps/gnotravex --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gnotravex ---- gnotski/Makefile.in.orig Sun May 21 23:51:10 2000 -+++ gnotski/Makefile.in Tue May 30 16:46:09 2000 -@@ -128,9 +128,9 @@ - - scoredir = $(localstatedir)/games - pixmapdir = $(datadir)/pixmaps/gnotski --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gnotski ---- gtali/Makefile.in.orig Sun Sep 26 13:28:57 1999 -+++ gtali/Makefile.in Mon Sep 27 09:44:54 1999 -@@ -125,12 +125,12 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - scoredir = $(localstatedir)/games - - SUBDIRS = pix help - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) - - - @HAS_CURSES_TRUE@CTALI = ctali ---- gtali/help/C/Makefile.in.orig Sun Sep 26 13:29:00 1999 -+++ gtali/help/C/Makefile.in Mon Sep 27 09:45:28 1999 -@@ -128,7 +128,7 @@ - EXTRA_DIST = index.html topic.dat - - --gtali_helpdir = $(datadir)/gnome/help/gtali/C -+gtali_helpdir = $(datadir)/help/gtali/C - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- gtali/help/da/Makefile.in.orig Sun May 21 23:50:59 2000 -+++ gtali/help/da/Makefile.in Tue May 30 17:12:32 2000 -@@ -131,3 +131,3 @@ - --gtali_helpdir = $(datadir)/gnome/help/gtali/da -+gtali_helpdir = $(datadir)/help/gtali/da - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ---- gturing/Makefile.in.orig Sun Sep 26 13:28:54 1999 -+++ gturing/Makefile.in Mon Sep 27 09:37:08 1999 -@@ -125,12 +125,12 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --SUBDIRS = help -+# SUBDIRS = help - --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - examplesdir = $(datadir)/gturing/examples - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -DGTURING_EXAMPLES_DIR=\""$(examplesdir)"\" -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -DGTURING_EXAMPLES_DIR=\""$(examplesdir)"\" - - - bin_PROGRAMS = gturing ---- gturing/help/C/Makefile.in.orig Sun Sep 26 13:28:56 1999 -+++ gturing/help/C/Makefile.in Mon Sep 27 09:37:08 1999 -@@ -125,7 +125,7 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --gturing_helpdir = $(datadir)/gnome/help/gturing/C -+gturing_helpdir = $(datadir)/help/gturing/C - - gturing_help_DATA = index.html topic.dat - ---- iagno/Makefile.in.orig Sun Sep 26 13:29:07 1999 -+++ iagno/Makefile.in Mon Sep 27 09:49:30 1999 -@@ -127,10 +127,10 @@ - - scoredir = $(localstatedir)/games - pixmapdir = $(datadir)/pixmaps/iagno --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - appicondir = $(datadir)/pixmaps - --INCLUDES = -DHAVE_ORBIT -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I. -+INCLUDES = -DHAVE_ORBIT -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I. - - - bin_PROGRAMS = iagno ---- iagno/help/C/Makefile.in.orig Sun May 21 23:51:06 2000 -+++ iagno/help/C/Makefile.in Tue May 30 17:13:41 2000 -@@ -128,3 +128,3 @@ - --iagno_helpdir = $(datadir)/gnome/help/iagno/C -+iagno_helpdir = $(datadir)/help/iagno/C - ---- mahjongg/Makefile.in.orig Sun Sep 26 13:28:53 1999 -+++ mahjongg/Makefile.in Mon Sep 27 09:46:10 1999 -@@ -128,10 +128,10 @@ - scoredir = $(localstatedir)/games - pixmapdir = $(datadir)/pixmaps/mahjongg - bgdir = $(datadir)/pixmaps/mahjongg/bg --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - appicondir = $(datadir)/pixmaps - --INCLUDES = -I.. -I$(srcdir)/.. -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I.. -I$(srcdir)/.. -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = mahjongg ---- same-gnome/Makefile.in.orig Sun Sep 26 13:28:38 1999 -+++ same-gnome/Makefile.in Mon Sep 27 09:50:47 1999 -@@ -127,11 +127,11 @@ - - scoredir = $(localstatedir)/games - pixmapdir = $(datadir)/pixmaps/same-gnome --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - - SUBDIRS = help - --INCLUDES = -I.. -I$(srcdir)/.. -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I.. -I$(srcdir)/.. -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = same-gnome ---- same-gnome/help/C/Makefile.in.orig Sun Sep 26 13:28:50 1999 -+++ same-gnome/help/C/Makefile.in Mon Sep 27 09:51:19 1999 -@@ -125,7 +125,7 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --same_gnome_helpdir = $(datadir)/gnome/help/samegnome/C -+same_gnome_helpdir = $(datadir)/help/samegnome/C - - same_gnome_help_DATA = index.html topic.dat - ---- same-gnome/help/ru/Makefile.in.orig Sun May 21 23:50:51 2000 -+++ same-gnome/help/ru/Makefile.in Tue May 30 17:13:02 2000 -@@ -128,3 +128,3 @@ - --same_gnome_helpdir = $(datadir)/gnome/help/samegnome/ru -+same_gnome_helpdir = $(datadir)/help/samegnome/ru - ---- scottfree/Makefile.in.orig Sun Sep 26 13:28:52 1999 -+++ scottfree/Makefile.in Mon Sep 27 09:52:29 1999 -@@ -125,7 +125,7 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = GnomeScott ---- xbill/Makefile.in.orig Sun May 21 23:51:14 2000 -+++ xbill/Makefile.in Tue May 30 16:30:13 2000 -@@ -131,7 +131,7 @@ - # This is where the high score file goes ... - scoredir = $(localstatedir)/games - --INCLUDES = $(GNOME_INCLUDEDIR) -DGNOMELOCALDIR=\""$(datadir)/local"\" -+INCLUDES = $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - bin_PROGRAMS = gnome-xbill - - gnome_xbill_SOURCES = Bucket.cc Bucket.h Cable.cc Cable.h Computer.cc Computer.h Game.cc Game.h Horde.cc Horde.h Library.cc Library.h MCursor.cc MCursor.h Monster.cc Monster.h Network.cc Network.h Picture.cc Picture.h Spark.cc Spark.h Strings.h UI.cc UI.h objects.h x11-gtk.cc x11.h -@@ -144,7 +144,7 @@ - pixmapdir = $(datadir)/pixmaps - pixmap_DATA = xbill.png - --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - Games_DATA = xbill.desktop - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h diff --git a/games/gnomegames/pkg-plist b/games/gnomegames/pkg-plist index 7d76ab59aac3..d62ac3c356c7 100644 --- a/games/gnomegames/pkg-plist +++ b/games/gnomegames/pkg-plist @@ -150,6 +150,46 @@ share/gnome/gturing/examples/bin2dec.tur share/gnome/gturing/examples/dashnumbers.tur share/gnome/gturing/examples/dec2bin.tur share/gnome/gturing/examples/subst.tur +share/gnome/help/aisleriot/C/auld-lang-syne.html +share/gnome/help/aisleriot/C/beleaguered-castle.html +share/gnome/help/aisleriot/C/bristol.html +share/gnome/help/aisleriot/C/camelot-goal.gif +share/gnome/help/aisleriot/C/camelot.html +share/gnome/help/aisleriot/C/canfield.html +share/gnome/help/aisleriot/C/clock-rules.gif +share/gnome/help/aisleriot/C/clock.html +share/gnome/help/aisleriot/C/docbook.css +share/gnome/help/aisleriot/C/doublets.html +share/gnome/help/aisleriot/C/eagle-wing.html +share/gnome/help/aisleriot/C/elevator.html +share/gnome/help/aisleriot/C/first-law.html +share/gnome/help/aisleriot/C/fortunes.html +share/gnome/help/aisleriot/C/fourteen.html +share/gnome/help/aisleriot/C/freecell.html +share/gnome/help/aisleriot/C/glossary.html +share/gnome/help/aisleriot/C/gpl.html +share/gnome/help/aisleriot/C/hopscotch.html +share/gnome/help/aisleriot/C/index.html +share/gnome/help/aisleriot/C/intro.html +share/gnome/help/aisleriot/C/kansas.html +share/gnome/help/aisleriot/C/klondike.html +share/gnome/help/aisleriot/C/lady-jane.html +share/gnome/help/aisleriot/C/neighbor.html +share/gnome/help/aisleriot/C/odessa.html +share/gnome/help/aisleriot/C/osmosis.html +share/gnome/help/aisleriot/C/pileon.html +share/gnome/help/aisleriot/C/royal-east.html +share/gnome/help/aisleriot/C/scorpion.html +share/gnome/help/aisleriot/C/spider.html +share/gnome/help/aisleriot/C/straight-up.html +share/gnome/help/aisleriot/C/thieves.html +share/gnome/help/aisleriot/C/thirteen.html +share/gnome/help/aisleriot/C/thumb-and-pouch.html +share/gnome/help/aisleriot/C/topic.dat +share/gnome/help/aisleriot/C/union-square.html +share/gnome/help/aisleriot/C/westhaven.html +share/gnome/help/aisleriot/C/yukon.html +share/gnome/help/aisleriot/C/zebra.html share/gnome/help/gnobots2/C/index.html share/gnome/help/gnobots2/C/topic.dat share/gnome/help/gnobots2/da/index.html @@ -162,6 +202,8 @@ share/gnome/help/gtali/C/index.html share/gnome/help/gtali/C/topic.dat share/gnome/help/gtali/da/index.html share/gnome/help/gtali/da/topic.dat +share/gnome/help/gturing/C/topic.dat +share/gnome/help/gturing/it/topic.dat share/gnome/help/iagno/C/ANIMATION.png share/gnome/help/iagno/C/BLOCK.png share/gnome/help/iagno/C/FIRST.png @@ -503,6 +545,9 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/help/iagno/C/stylesheet-images @dirrm share/gnome/help/iagno/C @dirrm share/gnome/help/iagno +@dirrm share/gnome/help/gturing/it +@dirrm share/gnome/help/gturing/C +@dirrm share/gnome/help/gturing @dirrm share/gnome/help/gtali/da @dirrm share/gnome/help/gtali/C @dirrm share/gnome/help/gtali @@ -511,6 +556,8 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/help/gnobots2/da @dirrm share/gnome/help/gnobots2/C @dirrm share/gnome/help/gnobots2 +@dirrm share/gnome/help/aisleriot/C +@dirrm share/gnome/help/aisleriot @dirrm share/gnome/gturing/examples @dirrm share/gnome/gturing @dirrm share/gnome/gnome-stones/objects diff --git a/games/gnomegames2/Makefile b/games/gnomegames2/Makefile index 560e68782204..82fe646ec4b1 100644 --- a/games/gnomegames2/Makefile +++ b/games/gnomegames2/Makefile @@ -15,7 +15,7 @@ DISTNAME= gnome-games-${PORTVERSION} MAINTAINER= ade@FreeBSD.org LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ - guile.6:${PORTSDIR}/lang/guile + guile.9:${PORTSDIR}/lang/guile RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter GTK_CONFIG?= ${X11BASE}/bin/gtk12-config @@ -30,4 +30,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/games/gnomegames2/files/patch-ab b/games/gnomegames2/files/patch-ab index 9b356b08e058..84838dd2151e 100644 --- a/games/gnomegames2/files/patch-ab +++ b/games/gnomegames2/files/patch-ab @@ -1,174 +1,5 @@ ---- aisleriot/Makefile.in.orig Sun Sep 26 13:29:13 1999 -+++ aisleriot/Makefile.in Mon Sep 27 09:30:04 1999 -@@ -128,12 +128,12 @@ - scoredir = $(localstatedir)/games - cardimagedir = $(datadir)/pixmaps/cards - icondir = $(datadir)/pixmaps --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - typesdir = $(datadir)/sol-games - --SUBDIRS = docs pixmaps -+SUBDIRS = pixmaps - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(GUILE_INCS) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(GUILE_INCS) - - - bin_PROGRAMS = sol -@@ -154,7 +154,7 @@ - EXTRA_DIST = AUTHORS $(types_DATA) $(cardimage_DATA) $(icon_DATA) sol.desktop SCHEME_GAMES.h - - --sysdir = $(datadir)/gnome/apps/Games -+sysdir = $(datadir)/apps/Games - sys_DATA = sol.desktop - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h ---- aisleriot/docs/Makefile.in.orig Sun Sep 26 13:29:29 1999 -+++ aisleriot/docs/Makefile.in Mon Sep 27 09:30:38 1999 -@@ -131,7 +131,7 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --helpdir = $(datadir)/gnome/help/aisleriot/C -+helpdir = $(datadir)/help/aisleriot/C - - help_DATA = index.html intro.html glossary.html gpl.html camelot.html canfield.html clock.html doublets.html eagle-wing.html elevator.html fortunes.html kansas.html klondike.html first-law.html fourteen.html pileon.html auld-lang-syne.html hopscotch.html scorpion.html thumb-and-pouch.html neighbor.html odessa.html osmosis.html spider.html yukon.html westhaven.html royal-east.html beleaguered-castle.html thirteen.html thieves.html freecell.html bristol.html union-square.html camelot-goal.gif clock-rules.gif docbook.css topic.dat straight-up.html zebra.html lady-jane.html - ---- freecell/src/Makefile.in.orig Sun Sep 26 13:28:36 1999 -+++ freecell/src/Makefile.in Mon Sep 27 09:31:48 1999 -@@ -125,9 +125,9 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I$(srcdir)/../gdk-card-image -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I$(srcdir)/../gdk-card-image - - - bin_PROGRAMS = freecell ---- gataxx/Makefile.in.orig Sun Sep 26 13:29:41 1999 -+++ gataxx/Makefile.in Mon Sep 27 09:47:28 1999 -@@ -127,10 +127,10 @@ - - scoredir = $(localstatedir)/games - pixmapdir = $(datadir)/pixmaps/gataxx --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - appicondir = $(datadir)/pixmaps - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I. -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I. - - - bin_PROGRAMS = gataxx ---- glines/Makefile.in.orig Sun Sep 26 13:29:40 1999 -+++ glines/Makefile.in Mon Sep 27 09:48:33 1999 -@@ -128,11 +128,11 @@ - scoredir = $(localstatedir)/games - pixmapdir = $(datadir)/pixmaps/glines - icondir = $(datadir)/pixmaps --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - - #SUBDIRS = help - --INCLUDES = -I.. -I$(srcdir)/.. -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I.. -I$(srcdir)/.. -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = glines ---- gnibbles/Makefile.in.orig Sun Sep 26 13:29:38 1999 -+++ gnibbles/Makefile.in Mon Sep 27 09:32:42 1999 -@@ -129,10 +129,10 @@ - configdir = $(datadir)/gnibbles - icondir = $(datadir)/pixmaps - soundlistdir = $(sysconfdir)/sound/events --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - scoredir = $(localstatedir)/games - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gnibbles ---- gnobots2/Makefile.in.orig Sun Sep 26 13:29:01 1999 -+++ gnobots2/Makefile.in Mon Sep 27 09:33:16 1999 -@@ -131,11 +131,11 @@ - soundlistdir = $(sysconfdir)/sound/events - sounddir = $(datadir)/sounds/gnobots2 - appicondir = $(datadir)/pixmaps --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - - SUBDIRS = help - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gnobots2 ---- gnobots2/help/C/Makefile.in.orig Sun Sep 26 13:29:03 1999 -+++ gnobots2/help/C/Makefile.in Mon Sep 27 09:34:12 1999 -@@ -128,7 +128,7 @@ - EXTRA_DIST = index.html topic.dat - - --gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/C -+gnobots2_helpdir = $(datadir)/help/gnobots2/C - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- gnobots2/help/da/Makefile.in.orig Sun May 21 23:51:03 2000 -+++ gnobots2/help/da/Makefile.in Tue May 30 17:11:59 2000 -@@ -131,3 +131,3 @@ - --gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/da -+gnobots2_helpdir = $(datadir)/help/gnobots2/da - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ---- gnobots2/help/es/Makefile.in.orig Sun Sep 26 13:29:04 1999 -+++ gnobots2/help/es/Makefile.in Mon Sep 27 09:34:44 1999 -@@ -128,7 +128,7 @@ - EXTRA_DIST = index.html topic.dat - - --gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/es -+gnobots2_helpdir = $(datadir)/help/gnobots2/es - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- gnobots2/help/it/Makefile.in.orig Sun Sep 26 13:29:05 1999 -+++ gnobots2/help/it/Makefile.in Mon Sep 27 09:34:56 1999 -@@ -128,7 +128,7 @@ - EXTRA_DIST = index.html topic.dat - - --gnobots2_helpdir = $(datadir)/gnome/help/gnobots2/it -+gnobots2_helpdir = $(datadir)/help/gnobots2/it - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = --- gnome-stones/Makefile.in.orig Sun Sep 26 13:29:10 1999 +++ gnome-stones/Makefile.in Mon Sep 27 09:36:59 1999 -@@ -127,12 +127,12 @@ - - SUBDIRS = objects graphics - --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - scoredir = $(localstatedir)/games - Pixmapdir = $(datadir)/pixmaps - Cavesdir = $(datadir)/gnome-stones - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\" -DCAVESDIR=\""$(Cavesdir)"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\" -DCAVESDIR=\""$(Cavesdir)"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gnome-stones @@ -147,7 +147,7 @@ Games_DATA = gnome-stones.desktop Caves_DATA = default.caves tutorial.caves gnomekoban.caves @@ -180,18 +11,13 @@ Mimedir = $(datadir)/mime-info --- gnome-stones/objects/Makefile.in.orig Sun Sep 26 13:29:11 1999 +++ gnome-stones/objects/Makefile.in Mon Sep 27 09:36:59 1999 -@@ -127,9 +127,9 @@ +@@ -127,5 +127,5 @@ GSTONES_SRC_DIR = $(srcdir)/../ -objectdir = $(libdir)/gnome-stones/objects +objectdir = $(datadir)/gnome-stones/objects --INCLUDES = -I$(GSTONES_SRC_DIR) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I$(GSTONES_SRC_DIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - object_LTLIBRARIES = libgnome-stones.la libgnomekoban.la @@ -144,10 +144,10 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I../.. @@ -205,226 +31,3 @@ libgnomekoban_la_LIBADD = libgnomekoban_la_OBJECTS = gnomekoban.lo COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) ---- gnometris/Makefile.in.orig Sun May 21 23:51:13 2000 -+++ gnometris/Makefile.in Tue May 30 16:14:41 2000 -@@ -127,10 +127,10 @@ - - SUBDIRS = pix - scoredir = $(localstatedir)/games --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - - CPPFLAGS = -pedantic -Wall --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gnometris ---- gnomine/Makefile.in.orig Sun Sep 26 13:28:37 1999 -+++ gnomine/Makefile.in Mon Sep 27 09:36:59 1999 -@@ -126,9 +126,9 @@ - l = @l@ - - scoredir = $(localstatedir)/games --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gnomine ---- gnotravex/Makefile.in.orig Sun Sep 26 13:29:09 1999 -+++ gnotravex/Makefile.in Mon Sep 27 09:37:08 1999 -@@ -127,9 +127,9 @@ - - scoredir = $(localstatedir)/games - pixmapdir = $(datadir)/pixmaps/gnotravex --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gnotravex ---- gnotski/Makefile.in.orig Sun May 21 23:51:10 2000 -+++ gnotski/Makefile.in Tue May 30 16:46:09 2000 -@@ -128,9 +128,9 @@ - - scoredir = $(localstatedir)/games - pixmapdir = $(datadir)/pixmaps/gnotski --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = gnotski ---- gtali/Makefile.in.orig Sun Sep 26 13:28:57 1999 -+++ gtali/Makefile.in Mon Sep 27 09:44:54 1999 -@@ -125,12 +125,12 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - scoredir = $(localstatedir)/games - - SUBDIRS = pix help - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -DGNOMEPIXMAPDIR=\""$(datadir)/pixmaps"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(CURSES_INCLUDEDIR) - - - @HAS_CURSES_TRUE@CTALI = ctali ---- gtali/help/C/Makefile.in.orig Sun Sep 26 13:29:00 1999 -+++ gtali/help/C/Makefile.in Mon Sep 27 09:45:28 1999 -@@ -128,7 +128,7 @@ - EXTRA_DIST = index.html topic.dat - - --gtali_helpdir = $(datadir)/gnome/help/gtali/C -+gtali_helpdir = $(datadir)/help/gtali/C - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../../../config.h - CONFIG_CLEAN_FILES = ---- gtali/help/da/Makefile.in.orig Sun May 21 23:50:59 2000 -+++ gtali/help/da/Makefile.in Tue May 30 17:12:32 2000 -@@ -131,3 +131,3 @@ - --gtali_helpdir = $(datadir)/gnome/help/gtali/da -+gtali_helpdir = $(datadir)/help/gtali/da - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs ---- gturing/Makefile.in.orig Sun Sep 26 13:28:54 1999 -+++ gturing/Makefile.in Mon Sep 27 09:37:08 1999 -@@ -125,12 +125,12 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --SUBDIRS = help -+# SUBDIRS = help - --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - examplesdir = $(datadir)/gturing/examples - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -DGTURING_EXAMPLES_DIR=\""$(examplesdir)"\" -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" -DGTURING_EXAMPLES_DIR=\""$(examplesdir)"\" - - - bin_PROGRAMS = gturing ---- gturing/help/C/Makefile.in.orig Sun Sep 26 13:28:56 1999 -+++ gturing/help/C/Makefile.in Mon Sep 27 09:37:08 1999 -@@ -125,7 +125,7 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --gturing_helpdir = $(datadir)/gnome/help/gturing/C -+gturing_helpdir = $(datadir)/help/gturing/C - - gturing_help_DATA = index.html topic.dat - ---- iagno/Makefile.in.orig Sun Sep 26 13:29:07 1999 -+++ iagno/Makefile.in Mon Sep 27 09:49:30 1999 -@@ -127,10 +127,10 @@ - - scoredir = $(localstatedir)/games - pixmapdir = $(datadir)/pixmaps/iagno --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - appicondir = $(datadir)/pixmaps - --INCLUDES = -DHAVE_ORBIT -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I. -+INCLUDES = -DHAVE_ORBIT -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I. - - - bin_PROGRAMS = iagno ---- iagno/help/C/Makefile.in.orig Sun May 21 23:51:06 2000 -+++ iagno/help/C/Makefile.in Tue May 30 17:13:41 2000 -@@ -128,3 +128,3 @@ - --iagno_helpdir = $(datadir)/gnome/help/iagno/C -+iagno_helpdir = $(datadir)/help/iagno/C - ---- mahjongg/Makefile.in.orig Sun Sep 26 13:28:53 1999 -+++ mahjongg/Makefile.in Mon Sep 27 09:46:10 1999 -@@ -128,10 +128,10 @@ - scoredir = $(localstatedir)/games - pixmapdir = $(datadir)/pixmaps/mahjongg - bgdir = $(datadir)/pixmaps/mahjongg/bg --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - appicondir = $(datadir)/pixmaps - --INCLUDES = -I.. -I$(srcdir)/.. -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I.. -I$(srcdir)/.. -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = mahjongg ---- same-gnome/Makefile.in.orig Sun Sep 26 13:28:38 1999 -+++ same-gnome/Makefile.in Mon Sep 27 09:50:47 1999 -@@ -127,11 +127,11 @@ - - scoredir = $(localstatedir)/games - pixmapdir = $(datadir)/pixmaps/same-gnome --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - - SUBDIRS = help - --INCLUDES = -I.. -I$(srcdir)/.. -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -I.. -I$(srcdir)/.. -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = same-gnome ---- same-gnome/help/C/Makefile.in.orig Sun Sep 26 13:28:50 1999 -+++ same-gnome/help/C/Makefile.in Mon Sep 27 09:51:19 1999 -@@ -125,7 +125,7 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --same_gnome_helpdir = $(datadir)/gnome/help/samegnome/C -+same_gnome_helpdir = $(datadir)/help/samegnome/C - - same_gnome_help_DATA = index.html topic.dat - ---- same-gnome/help/ru/Makefile.in.orig Sun May 21 23:50:51 2000 -+++ same-gnome/help/ru/Makefile.in Tue May 30 17:13:02 2000 -@@ -128,3 +128,3 @@ - --same_gnome_helpdir = $(datadir)/gnome/help/samegnome/ru -+same_gnome_helpdir = $(datadir)/help/samegnome/ru - ---- scottfree/Makefile.in.orig Sun Sep 26 13:28:52 1999 -+++ scottfree/Makefile.in Mon Sep 27 09:52:29 1999 -@@ -125,7 +125,7 @@ - ZVT_LIBS = @ZVT_LIBS@ - l = @l@ - --INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) - - - bin_PROGRAMS = GnomeScott ---- xbill/Makefile.in.orig Sun May 21 23:51:14 2000 -+++ xbill/Makefile.in Tue May 30 16:30:13 2000 -@@ -131,7 +131,7 @@ - # This is where the high score file goes ... - scoredir = $(localstatedir)/games - --INCLUDES = $(GNOME_INCLUDEDIR) -DGNOMELOCALDIR=\""$(datadir)/local"\" -+INCLUDES = $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" - bin_PROGRAMS = gnome-xbill - - gnome_xbill_SOURCES = Bucket.cc Bucket.h Cable.cc Cable.h Computer.cc Computer.h Game.cc Game.h Horde.cc Horde.h Library.cc Library.h MCursor.cc MCursor.h Monster.cc Monster.h Network.cc Network.h Picture.cc Picture.h Spark.cc Spark.h Strings.h UI.cc UI.h objects.h x11-gtk.cc x11.h -@@ -144,7 +144,7 @@ - pixmapdir = $(datadir)/pixmaps - pixmap_DATA = xbill.png - --Gamesdir = $(datadir)/gnome/apps/Games -+Gamesdir = $(datadir)/apps/Games - Games_DATA = xbill.desktop - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h diff --git a/games/gnomegames2/pkg-plist b/games/gnomegames2/pkg-plist index 7d76ab59aac3..d62ac3c356c7 100644 --- a/games/gnomegames2/pkg-plist +++ b/games/gnomegames2/pkg-plist @@ -150,6 +150,46 @@ share/gnome/gturing/examples/bin2dec.tur share/gnome/gturing/examples/dashnumbers.tur share/gnome/gturing/examples/dec2bin.tur share/gnome/gturing/examples/subst.tur +share/gnome/help/aisleriot/C/auld-lang-syne.html +share/gnome/help/aisleriot/C/beleaguered-castle.html +share/gnome/help/aisleriot/C/bristol.html +share/gnome/help/aisleriot/C/camelot-goal.gif +share/gnome/help/aisleriot/C/camelot.html +share/gnome/help/aisleriot/C/canfield.html +share/gnome/help/aisleriot/C/clock-rules.gif +share/gnome/help/aisleriot/C/clock.html +share/gnome/help/aisleriot/C/docbook.css +share/gnome/help/aisleriot/C/doublets.html +share/gnome/help/aisleriot/C/eagle-wing.html +share/gnome/help/aisleriot/C/elevator.html +share/gnome/help/aisleriot/C/first-law.html +share/gnome/help/aisleriot/C/fortunes.html +share/gnome/help/aisleriot/C/fourteen.html +share/gnome/help/aisleriot/C/freecell.html +share/gnome/help/aisleriot/C/glossary.html +share/gnome/help/aisleriot/C/gpl.html +share/gnome/help/aisleriot/C/hopscotch.html +share/gnome/help/aisleriot/C/index.html +share/gnome/help/aisleriot/C/intro.html +share/gnome/help/aisleriot/C/kansas.html +share/gnome/help/aisleriot/C/klondike.html +share/gnome/help/aisleriot/C/lady-jane.html +share/gnome/help/aisleriot/C/neighbor.html +share/gnome/help/aisleriot/C/odessa.html +share/gnome/help/aisleriot/C/osmosis.html +share/gnome/help/aisleriot/C/pileon.html +share/gnome/help/aisleriot/C/royal-east.html +share/gnome/help/aisleriot/C/scorpion.html +share/gnome/help/aisleriot/C/spider.html +share/gnome/help/aisleriot/C/straight-up.html +share/gnome/help/aisleriot/C/thieves.html +share/gnome/help/aisleriot/C/thirteen.html +share/gnome/help/aisleriot/C/thumb-and-pouch.html +share/gnome/help/aisleriot/C/topic.dat +share/gnome/help/aisleriot/C/union-square.html +share/gnome/help/aisleriot/C/westhaven.html +share/gnome/help/aisleriot/C/yukon.html +share/gnome/help/aisleriot/C/zebra.html share/gnome/help/gnobots2/C/index.html share/gnome/help/gnobots2/C/topic.dat share/gnome/help/gnobots2/da/index.html @@ -162,6 +202,8 @@ share/gnome/help/gtali/C/index.html share/gnome/help/gtali/C/topic.dat share/gnome/help/gtali/da/index.html share/gnome/help/gtali/da/topic.dat +share/gnome/help/gturing/C/topic.dat +share/gnome/help/gturing/it/topic.dat share/gnome/help/iagno/C/ANIMATION.png share/gnome/help/iagno/C/BLOCK.png share/gnome/help/iagno/C/FIRST.png @@ -503,6 +545,9 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/help/iagno/C/stylesheet-images @dirrm share/gnome/help/iagno/C @dirrm share/gnome/help/iagno +@dirrm share/gnome/help/gturing/it +@dirrm share/gnome/help/gturing/C +@dirrm share/gnome/help/gturing @dirrm share/gnome/help/gtali/da @dirrm share/gnome/help/gtali/C @dirrm share/gnome/help/gtali @@ -511,6 +556,8 @@ share/locale/zh_TW.Big5/LC_MESSAGES/gnome-games.mo @dirrm share/gnome/help/gnobots2/da @dirrm share/gnome/help/gnobots2/C @dirrm share/gnome/help/gnobots2 +@dirrm share/gnome/help/aisleriot/C +@dirrm share/gnome/help/aisleriot @dirrm share/gnome/gturing/examples @dirrm share/gnome/gturing @dirrm share/gnome/gnome-stones/objects diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile index 6e0b47d731d4..b36c8f1245d7 100644 --- a/math/gnumeric/Makefile +++ b/math/gnumeric/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ python:${PORTSDIR}/lang/python LIB_DEPENDS= gnomeprint.9:${PORTSDIR}/print/gnomeprint \ glade.4:${PORTSDIR}/devel/libglade \ - guile.6:${PORTSDIR}/lang/guile \ + guile.9:${PORTSDIR}/lang/guile \ gnomeole2.0:${PORTSDIR}/devel/libole2 \ gb.0:${PORTSDIR}/lang/gnomebasic @@ -41,4 +41,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ PLIST_SUB= VERSION=${PORTVERSION} +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/math/gnumeric/files/patch-ba b/math/gnumeric/files/patch-ba index 51c58a7c4472..78468ee4e24e 100644 --- a/math/gnumeric/files/patch-ba +++ b/math/gnumeric/files/patch-ba @@ -9,12 +9,3 @@ confexec_DATA = gnumericConf.sh CLEANFILES = gnumericConf.sh -@@ -169,7 +169,7 @@ - appicon_DATA = gnome-gnumeric.png gnome-application-x-gnumeric.png gnome-application-x-xls.png - - --Applicationsdir = $(datadir)/gnome/apps/Applications -+Applicationsdir = $(datadir)/apps/Applications - Applications_DATA = gnumeric.desktop - - Mimedir = $(datadir)/mime-info diff --git a/math/gnumeric2/Makefile b/math/gnumeric2/Makefile index 6e0b47d731d4..b36c8f1245d7 100644 --- a/math/gnumeric2/Makefile +++ b/math/gnumeric2/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= panel:${PORTSDIR}/x11/gnomecore \ python:${PORTSDIR}/lang/python LIB_DEPENDS= gnomeprint.9:${PORTSDIR}/print/gnomeprint \ glade.4:${PORTSDIR}/devel/libglade \ - guile.6:${PORTSDIR}/lang/guile \ + guile.9:${PORTSDIR}/lang/guile \ gnomeole2.0:${PORTSDIR}/devel/libole2 \ gb.0:${PORTSDIR}/lang/gnomebasic @@ -41,4 +41,11 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ PLIST_SUB= VERSION=${PORTVERSION} +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/math/gnumeric2/files/patch-ba b/math/gnumeric2/files/patch-ba index 51c58a7c4472..78468ee4e24e 100644 --- a/math/gnumeric2/files/patch-ba +++ b/math/gnumeric2/files/patch-ba @@ -9,12 +9,3 @@ confexec_DATA = gnumericConf.sh CLEANFILES = gnumericConf.sh -@@ -169,7 +169,7 @@ - appicon_DATA = gnome-gnumeric.png gnome-application-x-gnumeric.png gnome-application-x-xls.png - - --Applicationsdir = $(datadir)/gnome/apps/Applications -+Applicationsdir = $(datadir)/apps/Applications - Applications_DATA = gnumeric.desktop - - Mimedir = $(datadir)/mime-info diff --git a/misc/gnomeusersguide/Makefile b/misc/gnomeusersguide/Makefile index c7608ee0d5c3..5a2444de2eee 100644 --- a/misc/gnomeusersguide/Makefile +++ b/misc/gnomeusersguide/Makefile @@ -21,7 +21,13 @@ USE_X_PREFIX= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${X11BASE} + --datadir=${PREFIX}/share/gnome + +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/misc/gnomeutils/Makefile b/misc/gnomeutils/Makefile index 57efddb91aa9..e87071ccd9af 100644 --- a/misc/gnomeutils/Makefile +++ b/misc/gnomeutils/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ade@FreeBSD.org LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ gtop.1:${PORTSDIR}/devel/libgtop \ - guile.6:${PORTSDIR}/lang/guile \ + guile.9:${PORTSDIR}/lang/guile \ glade.4:${PORTSDIR}/devel/libglade RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter @@ -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/misc/gnomeutils/files/patch-aa b/misc/gnomeutils/files/patch-aa index 149087c84669..6f97cad1373c 100644 --- a/misc/gnomeutils/files/patch-aa +++ b/misc/gnomeutils/files/patch-aa @@ -1,14 +1,5 @@ --- configure.orig Fri May 19 14:49:06 2000 +++ configure Tue May 30 13:31:24 2000 -@@ -5101,7 +5101,7 @@ - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest* - INSTOBJEXT=.mo @@ -6350,17 +6350,13 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 diff --git a/misc/gnomeutils2/Makefile b/misc/gnomeutils2/Makefile index 57efddb91aa9..e87071ccd9af 100644 --- a/misc/gnomeutils2/Makefile +++ b/misc/gnomeutils2/Makefile @@ -16,7 +16,7 @@ MAINTAINER= ade@FreeBSD.org LIB_DEPENDS= panel_applet.4:${PORTSDIR}/x11/gnomecore \ gtop.1:${PORTSDIR}/devel/libgtop \ - guile.6:${PORTSDIR}/lang/guile \ + guile.9:${PORTSDIR}/lang/guile \ glade.4:${PORTSDIR}/devel/libglade RUN_DEPENDS= gnomecc:${PORTSDIR}/sysutils/gnomecontrolcenter @@ -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/misc/gnomeutils2/files/patch-aa b/misc/gnomeutils2/files/patch-aa index 149087c84669..6f97cad1373c 100644 --- a/misc/gnomeutils2/files/patch-aa +++ b/misc/gnomeutils2/files/patch-aa @@ -1,14 +1,5 @@ --- configure.orig Fri May 19 14:49:06 2000 +++ configure Tue May 30 13:31:24 2000 -@@ -5101,7 +5101,7 @@ - cat conftest.$ac_ext >&5 - rm -rf conftest* - CATOBJEXT=.mo -- DATADIRNAME=lib -+ DATADIRNAME=share - fi - rm -f conftest* - INSTOBJEXT=.mo @@ -6350,17 +6350,13 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then echo "$ac_t""yes" 1>&6 diff --git a/print/ggv/Makefile b/print/ggv/Makefile index a220cfcd4a3b..5c42dd93149a 100644 --- a/print/ggv/Makefile +++ b/print/ggv/Makefile @@ -25,4 +25,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/print/ggv/files/patch-aa b/print/ggv/files/patch-aa index 3e3c19626d28..93e94800cdea 100644 --- a/print/ggv/files/patch-aa +++ b/print/ggv/files/patch-aa @@ -1,14 +1,5 @@ --- configure.orig Sat Apr 17 04:25:20 1999 +++ configure Sat May 22 21:58:31 1999 -@@ -2083,7 +2083,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 @@ -4165,15 +4165,15 @@ fi diff --git a/print/ggv/pkg-plist b/print/ggv/pkg-plist index 2108e0df3fd6..293f0cd6982d 100644 --- a/print/ggv/pkg-plist +++ b/print/ggv/pkg-plist @@ -1,6 +1,8 @@ bin/ggv etc/CORBA/servers/application-ps.gnorba share/gnome/apps/Graphics/ggv.desktop +share/gnome/help/ggv/C/topic.dat +share/gnome/help/ggv/it/topic.dat share/gnome/pixmaps/ggv-splash.png share/gnome/pixmaps/gnome-ghostview.png share/locale/ca/LC_MESSAGES/ggv.mo @@ -28,3 +30,6 @@ share/locale/sl/LC_MESSAGES/ggv.mo share/locale/sv/LC_MESSAGES/ggv.mo share/locale/tr/LC_MESSAGES/ggv.mo share/locale/uk/LC_MESSAGES/ggv.mo +@dirrm share/gnome/help/ggv/it +@dirrm share/gnome/help/ggv/C +@dirrm share/gnome/help/ggv diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile index a220cfcd4a3b..5c42dd93149a 100644 --- a/print/ggv2/Makefile +++ b/print/ggv2/Makefile @@ -25,4 +25,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/print/ggv2/files/patch-aa b/print/ggv2/files/patch-aa index 3e3c19626d28..93e94800cdea 100644 --- a/print/ggv2/files/patch-aa +++ b/print/ggv2/files/patch-aa @@ -1,14 +1,5 @@ --- configure.orig Sat Apr 17 04:25:20 1999 +++ configure Sat May 22 21:58:31 1999 -@@ -2083,7 +2083,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 @@ -4165,15 +4165,15 @@ fi diff --git a/print/ggv2/pkg-plist b/print/ggv2/pkg-plist index 2108e0df3fd6..293f0cd6982d 100644 --- a/print/ggv2/pkg-plist +++ b/print/ggv2/pkg-plist @@ -1,6 +1,8 @@ bin/ggv etc/CORBA/servers/application-ps.gnorba share/gnome/apps/Graphics/ggv.desktop +share/gnome/help/ggv/C/topic.dat +share/gnome/help/ggv/it/topic.dat share/gnome/pixmaps/ggv-splash.png share/gnome/pixmaps/gnome-ghostview.png share/locale/ca/LC_MESSAGES/ggv.mo @@ -28,3 +30,6 @@ share/locale/sl/LC_MESSAGES/ggv.mo share/locale/sv/LC_MESSAGES/ggv.mo share/locale/tr/LC_MESSAGES/ggv.mo share/locale/uk/LC_MESSAGES/ggv.mo +@dirrm share/gnome/help/ggv/it +@dirrm share/gnome/help/ggv/C +@dirrm share/gnome/help/ggv diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile index 463d35f314ea..ea3eae7f3a1f 100644 --- a/print/gnome-print/Makefile +++ b/print/gnome-print/Makefile @@ -26,10 +26,16 @@ USE_PERL5= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome 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/print/gnomeprint/Makefile b/print/gnomeprint/Makefile index 463d35f314ea..ea3eae7f3a1f 100644 --- a/print/gnomeprint/Makefile +++ b/print/gnomeprint/Makefile @@ -26,10 +26,16 @@ USE_PERL5= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome 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/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile index 463d35f314ea..ea3eae7f3a1f 100644 --- a/print/libgnomeprint/Makefile +++ b/print/libgnomeprint/Makefile @@ -26,10 +26,16 @@ USE_PERL5= yes USE_LIBTOOL= yes INSTALLS_SHLIB= yes CONFIGURE_ARGS= --localstatedir=${PREFIX}/share/gnome \ - --datadir=${PREFIX}/share/gnome \ - --with-gnome=${PREFIX} + --datadir=${PREFIX}/share/gnome 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/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile index c79252288cf2..6225412c3704 100644 --- a/sysutils/gnome-system-monitor/Makefile +++ b/sysutils/gnome-system-monitor/Makefile @@ -26,4 +26,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/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile index c79252288cf2..6225412c3704 100644 --- a/sysutils/gnomesystemmonitor/Makefile +++ b/sysutils/gnomesystemmonitor/Makefile @@ -26,4 +26,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/sysutils/gtop/Makefile b/sysutils/gtop/Makefile index c79252288cf2..6225412c3704 100644 --- a/sysutils/gtop/Makefile +++ b/sysutils/gtop/Makefile @@ -26,4 +26,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/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 }; |