[Gsrc-commit] /srv/bzr/gsrc/trunk r1019: build proper configure and Makefile for librejs

[Brandon Invergo]

------------------------------------------------------------
revno: 1019
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Thu 2012-11-01 23:50:49 +0100
message:
  build proper configure and Makefile for librejs
removed:
  gnu/librejs/files/librejs-4.9-alt_install.diff
added:
  gnu/librejs/files/librejs-configure.tar.gz
modified:
  gnu/librejs/Makefile
  gnu/librejs/config.mk
  gnu/librejs/sha256sums

=== modified file 'gnu/librejs/Makefile'
--- a/gnu/librejs/Makefile      2012-11-01 11:05:47 +0000
+++ b/gnu/librejs/Makefile      2012-11-01 22:50:49 +0000
@@ -7,17 +7,14 @@
 
 MASTER_SITES = $(MASTER_GNU)
 MASTER_SUBDIR = $(GARNAME)/
-DISTFILES = $(DISTNAME).tar.gz
+DISTFILES = $(DISTNAME).tar.gz librejs-configure.tar.gz
 SIGFILES = $(DISTNAME).tar.gz.sig
-PATCHFILES = librejs-4.9-alt_install.diff
-BUILD_SCRIPTS = $(WORKSRC)/Makefile
-INSTALL_SCRIPTS = $(WORKSRC)/Makefile
 
 BUILDDEPS = #addon-sdk
 LIBDEPS = 
 
 ######################################################################
 
-include ../../gar.mk
+include ../../gar.lib/auto.mk
 
 

=== modified file 'gnu/librejs/config.mk'
--- a/gnu/librejs/config.mk     2012-11-01 11:05:47 +0000
+++ b/gnu/librejs/config.mk     2012-11-01 22:50:49 +0000
@@ -1,4 +1,7 @@
 ## Configuration options for librejs ##
 
-CONFIGURE_OPTS ?= 
+# GSRC currently does not provide the Mozilla Addon-SDK, nor is it
+# ever likely to do so. You must provide the install location of
+# the SDK here (required to build LibreJS)
+CONFIGURE_OPTS ?= ADDON_SDK=/opt/addon-sdk
 BUILD_OPTS ?=

=== removed file 'gnu/librejs/files/librejs-4.9-alt_install.diff'
--- a/gnu/librejs/files/librejs-4.9-alt_install.diff    2012-11-01 11:06:57 
+0000
+++ b/gnu/librejs/files/librejs-4.9-alt_install.diff    1970-01-01 00:00:00 
+0000
@@ -1,53 +0,0 @@
-diff -x config.log -x config.status -ru work/librejs-4.9/Makefile 
work/librejs-4.9/Makefile
---- work/librejs-4.9/Makefile  2012-11-01 04:07:38.000000000 +0000
-+++ work/librejs-4.9/Makefile  2012-11-01 10:46:44.837509858 +0000
-@@ -15,7 +15,9 @@
- # You should have received a copy of the GNU General Public License
- # along with this program.  If not, see  <http://www.gnu.org/licenses/>.
- 
--
-+DESTDIR =
-+prefix = $(DESTDIR)/usr/
-+libdir = $(prefix)/lib
- 
- all: 
-       cfx xpi
-@@ -25,30 +27,30 @@
- doinstall: 
-       @echo "Creating Mozilla directories for system-wide add-ons and 
extensions";
- 
--      if test ! -d "/usr/lib/mozilla"; then \
-+      if test ! -d "$(libdir)/mozilla"; then \
-               echo "Creating Mozilla directory"; \
--              mkdir "/usr/lib/mozilla";\
-+              install -d "$(libdir)/mozilla";\
-       fi;
- 
--      if test ! -d "/usr/lib/mozilla/extensions"; then \
-+      if test ! -d "$(libdir)/mozilla/extensions"; then \
-               echo "Creating extensions directory"; \
--              mkdir "/usr/lib/mozilla/extensions";\
-+              install -d "$(libdir)/mozilla/extensions";\
-       fi;
- 
- 
--      if test ! -d 
"/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"; then \
-+      if test ! -d 
"$(libdir)/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"; then \
-               echo "Creating Mozilla-browser uuid directory"; \
--              mkdir 
"/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"; \
-+              install -d 
"$(libdir)/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"; \
-       fi;
- 
-       @echo "Installing LibreJS";
- 
--      cp librejs.xpi 
"/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/address@hidden";
-+      cp librejs.xpi 
"$(libdir)/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/address@hidden";
- 
-       @echo "Depending on your version of the Mozilla-browser, if LibreJS is 
not enabled already, you may, inside your Mozilla-browser, need to go in the 
menu in Tools > Add-ons and click enable where you see LibreJS.";
- 
- uninstall:
--      rm 
"/usr/lib/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/address@hidden";
-+      rm 
"$(libdir)/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/address@hidden";
- 
- clean:
-       rm "librejs.xpi";

=== added file 'gnu/librejs/files/librejs-configure.tar.gz'
Binary files a/gnu/librejs/files/librejs-configure.tar.gz       1970-01-01 
00:00:00 +0000 and b/gnu/librejs/files/librejs-configure.tar.gz      2012-11-01 
22:50:49 +0000 differ
=== modified file 'gnu/librejs/sha256sums'
--- a/gnu/librejs/sha256sums    2012-11-01 11:05:47 +0000
+++ b/gnu/librejs/sha256sums    2012-11-01 22:50:49 +0000
@@ -1,3 +1,3 @@
 16f34ebe1f10562ab9ec717a992514eccccbdb39d97ccee42e0fd3271023cbe5  
download/librejs-4.9.tar.gz
-2cad338512e866bf06fb7f0fa1304ea6068042bc8950167f0937d817ee70b659  
download/librejs-4.9-alt_install.diff
+01d1c07ff4b8a599d16df316ce569a0251a412987d168bb0012a19e505d2e0fe  
download/librejs-configure.tar.gz
 c6980457089cadb82c4c2a29c0e3acff2f60f679d4a32f11d3de33246c5b998a  
download/librejs-4.9.tar.gz.sig