[SM-Commit] GIT changes to master grimoire by Pieter Lenaerts (7067d38e36dbb3d5451ef206565ccdc0bf7023f5)

Pieter Lenaerts scm at sourcemage.org
Thu Sep 18 16:27:17 EDT 2008


GIT changes to master grimoire by Pieter Lenaerts <e-type at sourcemage.org>:

 editors/MAINTAINER                        |    2 +-
 editors/moe/BUILD                         |    9 +++++----
 editors/moe/DETAILS                       |    4 ++--
 editors/moe/HISTORY                       |    5 +++++
 editors/moe/PRE_BUILD                     |    3 ---
 editors/mp/BUILD                          |    7 +++----
 editors/mp/DETAILS                        |    9 ++++++---
 editors/mp/HISTORY                        |    6 ++++++
 editors/mp/PRE_BUILD                      |    3 +++
 editors/mp/mp-5.1.0-rc1_makefile.in.patch |   20 ++++++++++++++++++++
 editors/mp/mp.gpg                         |binary
 11 files changed, 51 insertions(+), 17 deletions(-)

New commits:
commit 7067d38e36dbb3d5451ef206565ccdc0bf7023f5
Author: Pieter Lenaerts <e-type at sourcemage.org>
Commit: Pieter Lenaerts <e-type at sourcemage.org>

    editors/MAINTAINER: fixing my email

commit 843b9cefb655a016db6c2d4d938db8e8913aad33
Author: Pieter Lenaerts <e-type at sourcemage.org>
Commit: Pieter Lenaerts <e-type at sourcemage.org>

    mp: updated to 5.1.0-rc1 and reorganized a bit

commit 30442a7a50fb9025370807714d043bfddf1757ee
Author: Pieter Lenaerts <e-type at sourcemage.org>
Commit: Pieter Lenaerts <e-type at sourcemage.org>

    moe: updated to 1.0

diff --git a/editors/MAINTAINER b/editors/MAINTAINER
index 54173ad..32f53bb 100644
--- a/editors/MAINTAINER
+++ b/editors/MAINTAINER
@@ -1 +1 @@
-Pieter Lenaerts <e-type at cwazy.co.uk>
+Pieter Lenaerts <e-type at sourcemage.org>
diff --git a/editors/moe/BUILD b/editors/moe/BUILD
index 93c0a9d..7fb8e50 100755
--- a/editors/moe/BUILD
+++ b/editors/moe/BUILD
@@ -1,6 +1,7 @@
-./configure --prefix=${INSTALL_ROOT}/usr  \
-            --datadir=${INSTALL_ROOT}      \
-            --mandir=${INSTALL_ROOT}/usr/share/man   \
+./configure --prefix=${INSTALL_ROOT}/usr              \
+            --datadir=${INSTALL_ROOT}                 \
+            --mandir=${INSTALL_ROOT}/usr/share/man    \
             --infodir=${INSTALL_ROOT}/usr/share/info  \
-                     $OPTS                 &&
+            --sysconfdir=${INSTALL_ROOT}/etc          \
+                     $OPTS                            &&
 make
diff --git a/editors/moe/DETAILS b/editors/moe/DETAILS
index 27a9c74..e00b6eb 100755
--- a/editors/moe/DETAILS
+++ b/editors/moe/DETAILS
@@ -1,10 +1,10 @@
            SPELL=moe
-         VERSION=0.8
+         VERSION=1.0
           SOURCE=${SPELL}-${VERSION}.tar.bz2
          SOURCE2=${SOURCE}.sig
       SOURCE_URL=${GNU_URL}/${SPELL}/${SOURCE}
      SOURCE2_URL=${SOURCE_URL}.sig
-      SOURCE_GPG=gnu.gpg:${SOURCE}.sig:UPSTREAM_KEY
+      SOURCE_GPG=gnu.gpg:${SOURCE}.sig:ESTABLISHED_UPSTREAM_KEY
   SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}-${VERSION}
         WEB_SITE=http://www.gnu.org/software/moe/moe.html
diff --git a/editors/moe/HISTORY b/editors/moe/HISTORY
index d660927..332bebf 100644
--- a/editors/moe/HISTORY
+++ b/editors/moe/HISTORY
@@ -1,3 +1,8 @@
+2008-09-18 Pieter Lenaerts <e-type at sourcemage.org>
+	* DETAILS: updated to 1.0, key is ESTABLISHED_UPSTREAM_KEY
+	* PRE_BUILD: removed as it's no longer needed, now default_prebuild only
+	* BUILD: added sysconfdir option to ./configure
+
 2007-01-16 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* profile.d/editor.sh: added
 	* INSTALL: install editor.sh
diff --git a/editors/moe/PRE_BUILD b/editors/moe/PRE_BUILD
deleted file mode 100755
index 4605153..0000000
--- a/editors/moe/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-sedit "s/rcdir\ =\ \$(prefix)/rcdir\ =\ ${INSTALL_ROOT}/g" \
-      ${SOURCE_DIRECTORY}/Makefile.in
diff --git a/editors/mp/BUILD b/editors/mp/BUILD
index 3bbf51b..2504d0f 100755
--- a/editors/mp/BUILD
+++ b/editors/mp/BUILD
@@ -1,5 +1,4 @@
-sedit 's:./mkinstalldirs $(PREFIX)/share/doc/$(APPNAME):./mkinstalldirs $(PREFIX)/share/doc/mp:' makefile.in  &&
-sedit 's:-install -m 644 $(DOCS) $(PREFIX)/share/doc/$(APPNAME):-install -m 644 $(DOCS) $(PREFIX)/share/doc/mp:'  \
-makefile.in  &&
-./config.sh --prefix=$INSTALL_ROOT/usr --docdir=$INSTALL_ROOT/usr/share/doc/$SPELL $OPTS &&
+./config.sh --prefix=$INSTALL_ROOT/usr                   \
+            --docdir=$INSTALL_ROOT/usr/share/doc/$SPELL  \
+            $OPTS                                        &&
 make
diff --git a/editors/mp/DETAILS b/editors/mp/DETAILS
index 2e1e01a..de655ec 100755
--- a/editors/mp/DETAILS
+++ b/editors/mp/DETAILS
@@ -1,8 +1,11 @@
            SPELL=mp
-         VERSION=5.0.0-rc1
+         VERSION=5.1.0-rc1
           SOURCE="${SPELL}-${VERSION}.tar.gz"
-   SOURCE_URL[0]=http://www.triptico.com/download/${SOURCE}
-     SOURCE_HASH=sha512:2c9f2193b1cfffbb25aa498f69a0bdf176e9fba3b1d29c14534772bfec83d1f2b923371bc83943bfc1798ce1add6faa3f4a78e95c873c1917f5c0c9854a39041
+         SOURCE2="${SOURCE}.asc"
+   SOURCE_URL[0]="http://www.triptico.com/download/${SOURCE}"
+     SOURCE2_URL="${SOURCE_URL[0]}.asc"
+      SOURCE_GPG="mp.gpg:${SOURCE}.asc:UPSTREAM_KEY"
+  SOURCE2_IGNORE=signature
 SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
         WEB_SITE="http://www.triptico.com/software/mp.html"
       LICENSE[0]=GPL
diff --git a/editors/mp/HISTORY b/editors/mp/HISTORY
index 46f9d58..707a13a 100644
--- a/editors/mp/HISTORY
+++ b/editors/mp/HISTORY
@@ -1,3 +1,9 @@
+2008-09-18 Pieter Lenaerts <e-type at sourcemage.org>
+	* DETAILS: updated to 5.1.0-rc1, using UPSTREAM_KEY
+	* BUILD: moved source altering activities to PRE_BUILD
+	* PRE_BUILD: added, using patch now to fix doc install location
+	* mk.gpg: added
+
 2007-04-30 Pol Vinogradov <vin.public at gmail.com>
 	* BUILD: added sedits for proper documents installation, removed cd to
 	  source directory, added --docdir option to config.sh
diff --git a/editors/mp/PRE_BUILD b/editors/mp/PRE_BUILD
new file mode 100755
index 0000000..44ac0e9
--- /dev/null
+++ b/editors/mp/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build  &&
+patch -p1 -d ${SOURCE_DIRECTORY} \
+       < ${SCRIPT_DIRECTORY}/${SPELL}-${VERSION}_makefile.in.patch
diff --git a/editors/mp/mp-5.1.0-rc1_makefile.in.patch b/editors/mp/mp-5.1.0-rc1_makefile.in.patch
new file mode 100644
index 0000000..89f5afd
--- /dev/null
+++ b/editors/mp/mp-5.1.0-rc1_makefile.in.patch
@@ -0,0 +1,20 @@
+diff -urNp mp-5.1.0-rc1.orig/makefile.in mp-5.1.0-rc1/makefile.in
+--- mp-5.1.0-rc1.orig/makefile.in	2008-09-18 21:27:51.000000000 +0200
++++ mp-5.1.0-rc1/makefile.in	2008-09-18 21:28:46.000000000 +0200
+@@ -129,12 +129,12 @@ install: $(INSTALL_MSG) installdoc insta
+ 	[ -f $(APPNAME).1 ] && install -m 644 $(APPNAME).1 $(PREFIX)/share/man/man1/$(APPNAME).1 || true
+ 
+ installdoc:
+-	./mkinstalldirs $(PREFIX)/share/doc/$(APPNAME)
++	./mkinstalldirs $(PREFIX)/share/doc/mp
+ 	( cd $(MPDM); $(MAKE) installdoc )
+ 	( cd $(MPSL); $(MAKE) installdoc )
+-	install -m 644 doc/* $(PREFIX)/share/doc/$(APPNAME)
+-	install -m 644 $(ADD_DOCS) $(PREFIX)/share/doc/$(APPNAME)
+-	[ -f doc/mp_index.html ] && install -m 644 doc/mp_index.html $(PREFIX)/share/doc/$(APPNAME)/index.html || true
++	install -m 644 doc/* $(PREFIX)/share/doc/mp
++	install -m 644 $(ADD_DOCS) $(PREFIX)/share/doc/mp
++	[ -f doc/mp_index.html ] && install -m 644 doc/mp_index.html $(PREFIX)/share/doc/mp/index.html || true
+ 
+ uninstall: uninstall-mo
+ 	rm -f $(PREFIX)/bin/$(APPNAME)
diff --git a/editors/mp/mp.gpg b/editors/mp/mp.gpg
new file mode 100644
index 0000000..6db6a0e
Binary files /dev/null and b/editors/mp/mp.gpg differ



More information about the SM-Commit mailing list