mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-01 22:05:08 +00:00
Code Issues Releases Activity
d28a0b89be
freebsd-ports/devel/bonobo/files/patch-ab
Ade Lovett 5e4c8301a8 Various fixes and other miscellaneous cruft removed. 
Submitted by:	reg
2000-02-14 19:16:38 +00:00

140 lines
6.8 KiB
Plaintext
Raw Blame History

--- Makefile.in.orig Wed Jan 26 08:49:25 2000
+++ Makefile.in Fri Jan 28 10:56:23 2000
@@ -125,7 +125,7 @@
SUBDIRS = po intl idl libefs bonobo storage-modules components samples gshell tests
-confexecdir = $(libdir)
+confexecdir = $(sysconfdir)
confexec_DATA = bonoboConf.sh
EXTRA_DIST = bonoboConf.sh.in bonobo.spec.in
--- components/application-x-gnomine/Makefile.in.orig Wed Jan 26 08:49:34 2000
+++ components/application-x-gnomine/Makefile.in Fri Jan 28 10:59:27 2000
@@ -124,9 +124,9 @@
l = @l@
scoredir = $(localstatedir)/games
-Gamesdir = $(datadir)/gnome/apps/Games
+Gamesdir = $(datadir)/apps/Games
-INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -I$(top_srcdir) -I$(top_builddir) -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR)
#bin_PROGRAMS = gnomine bonobo-application-x-mines
@@ -154,12 +154,14 @@
EXTRA_DIST = flag.xpm mine.xpm face-cool.xpm face-sad.xpm face-smile.xpm face-win.xpm face-worried.xpm gnomine.desktop README AUTHORS $(gnorba_DATA)
-Games_DATA = gnomine.desktop
+Games_DATA = gnomine-bonobo.desktop
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = ../../config.h
CONFIG_CLEAN_FILES =
PROGRAMS = $(bin_PROGRAMS)
+gnomine-bonobo.desktop: gnomine.desktop
+ cp gnomine.desktop gnomine-bonobo.desktop
DEFS = @DEFS@ -I. -I$(srcdir) -I../..
LIBS = @LIBS@
--- components/audio-ulaw/Makefile.in.orig Wed Jan 26 08:49:38 2000
+++ components/audio-ulaw/Makefile.in Fri Jan 28 11:00:35 2000
@@ -130,7 +130,7 @@
bonobo_audio_ulaw_SOURCES = bonobo-audio-ulaw.c bonobo-audio-ulaw.h item-audio.c item-audio.h color.c color.h
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
bonobo_audio_ulaw_LDADD = $(top_builddir)/bonobo/libbonobo.la $(GTK_LIBS) $(GNOME_LIBDIR) $(GNOMEGNORBA_LIBS) $(INTLLIBS)
--- components/image-x-png/Makefile.in.orig Wed Jan 26 08:49:35 2000
+++ components/image-x-png/Makefile.in Fri Jan 28 11:02:04 2000
@@ -123,14 +123,14 @@
cxxflags_set = @cxxflags_set@
l = @l@
-SUBDIRS = doc
+SUBDIRS = # doc
bin_PROGRAMS = bonobo-image-x-png
bonobo_image_x_png_SOURCES = bonobo-image-x-png.c
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
bonobo_image_x_png_LDADD = $(top_builddir)/bonobo/libbonobo.la $(GTK_LIBS) $(GNOME_LIBDIR) $(GNOMEGNORBA_LIBS) $(INTLLIBS) -lpng
--- components/text-plain/Makefile.in.orig Wed Jan 26 08:49:37 2000
+++ components/text-plain/Makefile.in Fri Jan 28 11:04:17 2000
@@ -128,7 +128,7 @@
bonobo_text_plain_SOURCES = bonobo-text-plain.c
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
bonobo_text_plain_LDADD = $(top_builddir)/bonobo/libbonobo.la $(GTK_LIBS) $(GNOME_LIBDIR) $(GNOMEGNORBA_LIBS) $(INTLLIBS)
--- samples/compound-doc/Makefile.in.orig Wed Jan 26 08:49:40 2000
+++ samples/compound-doc/Makefile.in Fri Jan 28 11:06:32 2000
@@ -125,7 +125,7 @@
bin_PROGRAMS = paint-component-simple sample-container
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
paint_component_simple_SOURCES = paint-component-simple.c
--- samples/controls/Makefile.in.orig Wed Jan 26 08:49:39 2000
+++ samples/controls/Makefile.in Fri Jan 28 11:07:10 2000
@@ -125,7 +125,7 @@
bin_PROGRAMS = sample-control-factory sample-control-container
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I. -I$(includedir) $(GNOME_INCLUDEDIR) $(GTK_CFLAGS)
sample_control_factory_SOURCES = bonobo-clock-control.c bonobo-clock-control.h bonobo-calculator-control.c bonobo-calculator-control.h sample-control-factory.c
--- storage-modules/Makefile.in.orig Mon Sep 27 16:22:03 1999
+++ storage-modules/Makefile.in Fri Oct 8 13:54:29 1999
@@ -124,7 +124,7 @@
cxxflags_set = @cxxflags_set@
l = @l@
-INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/libefs/src -I$(includedir) $(GNOME_INCLUDEDIR)
+INCLUDES = -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(srcdir) -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/libefs/src -I$(includedir) $(GNOME_INCLUDEDIR)
common_ldflags = -avoid-version
--- po/Makefile.in.in.orig Mon Sep 27 15:26:21 1999
+++ po/Makefile.in.in Fri Oct 8 14:08:03 1999
@@ -18,8 +18,8 @@
prefix = @prefix@
exec_prefix = @exec_prefix@
-datadir = $(prefix)/@DATADIRNAME@
-localedir = $(datadir)/locale
+datadir = $(prefix)/share/locale
+localedir = $(prefix)/share/locale
gnulocaledir = $(prefix)/share/locale
gettextsrcdir = $(prefix)/share/gettext/po
subdir = po
--- libefs/Makefile.in.orig Mon Sep 27 16:21:53 1999
+++ libefs/Makefile.in Fri Oct 8 14:18:17 1999
@@ -78,7 +78,7 @@
USE_SYMBOL_UNDERSCORE = @USE_SYMBOL_UNDERSCORE@
VERSION = @VERSION@
-SUBDIRS = src doc
+SUBDIRS = src # doc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/../mkinstalldirs
CONFIG_HEADER = config.h
Reference in New Issue View Git Blame Copy Permalink