Don't trust PORTVERSION: this is actually 1.0-RC2.

1 files changed, 38 insertions, 49 deletions

diff --git a/lang/gambas/files/patch-Makefile.in b/lang/gambas/files/patch-Makefile.in
index e95885feca14..03f07a304cc8 100644
--- a/lang/gambas/files/patch-Makefile.in
+++ b/lang/gambas/files/patch-Makefile.in
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Sat Aug 14 11:17:09 2004
-+++ Makefile.in	Sat Aug 14 14:47:25 2004
+--- Makefile.in.orig	Sun Nov  7 18:04:16 2004
++++ Makefile.in	Mon Nov  8 17:37:40 2004
 @@ -35,6 +35,7 @@
  DESTDIR =
  
@@ -8,85 +8,74 @@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
  
-@@ -378,23 +379,17 @@
- 
+@@ -390,16 +391,16 @@
+ 	 ROOT=$DESTDIR; \
+         fi
  
- install-exec-local:
--	@if test "x$(ROOT)" != "x"; then \
--	 "Installing with ROOT=$(ROOT)"; \
--         echo; \
--        fi
--
--	@if test "$(bindir)" != "$(ROOT)/usr/bin" && test "$(bindir)" != "$(ROOT)/usr/bin/"; then \
--	 echo "Making symbolic links in /usr/bin..."; \
+-	@if test "$(DESTDIR)$(bindir)" != "$(ROOT)/usr/bin" && test "$(DESTDIR)$(bindir)" != "$(ROOT)/usr/bin/"; then \
++	@if test "$(DESTDIR)$(bindir)" != "%%PREFIX%%/bin" && test "$(DESTDIR)$(bindir)" != "%%PREFIX%%/bin/"; then \
+ 	 echo "Making symbolic links in /usr/bin..."; \
 -	 rm -f $(ROOT)/usr/bin/gbx; \
--	 ln -s $(bindir)/gbx $(ROOT)/usr/bin/gbx; \
+-	 ln -s $(DESTDIR)$(bindir)/gbx $(ROOT)/usr/bin/gbx; \
 -	 rm -f $(ROOT)/usr/bin/gbc; \
--	 ln -s $(bindir)/gbc $(ROOT)/usr/bin/gbc; \
+-	 ln -s $(DESTDIR)$(bindir)/gbc $(ROOT)/usr/bin/gbc; \
 -	 rm -f $(ROOT)/usr/bin/gba; \
--	 ln -s $(bindir)/gba $(ROOT)/usr/bin/gba; \
+-	 ln -s $(DESTDIR)$(bindir)/gba $(ROOT)/usr/bin/gba; \
 -	 rm -f $(ROOT)/usr/bin/gbi; \
--	 ln -s $(bindir)/gbi $(ROOT)/usr/bin/gbi; \
--	fi
--
-+	@if test "$(bindir)" != "%%PREFIX%%/bin" && test "$(bindir)" != "%%PREFIX%%/bin/"; then \
-+	 echo "Making symbolic links in %%PREFIX%%/bin..."; \
+-	 ln -s $(DESTDIR)$(bindir)/gbi $(ROOT)/usr/bin/gbi; \
 +	 rm -f %%PREFIX%%/bin/gbx; \
-+	 ln -sf $(bindir)/gbx %%PREFIX%%/bin/gbx; \
++	 ln -s $(DESTDIR)$(bindir)/gbx %%PREFIX%%/bin/gbx; \
 +	 rm -f %%PREFIX%%/bin/gbc; \
-+	 ln -sf $(bindir)/gbc %%PREFIX%%/bin/gbc; \
++	 ln -s $(DESTDIR)$(bindir)/gbc %%PREFIX%%/bin/gbc; \
 +	 rm -f %%PREFIX%%/bin/gba; \
-+	 ln -sf $(bindir)/gba %%PREFIX%%/bin/gba; \
++	 ln -s $(DESTDIR)$(bindir)/gba %%PREFIX%%/bin/gba; \
 +	 rm -f %%PREFIX%%/bin/gbi; \
-+	 ln -sf $(bindir)/gbi %%PREFIX%%/bin/gbi; \
-+ 	fi
- 	@echo
- 	@echo "Creating the library info files..."
- 	@rm -rf $(pkgdatadir)/info
-@@ -406,28 +401,28 @@
++	 ln -s $(DESTDIR)$(bindir)/gbi %%PREFIX%%/bin/gbi; \
+ 	fi
+ 
  	@echo
+@@ -414,27 +415,27 @@
  	@echo "Installing the development environment..."
  	@(cd $(srcdir)/app; d=`pwd`; for p in *; do echo "Compiling $$p..."; cd $$d/$$p; \
--	  $(bindir)/gbc -ag; $(bindir)/gba; rm -rf .gambas; $(INSTALL) $$p $(bindir); done)
+ 	  $(DESTDIR)$(bindir)/gbc -ag; $(DESTDIR)$(bindir)/gba; rm -rf .gambas; $(INSTALL) $$p $(DESTDIR)$(bindir); done)
 -	@if test "$(bindir)" != "$(ROOT)/usr/bin" && test "$(bindir)" != "$(ROOT)/usr/bin/"; then \
 -	 rm -f $(ROOT)/usr/bin/gambas; \
--	 ln -s $(bindir)/gambas $(ROOT)/usr/bin/gambas; \
-+	  %%PREFIX%%/bin/gbc -ag; %%PREFIX%%/bin/gba; rm -rf .gambas; $(INSTALL) $$p $(bindir); done)
+-	 ln -s $(DESTDIR)$(bindir)/gambas $(ROOT)/usr/bin/gambas; \
 +	@if test "$(bindir)" != "%%PREFIX%%/bin" && test "$(bindir)" != "%%PREFIX%%/bin/"; then \
 +	 rm -f %%PREFIX%%/bin/gambas; \
-+	 ln -sf $(bindir)/gambas %%PREFIX%%/bin/gambas; \
++	 ln -s $(DESTDIR)$(bindir)/gambas %%PREFIX%%/bin/gambas; \
          fi
  
 -	@echo
 -	@echo "Installing the gambas help files..."
--	@$(INSTALL) -d $(pkgdatadir)/help
--	@rm -rf $(pkgdatadir)/help
--	@cp -R $(srcdir)/help $(pkgdatadir)
+-	@$(INSTALL) -d $(DESTDIR)$(pkgdatadir)/help
+-	@rm -rf $(DESTDIR)$(pkgdatadir)/help
+-	@cp -R $(srcdir)/help $(DESTDIR)$(pkgdatadir)
 -
 -	@echo
 -	@echo "Installing the gambas examples..."
--	@rm -rf $(pkgdatadir)/examples
--	@$(INSTALL) -d $(pkgdatadir)/examples
--	@cp -R $(srcdir)/examples $(pkgdatadir)
--	@(cd $(pkgdatadir)/examples; d=`pwd`; for p in */ */*/; do cd $$d/$$p; \
+-	@rm -rf $(DESTDIR)$(pkgdatadir)/examples
+-	@$(INSTALL) -d $(DESTDIR)$(pkgdatadir)/examples
+-	@cp -R $(srcdir)/examples $(DESTDIR)$(pkgdatadir)
+-	@(cd $(DESTDIR)$(pkgdatadir)/examples; d=`pwd`; for p in */ */*/; do cd $$d/$$p; \
 -	  if test -e .project; then \
--	    echo "Compiling $$p..."; cd $$d/$$p; $(bindir)/gbc -ag; $(bindir)/gba; \
+-	    echo "Compiling $$p..."; cd $$d/$$p; $(DESTDIR)$(bindir)/gbc -ag; $(DESTDIR)$(bindir)/gba; \
 -	  fi \
 -	done)
 +# FreeBSD-Doc-Comment	@echo
 +# FreeBSD-Doc-Comment	@echo "Installing the gambas help files..."
-+# FreeBSD-Doc-Comment	@$(INSTALL) -d $(pkgdatadir)/help
-+# FreeBSD-Doc-Comment	@rm -rf $(pkgdatadir)/help
-+# FreeBSD-Doc-Comment	@cp -R $(srcdir)/help $(pkgdatadir)
++# FreeBSD-Doc-Comment	@$(INSTALL) -d $(DESTDIR)$(pkgdatadir)/help
++# FreeBSD-Doc-Comment	@rm -rf $(DESTDIR)$(pkgdatadir)/help
++# FreeBSD-Doc-Comment	@cp -R $(srcdir)/help $(DESTDIR)$(pkgdatadir)
 +# FreeBSD-Doc-Comment
 +# FreeBSD-Doc-Comment	@echo
 +# FreeBSD-Doc-Comment	@echo "Installing the gambas examples..."
-+# FreeBSD-Doc-Comment	@rm -rf $(examplesdir)
-+# FreeBSD-Doc-Comment	@$(INSTALL) -d $(examplesdir)
-+# FreeBSD-Doc-Comment	@cp -R $(srcdir)/examples/* $(examplesdir)
-+# FreeBSD-Doc-Comment	@(cd $(examplesdir); d=`pwd`; for p in */ */*/; do cd $$d/$$p; \
++# FreeBSD-Doc-Comment	@rm -rf $(DESTDIR)$(examplesdir)
++# FreeBSD-Doc-Comment	@$(INSTALL) -d $(DESTDIR)$(examplesdir)
++# FreeBSD-Doc-Comment	@cp -R $(srcdir)/examples/* $(DESTDIR)$(examplesdir)
++# FreeBSD-Doc-Comment	@(cd $(DESTDIR)$(examplesdir); d=`pwd`; for p in */ */*/; do cd $$d/$$p; \
 +# FreeBSD-Doc-Comment	  if test -e .project; then \
-+# FreeBSD-Doc-Comment	    echo "Compiling $$p..."; cd $$d/$$p; $(bindir)/gbc -ag; $(bindir)/gba; \
++# FreeBSD-Doc-Comment	    echo "Compiling $$p..."; cd $$d/$$p; $(DESTDIR)$(bindir)/gbc -ag; $(DESTDIR)$(bindir)/gba; \
 +# FreeBSD-Doc-Comment	  fi \
 +# FreeBSD-Doc-Comment	done)