aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Price <steve@FreeBSD.org>1998-09-28 01:55:27 +0000
committerSteve Price <steve@FreeBSD.org>1998-09-28 01:55:27 +0000
commita2ee0ac9ca3349fb07a29a304478143eeb2c29c0 (patch)
tree4bc7eecba329e2045491d9331cf77456e54ee66b
parent1a3f9e8f13439d5836c7ec15ab1380d4f0c8227e (diff)
downloadports-a2ee0ac9ca3349fb07a29a304478143eeb2c29c0.tar.gz
ports-a2ee0ac9ca3349fb07a29a304478143eeb2c29c0.zip
Notes
-rw-r--r--audio/rosegarden/files/patch-aa52
-rw-r--r--audio/xamp/files/patch-ae14
2 files changed, 42 insertions, 24 deletions
diff --git a/audio/rosegarden/files/patch-aa b/audio/rosegarden/files/patch-aa
index d2e8803d324f..e6eba615dafb 100644
--- a/audio/rosegarden/files/patch-aa
+++ b/audio/rosegarden/files/patch-aa
@@ -1,22 +1,30 @@
-*** Makefile.FreeBSD.orig Wed Sep 11 06:04:21 1996
---- Makefile.FreeBSD Thu Aug 28 15:53:28 1997
-***************
-*** 265,270 ****
---- 265,281 ----
- ( $(EXPORTATION) ; cd $(ROSEGARDEN)/topbox/src ; \
- $(MAKE) depend )
-
-+ install:
-+ $(MKDIR) $(PREFIX)/lib/rosegarden
-+ $(MKDIR) $(PREFIX)/lib/rosegarden/music
-+ $(INSTALL_PROGRAM) ./bin/rosegarden $(PREFIX)/bin
-+ $(INSTALL_PROGRAM) ./bin/editor $(PREFIX)/lib/rosegarden
-+ $(INSTALL_PROGRAM) ./bin/sequencer $(PREFIX)/lib/rosegarden
-+ $(INSTALL_DATA) ./common/help/* $(PREFIX)/lib/rosegarden
-+ $(INSTALL_DATA) ./common/synth-patches/std.sb $(PREFIX)/lib/rosegarden
-+ $(INSTALL_DATA) ./common/music/*.rose $(PREFIX)/lib/rosegarden/music
-+ $(INSTALL_DATA) Rosegarden $(X11BASE)/lib/X11/app-defaults/
-+
- clean:
- ( $(EXPORTATION) ; cd $(ROSEGARDEN)/lists/src ; \
- $(MAKE) clean )
+--- Makefile.FreeBSD.orig Tue Sep 10 16:04:21 1996
++++ Makefile.FreeBSD Fri Sep 25 11:19:37 1998
+@@ -139,6 +139,9 @@
+ # System library directories, also exported
+
+ SYSLDFLAGS = -L/usr/lib -L/usr/X11R6/lib
++.if ${PORTOBJFORMAT} == "elf"
++SYSLDFLAGS += -Wl,-rpath,/usr/X11R6/lib
++.endif
+ SYSEXTRALIBS = -lmalloc
+
+
+@@ -264,6 +267,17 @@
+ $(MAKE) depend )
+ ( $(EXPORTATION) ; cd $(ROSEGARDEN)/topbox/src ; \
+ $(MAKE) depend )
++
++install:
++ $(MKDIR) $(PREFIX)/lib/rosegarden
++ $(MKDIR) $(PREFIX)/lib/rosegarden/music
++ $(INSTALL_PROGRAM) ./bin/rosegarden $(PREFIX)/bin
++ $(INSTALL_PROGRAM) ./bin/editor $(PREFIX)/lib/rosegarden
++ $(INSTALL_PROGRAM) ./bin/sequencer $(PREFIX)/lib/rosegarden
++ $(INSTALL_DATA) ./common/help/* $(PREFIX)/lib/rosegarden
++ $(INSTALL_DATA) ./common/synth-patches/std.sb $(PREFIX)/lib/rosegarden
++ $(INSTALL_DATA) ./common/music/*.rose $(PREFIX)/lib/rosegarden/music
++ $(INSTALL_DATA) Rosegarden $(X11BASE)/lib/X11/app-defaults/
+
+ clean:
+ ( $(EXPORTATION) ; cd $(ROSEGARDEN)/lists/src ; \
diff --git a/audio/xamp/files/patch-ae b/audio/xamp/files/patch-ae
index 36009ed32495..3137eac04cd2 100644
--- a/audio/xamp/files/patch-ae
+++ b/audio/xamp/files/patch-ae
@@ -1,5 +1,5 @@
---- Makefile.in.orig Tue Aug 18 22:28:09 1998
-+++ Makefile.in Tue Aug 18 22:31:13 1998
+--- Makefile.in.orig Tue Feb 10 16:37:20 1998
++++ Makefile.in Sun Sep 27 20:24:53 1998
@@ -14,7 +14,8 @@
DEFINES = -DOS_@OS_TYPE@ -DARCH_@ARCH_TYPE@
CFLAGS = @CFLAGS@ ${DEFINES} ${DEBUG} ${BACK}
@@ -10,3 +10,13 @@
#
# uncomment both of these if you want profiling support
+@@ -38,6 +39,9 @@
+ backs/backs.o
+
+ LIBS = @QT_LDFLAGS@ -lm -lqt
++ifeq ($(PORTOBJFORMAT),elf)
++LIBS+= -Wl,-rpath,$(X11BASE)/lib
++endif
+
+ all: xamp
+