[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gsrc-commit] trunk r2827: fix regressions after faulty automated blurb
|
From: |
Brandon Invergo |
|
Subject: |
[Gsrc-commit] trunk r2827: fix regressions after faulty automated blurb sync |
|
Date: |
Sun, 02 Feb 2014 16:07:08 +0000 |
|
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 2827
revision-id: address@hidden
parent: address@hidden
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sun 2014-02-02 16:06:37 +0000
message:
fix regressions after faulty automated blurb sync
modified:
gnu/freefont/Makefile makefile-20100610201541-zilbojleihpphujd-26
gnu/gnucash/Makefile makefile-20121216212748-92egf7341vc4pl7o-2
gnu/hp2xx/Makefile makefile-20100615133538-iz6qzz3rv97o2d38-1
gnu/linux-libre/Makefile makefile-20121027213543-omn8dx94mi4j5pt4-2
gnu/marst/Makefile makefile-20100615131757-zmhfns0kyr0bo3gp-1
gnu/maverik/Makefile makefile-20100610201541-zilbojleihpphujd-69
gnu/melting/Makefile makefile-20121222193815-izyosxyofo8w9wqt-2
gnu/ncurses/Makefile makefile-20100606211655-sj1nx80alech6rtq-58
gnu/sather/Makefile makefile-20100610201541-zilbojleihpphujd-87
gnu/scm/Makefile makefile-20120901195840-aiuw8n2066dxn8bn-2
gnu/slib/Makefile makefile-20120901151027-txggwlqv9dc193cg-2
=== modified file 'gnu/freefont/Makefile'
--- a/gnu/freefont/Makefile 2014-01-28 22:24:51 +0000
+++ b/gnu/freefont/Makefile 2014-02-02 16:06:37 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2013 Brandon Invergo <address@hidden>
+# Copyright © 2013, 2014 Brandon Invergo <address@hidden>
#
# This file is part of GSRC.
#
@@ -47,4 +47,26 @@
include config.mk
include ../../gar.mk
-build-
\ No newline at end of file
+build-%/Makefile:
+ $(BUILD_ENV) $(MAKE) -C $* $(BUILD_ARGS) $(BUILD_TARGET)
+ $(MAKECOOKIE)
+
+install-all: install-ttf install-otf install-woff
+
+install-ttf:
+ @mkdir -p $(packageprefix)/share/fonts/TTF
+ @install -m644 -t $(packageprefix)/share/fonts/TTF \
+ $(WORKOBJ)/sfd/*.ttf
+ $(MAKECOOKIE)
+
+install-otf:
+ @mkdir -p $(packageprefix)/share/fonts/OTF
+ @install -m644 -t $(packageprefix)/share/fonts/OTF \
+ $(WORKOBJ)/sfd/*.otf
+ $(MAKECOOKIE)
+
+install-woff:
+ @mkdir -p $(packageprefix)/share/fonts/WOFF
+ @install -m644 -t $(packageprefix)/share/fonts/WOFF \
+ $(WORKOBJ)/sfd/*.woff
+ $(MAKECOOKIE)
=== modified file 'gnu/gnucash/Makefile'
--- a/gnu/gnucash/Makefile 2014-01-28 22:24:51 +0000
+++ b/gnu/gnucash/Makefile 2014-02-02 16:06:37 +0000
@@ -32,4 +32,15 @@
######################################################################
MASTER_SITES = $(MASTER_SOURCEFORGE)
-MASTER_SUBDIR = $(GARNAME)/files/$(GARNAME)
\ No newline at end of file
+MASTER_SUBDIR = $(GARNAME)/files/$(GARNAME)
+MASTER_SUBDIR = $(GARNAME)/files/$(GARNAME)%20%28stable%29/$(GARVERSION)/
+DISTFILES = $(DISTNAME).tar.gz
+SIGFILES =
+
+BUILDDEPS =
+LIBDEPS = gtk2 slib
+
+######################################################################
+
+include ../../gar.lib/auto.mk
+include config.mk
=== modified file 'gnu/hp2xx/Makefile'
--- a/gnu/hp2xx/Makefile 2014-01-28 22:24:51 +0000
+++ b/gnu/hp2xx/Makefile 2014-02-02 16:06:37 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2013 Brandon Invergo <address@hidden>
+# Copyright © 2013, 2014 Brandon Invergo <address@hidden>
#
# This file is part of GSRC.
#
@@ -45,4 +45,10 @@
include ../../gar.mk
include config.mk
-build-
\ No newline at end of file
+build-%/Makefile:
+ $(BUILD_ENV) $(MAKE) -C $* $(BUILD_ARGS)
+ $(MAKECOOKIE)
+
+install-%/Makefile:
+ $(MAKE) -C $* install $(INSTALL_ARGS)
+ $(MAKECOOKIE)
=== modified file 'gnu/linux-libre/Makefile'
--- a/gnu/linux-libre/Makefile 2014-01-28 22:24:51 +0000
+++ b/gnu/linux-libre/Makefile 2014-02-02 16:06:37 +0000
@@ -57,4 +57,26 @@
make -C $(WORKSRC) mrproper
$(MAKECOOKIE)
-configure-
\ No newline at end of file
+configure-%/Makefile:
+ $(CONFIGURE_ENV) make -C $* $(MAKE_ARGS) $(CONFIGURE_ARGS)
$(CONFIGURE_TARGET)
+ $(MAKECOOKIE)
+
+post-configure:
+ cd $(WORKSRC) && make $(MAKE_ARGS) prepare
+ $(MAKECOOKIE)
+
+build-%/Makefile:
+ $(BUILD_ENV) make -C $* $(BUILD_ARGS)
+ $(MAKECOOKIE)
+
+install-kernel:
+ make -C $(WORKOBJ) $(MAKE_ARGS) \
+ INSTALL_MOD_PATH=$(packageprefix) \
+ INSTALL_HDR_PATH=$(packageprefix) \
+ modules_install \
+ headers_install \
+ firmware_install
+ @install -m755 -D $(WORKSRC)/arch/$(ARCH)/boot/bzImage
$(packageprefix)/boot/vmlinuz-$(DISTNAME)
+ @install -m755 $(WORKSRC)/System.map
$(packageprefix)/boot/System.map$(GARVERSION)
+ @install -m755 $(WORKSRC)/.config
$(packageprefix)/boot/config-$(GARVERSION)
+ $(MAKECOOKIE)
=== modified file 'gnu/marst/Makefile'
--- a/gnu/marst/Makefile 2014-01-28 22:24:51 +0000
+++ b/gnu/marst/Makefile 2014-02-02 16:06:37 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2013 Brandon Invergo <address@hidden>
+# Copyright © 2013, 2014 Brandon Invergo <address@hidden>
#
# This file is part of GSRC.
#
@@ -46,14 +46,12 @@
include config.mk
build-info:
- @printf "[$(OK)build$(OFF)] $(MSG)Building info files
-$(OFF)"
+ @printf "[$(OK)build$(OFF)] $(MSG)Building info files\n$(OFF)"
cd $(WORKSRC)/doc && makeinfo marst
$(MAKECOOKIE)
install-info:
- @printf "[$(OK)install$(OFF)] $(MSG)Installing info files
-$(OFF)"
+ @printf "[$(OK)install$(OFF)] $(MSG)Installing info files\n$(OFF)"
mkdir -p $(packageprefix)/share/info
$(INSTALL_INFO) $(WORKSRC)/doc/marst.info
$(MAKECOOKIE)
=== modified file 'gnu/maverik/Makefile'
--- a/gnu/maverik/Makefile 2014-01-28 22:24:51 +0000
+++ b/gnu/maverik/Makefile 2014-02-02 16:06:37 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2013 Brandon Invergo <address@hidden>
+# Copyright © 2013, 2014 Brandon Invergo <address@hidden>
#
# This file is part of GSRC.
#
@@ -48,4 +48,24 @@
CONFIGURE_ENV += CFLAG="$(CFLAGS)"
-configure-
\ No newline at end of file
+configure-%/setup:
+ cd $* && $(CONFIGURE_ENV) ./setup $(CONFIGURE_OPTS)
+ $(MAKECOOKIE)
+
+build-%/Makefile:
+ $(BUILD_ENV) $(MAKE) -C $* $(BUILD_ARGS)
+ $(MAKECOOKIE)
+
+install-libs:
+ @printf "[$(OK)install$(OFF)] $(MSG)Installing libs\n$(OFF)"
+ mkdir -p $(packageprefix)/lib/$(DISTNAME)
+ for f in $(WORKSRC)/lib/*.so; do \
+ install -m644 $$f $(packageprefix)/lib/$(DISTNAME)/`basename
$$f`; \
+ done
+
+install-headers:
+ @printf "[$(OK)install$(OFF)] $(MSG)Installing headers\n$(OFF)"
+ mkdir -p $(packageprefix)/include/$(DISTNAME)
+ for f in $(WORKSRC)/incl/*.h; do \
+ install -m644 $$f
$(packageprefix)/include/$(DISTNAME)/`basename $$f`; \
+ done
=== modified file 'gnu/melting/Makefile'
--- a/gnu/melting/Makefile 2014-01-28 22:24:51 +0000
+++ b/gnu/melting/Makefile 2014-02-02 16:06:37 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2013 Brandon Invergo <address@hidden>
+# Copyright © 2013, 2014 Brandon Invergo <address@hidden>
#
# This file is part of GSRC.
#
@@ -44,4 +44,19 @@
include ../../gar.mk
include config.mk
-build-
\ No newline at end of file
+build-%/buildProject.sh:
+ @echo -e "[$(OK)build$(OFF)] $(MSG)Running buildProject.sh in
$*\n$(OFF)"
+ cd $* && ./buildProject.sh
+ $(MAKECOOKIE)
+
+install-all:
+ @echo -e "[$(OK)install$(OFF)] $(MSG)Manually installing all$(OFF)"
+ @mkdir -p $(packageprefix)
+ @mkdir -p $(packageprefix)/bin
+ @mkdir -p $(packageprefix)/$(UPSTREAMNAME)/src
+ @install -m755 -D $(WORKSRC)/executable/melting
$(packageprefix)/bin/melting
+ @install -m755 -D $(WORKSRC)/executable/melting5.jar
$(packageprefix)/bin/melting5.jar
+ @for f in $(WORKSRC)/Data/*; do \
+ install -m644 $$f $(packageprefix)/$(UPSTREAMNAME)/src/`$$f`; \
+ done
+ $(MAKECOOKIE)
=== modified file 'gnu/ncurses/Makefile'
--- a/gnu/ncurses/Makefile 2014-01-28 22:24:51 +0000
+++ b/gnu/ncurses/Makefile 2014-02-02 16:06:37 +0000
@@ -57,37 +57,32 @@
endif
configure-ncurses:
- @printf "[$(OK)configure$(OFF)] $(MSG)Running $(CONFIGURE_NAME) in
$(OFF)$*
-"
+ @printf "[$(OK)configure$(OFF)] $(MSG)Running $(CONFIGURE_NAME) in
$(OFF)$*\n"
mkdir $(WORKDIR)/ncurses-build
cd $(WORKDIR)/ncurses-build && $(CONFIGURE_ENV)
../$(DISTNAME)/configure $(CONFIGURE_ARGS) $(ARCH_ARG) $(OUTPUT)
$(MAKECOOKIE)
configure-ncursesw:
- @printf "[$(OK)configure$(OFF)] $(MSG)Running $(CONFIGURE_NAME) in
$(OFF)$*
-"
+ @printf "[$(OK)configure$(OFF)] $(MSG)Running $(CONFIGURE_NAME) in
$(OFF)$*\n"
mkdir $(WORKDIR)/ncursesw-build
cd $(WORKDIR)/ncursesw-build && $(CONFIGURE_ENV)
../$(DISTNAME)/configure \
$(CONFIGURE_ARGS) --enable-widec --enable-pc-files $(OUTPUT)
$(MAKECOOKIE)
build-ncurses:
- @printf "[$(OK)build$(OFF)] $(MSG)Running make in $(OFF)$*
-"
+ @printf "[$(OK)build$(OFF)] $(MSG)Running make in $(OFF)$*\n"
$(BUILD_ENV) $(MAKE) -C $(WORKDIR)/ncurses-build $(MAKE_ARGS)
$(BUILD_ARGS) \
$(OUTPUT) || $(BUILD_FAIL)
$(MAKECOOKIE)
build-ncursesw:
- @printf "[$(OK)build$(OFF)] $(MSG)Running make in $(OFF)$*
-"
+ @printf "[$(OK)build$(OFF)] $(MSG)Running make in $(OFF)$*\n"
$(BUILD_ENV) $(MAKE) -C $(WORKDIR)/ncursesw-build $(MAKE_ARGS)
$(BUILD_ARGS) \
$(OUTPUT) || $(BUILD_FAIL)
$(MAKECOOKIE)
install-ncurses:
- @printf "[$(OK)install$(OFF)] $(MSG)Running make $(INSTALL_TARGET) in
$(OFF)$*
-"
+ @printf "[$(OK)install$(OFF)] $(MSG)Running make $(INSTALL_TARGET) in
$(OFF)$*\n"
cd $(WORKDIR)/ncurses-build && for lib in ncurses form panel menu; do \
install -Dm755 lib/lib$${lib}.so.$(GARVERSION) \
$(packageprefix)/lib/lib$${lib}.so.$(GARVERSION); \
@@ -100,8 +95,7 @@
$(MAKECOOKIE)
install-ncursesw:
- @printf "[$(OK)install$(OFF)] $(MSG)Running make $(INSTALL_TARGET) in
$(OFF)$*
-"
+ @printf "[$(OK)install$(OFF)] $(MSG)Running make $(INSTALL_TARGET) in
$(OFF)$*\n"
$(INSTALL_ENV) $(MAKE) -C $(WORKDIR)/ncursesw-build $(MAKE_ARGS) \
$(INSTALL_ARGS) install $(OUTPUT)
cd $(WORKDIR)/ncursesw-build && for lib in ncurses form panel menu; do \
=== modified file 'gnu/sather/Makefile'
--- a/gnu/sather/Makefile 2014-01-28 22:24:51 +0000
+++ b/gnu/sather/Makefile 2014-02-02 16:06:37 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2013 Brandon Invergo <address@hidden>
+# Copyright © 2013, 2014 Brandon Invergo <address@hidden>
#
# This file is part of GSRC.
#
@@ -52,4 +52,6 @@
BUILD_ARGS += SATHER_HOME=$(prefix)/lib/sather
-build-
\ No newline at end of file
+build-%/Makefile:
+ $(BUILD_ENV) $(MAKE) -C $* full $(BUILD_ARGS)
+ $(MAKECOOKIE)
=== modified file 'gnu/scm/Makefile'
--- a/gnu/scm/Makefile 2014-01-28 22:24:51 +0000
+++ b/gnu/scm/Makefile 2014-02-02 16:06:37 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2013 Brandon Invergo <address@hidden>
+# Copyright © 2013, 2014 Brandon Invergo <address@hidden>
#
# This file is part of GSRC.
#
@@ -64,14 +64,12 @@
$(MAKECOOKIE)
build-$(WORKSRC)/Makefile:
- @printf "[$(OK)build$(OFF)] $(MSG)Running make$(OFF)
-"
+ @printf "[$(OK)build$(OFF)] $(MSG)Running make$(OFF)\n"
cd $(WORKSRC) && $(BUILD_ENV) make all $(BUILD_ARGS)
$(MAKECOOKIE)
install-info:
- @printf "[$(OK)install$(OFF)] $(MSG)Installing info files
-$(OFF)"
+ @printf "[$(OK)install$(OFF)] $(MSG)Installing info files\n$(OFF)"
for f in $(addprefix $(WORKSRC)/,$(INFO_FILES)); do \
$(INSTALL_INFO) $$f; \
done
=== modified file 'gnu/slib/Makefile'
--- a/gnu/slib/Makefile 2014-01-28 22:24:51 +0000
+++ b/gnu/slib/Makefile 2014-02-02 16:06:37 +0000
@@ -1,4 +1,4 @@
-# Copyright © 2013 Brandon Invergo <address@hidden>
+# Copyright © 2013, 2014 Brandon Invergo <address@hidden>
#
# This file is part of GSRC.
#
@@ -55,7 +55,6 @@
$(MAKECOOKIE)
install-info:
- @printf "[$(OK)install$(OFF)] $(MSG)Installing info files
-$(OFF)"
+ @printf "[$(OK)install$(OFF)] $(MSG)Installing info files\n$(OFF)"
$(INSTALL_INFO) $(WORKSRC)/$(GARNAME).info
$(MAKECOOKIE)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gsrc-commit] trunk r2827: fix regressions after faulty automated blurb sync,
Brandon Invergo <=