Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (e5e3cff63c1133254eb90e1d893367b8b73ee6f8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (e5e3cff63c1133254eb90e1d893367b8b73ee6f8)
  • Date: Sun, 1 Oct 2017 07:46:20 +0000

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

editors/ted/BUILD | 6 +-
editors/ted/DEPENDS | 13 ++----
editors/ted/DETAILS | 6 +-
editors/ted/HISTORY | 9 ++++
editors/ted/INSTALL | 6 --
editors/ted/PRE_BUILD | 3 +
editors/ted/mk.diff | 108
--------------------------------------------------
7 files changed, 23 insertions(+), 128 deletions(-)

New commits:
commit e5e3cff63c1133254eb90e1d893367b8b73ee6f8
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

ted 2.23

diff --git a/editors/ted/BUILD b/editors/ted/BUILD
index cd2d9c7..db01e0f 100755
--- a/editors/ted/BUILD
+++ b/editors/ted/BUILD
@@ -1,5 +1,5 @@
+make_single &&
DEST=${INSTALL_ROOT}/usr/share/ted &&
-patch -p0 < $SCRIPT_DIRECTORY/mk.diff tedPackage/makefile.in &&
make CONFIGURE_OPTIONS="--prefix=${DEST} $OPTS" compile.shared &&
-make package.shared
-
+make package.shared &&
+make_normal
diff --git a/editors/ted/DEPENDS b/editors/ted/DEPENDS
index 6ff8f14..131e9ee 100755
--- a/editors/ted/DEPENDS
+++ b/editors/ted/DEPENDS
@@ -1,13 +1,10 @@
-depends xorg-libs &&
+depends xorg-libs &&
depends libmng &&
depends JPEG &&
depends libpng &&
depends zlib &&
depends tiff &&
-optional_depends MOTIF "--with-MOTIF" "" "Motif style GUI"
-
-#
-# gtk UI is currently still broken. ted developer is working on it.
-#
-
-#optional_depends gtk+2 "--with-GTK" "" "Gtk2 style GUI"
+optional_depends motif "--with-MOTIF" "" "Motif style GUI (othewise GTK 2
is used)"
+if ! is_depends_enabled $SPELL motif; then
+ depends gtk+2 "--with-GTK"
+fi
diff --git a/editors/ted/DETAILS b/editors/ted/DETAILS
index 91d5e16..6385647 100755
--- a/editors/ted/DETAILS
+++ b/editors/ted/DETAILS
@@ -1,14 +1,14 @@
SPELL=ted
- VERSION=2.17
+ VERSION=2.23
SOURCE=${SPELL}-${VERSION}.src.tar.gz
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/Ted-${VERSION}
WEB_SITE=http://www.nllgg.nl/Ted
SOURCE_URL[0]=ftp://ftp.nluug.nl/pub/editors/ted/${SOURCE}
LICENSE=GPL
-
SOURCE_HASH=sha512:36c07196a404ccf824a8d4068a5abc7c622ce4150e63a7dbf7ebbd6c8d51c4c9ebf0dee3584138efd8e892a8c7c57dc9e469cfb382c35e8e1b6fba98e0b7a1cb
+
SOURCE_HASH=sha512:c6541e5a07545a08b30cb9b33429d9a7675f9252df32ccca5cdb4f2ff09978085d28d015a42922baf8c95db1ea6379a9d1088541aafd9ce45b8870212496849f
ENTERED=20040418
- UPDATED=20040623
KEYWORDS="editors"
+ GATHER_DOCS=off
SHORT="Ted is a text processor running under X Windows"
cat << EOF
Ted is an easy rich text processor. It can edit RTF files in a wysiwyg
manner.
diff --git a/editors/ted/HISTORY b/editors/ted/HISTORY
index 46017e4..af4290d 100644
--- a/editors/ted/HISTORY
+++ b/editors/ted/HISTORY
@@ -1,3 +1,12 @@
+2017-09-30 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS: updated spell to 2.23
+ set GATHER_DOCS=off
+ * BUILD, mk.diff: patch removed, no longer needed
+ * BUILD: fixed build, use make_single
+ * INSTALL: removed, no longer needed
+ * PRE_BUILD: added fix to tedPackage/makefile.in
+ * DEPENDS: MOTIF -> motif, added dependency on gtk+2
+
2010-11-03 Ladislav Hagara <hgr AT vabo.cz>
* DEPENDS: jpeg -> JPEG

diff --git a/editors/ted/INSTALL b/editors/ted/INSTALL
deleted file mode 100755
index fda8dd1..0000000
--- a/editors/ted/INSTALL
+++ /dev/null
@@ -1,6 +0,0 @@
-make install &&
-cd tedPackage/scratch &&
-mkdir -p ${DEST} &&
-cp -a afm ind Ted ${DEST} &&
-cp bin/* Ted/*.sh ${INSTALL_ROOT}/usr/bin &&
-cp Ted/*.1 ${INSTALL_ROOT}/usr/share/man/man1
diff --git a/editors/ted/PRE_BUILD b/editors/ted/PRE_BUILD
new file mode 100755
index 0000000..4f5ffad
--- /dev/null
+++ b/editors/ted/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+sedit 's/\.static//g' tedPackage/makefile.in
diff --git a/editors/ted/mk.diff b/editors/ted/mk.diff
deleted file mode 100644
index 34c24af..0000000
--- a/editors/ted/mk.diff
+++ /dev/null
@@ -1,108 +0,0 @@
---- makefile.in 2004-04-17 14:03:00.000000000 +0200
-+++ makefile.in.cp 2004-04-18 15:18:16.000000000 +0200
-@@ -22,57 +22,6 @@
- #
- ########################################################################
-
--package: ../Ted/Ted.static \
-- TedBindist.tar \
-- $(BINDIST).lsm \
-- installTed.sh \
-- README
-- :
-- @CHECK_ID_CMD@
-- :
-- rm -rf scratch
-- :
-- mkdir scratch
-- mkdir scratch/bin
-- :
-- $(CHOWN_CMD) scratch
-- $(CHOWN_CMD) scratch/bin
-- :
-- chmod 755 scratch
-- chmod 755 scratch/bin
-- :
-- ( cd scratch && umask 0 && tar xvf ../TedBindist.tar )
-- cp scratch/Ted/TedDocument-en_US.rtf TedDocument-en_US.rtf
-- :
-- cp ../Ted/Ted.static scratch/bin/Ted
-- strip scratch/bin/Ted
-- $(CHOWN_CMD) scratch/bin/Ted
-- chmod 755 scratch/bin/Ted
-- :
-- ( cd scratch && tar cvf - @TAR_CHOWN_ARGS@ * | gzip -9 >
../$(BINDIST).tar.gz )
-- :
-- $(CHOWN_CMD) README
-- $(CHOWN_CMD) TedDocument-en_US.rtf
-- $(CHOWN_CMD) $(BINDIST).tar.gz
-- $(CHOWN_CMD) $(BINDIST).lsm
-- $(CHOWN_CMD) installTed.sh
-- :
-- test x_$$RPM_BUILD_ROOT != x_ || chmod 644 README
-- test x_$$RPM_BUILD_ROOT != x_ || chmod 644 TedDocument-en_US.rtf
-- test x_$$RPM_BUILD_ROOT != x_ || chmod 644 $(BINDIST).tar.gz
-- test x_$$RPM_BUILD_ROOT != x_ || chmod 644 $(BINDIST).lsm
-- test x_$$RPM_BUILD_ROOT != x_ || chmod 755 installTed.sh
-- :
-- @echo Checking existence of distribution files
-- test -s README
-- test -s TedDocument-en_US.rtf
-- test -s $(BINDIST).tar.gz
-- test -s $(BINDIST).lsm
-- test -x installTed.sh
-- :
-- rm -rf scratch
-- @date >> package
-- @echo Distribution is complete
-
- ########################################################################
- #
-@@ -88,17 +37,7 @@
- :
- @CHECK_ID_CMD@
- :
-- rm -rf scratch
-- :
-- mkdir scratch
-- mkdir scratch/bin
-- :
-- $(CHOWN_CMD) scratch
-- $(CHOWN_CMD) scratch/bin
-- :
-- chmod 755 scratch
-- chmod 755 scratch/bin
-- :
-+ mkdir -p scratch
- ( cd scratch && umask 0 && tar xvf ../TedBindist.tar )
- cp scratch/Ted/TedDocument-en_US.rtf TedDocument-en_US.rtf
- :
-@@ -106,28 +45,6 @@
- $(CHOWN_CMD) scratch/bin/Ted
- chmod 755 scratch/bin/Ted
- :
-- ( cd scratch && tar cvf - @TAR_CHOWN_ARGS@ * | gzip -9 >
../$(BINDIST).tar.gz )
-- :
-- $(CHOWN_CMD) README
-- $(CHOWN_CMD) TedDocument-en_US.rtf
-- $(CHOWN_CMD) $(BINDIST).tar.gz
-- $(CHOWN_CMD) $(BINDIST).lsm
-- $(CHOWN_CMD) installTed.sh
-- :
-- test x_$$RPM_BUILD_ROOT != x_ || chmod 644 README
-- test x_$$RPM_BUILD_ROOT != x_ || chmod 644 TedDocument-en_US.rtf
-- test x_$$RPM_BUILD_ROOT != x_ || chmod 644 $(BINDIST).tar.gz
-- test x_$$RPM_BUILD_ROOT != x_ || chmod 644 $(BINDIST).lsm
-- test x_$$RPM_BUILD_ROOT != x_ || chmod 755 installTed.sh
-- :
-- @echo Checking existence of distribution files
-- test -s README
-- test -s TedDocument-en_US.rtf
-- test -s $(BINDIST).tar.gz
-- test -s $(BINDIST).lsm
-- test -x installTed.sh
-- :
-- rm -rf scratch
- @date > package.shared
- @echo Distribution is complete
-



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (e5e3cff63c1133254eb90e1d893367b8b73ee6f8), Ismael Luceno, 10/01/2017

Archive powered by MHonArc 2.6.24.

Top of Page