[SM-Commit] GIT changes to master grimoire by Thomas Orgis (ccc4fcc52debc4585a633830e7190d9d4fb82be8)

Thomas Orgis scm at sourcemage.org
Wed Apr 13 06:23:22 EDT 2011


GIT changes to master grimoire by Thomas Orgis <sobukus at sourcemage.org>:

 editors/xfig/BUILD   |    2 ++
 editors/xfig/DETAILS |    1 +
 editors/xfig/HISTORY |    5 +++++
 editors/xfig/INSTALL |    4 ++--
 4 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit ccc4fcc52debc4585a633830e7190d9d4fb82be8
Author: Thomas Orgis <sobukus at sourcemage.org>
Commit: Thomas Orgis <sobukus at sourcemage.org>

    xfig: fix the install, no /usr/usr, no /usr/lib/X11/app-defaults

diff --git a/editors/xfig/BUILD b/editors/xfig/BUILD
index e0c1e7f..60938bd 100755
--- a/editors/xfig/BUILD
+++ b/editors/xfig/BUILD
@@ -1,2 +1,4 @@
 xmkmf                            &&
+# We want /usr/share/X11/app-defaults
+sed -i 's:$(LIBDIR)/app-defaults:$(SHAREDIR)/app-defaults:' Makefile &&
 make
diff --git a/editors/xfig/DETAILS b/editors/xfig/DETAILS
index d7f5211..f3f403a 100755
--- a/editors/xfig/DETAILS
+++ b/editors/xfig/DETAILS
@@ -8,6 +8,7 @@ SOURCE_DIRECTORY=${BUILD_DIRECTORY}/${SPELL}.${VERSION}
          ENTERED=20020210
       LICENSE[0]=PD
         KEYWORDS="editors"
+      PATCHLEVEL=1
            SHORT="An X Window System tool for drawing basic vector graphics."
 cat << EOF
 Xfig is an X Window System tool for creating basic vector graphics,
diff --git a/editors/xfig/HISTORY b/editors/xfig/HISTORY
index ca58b2b..2a8589b 100644
--- a/editors/xfig/HISTORY
+++ b/editors/xfig/HISTORY
@@ -1,3 +1,8 @@
+2011-04-13 Thomas Orgis <sobukus at sourcemage.org>
+	* BUILD, INSTALL: Do not install to /usr/usr!
+	  Also fix location of app-defaults.
+	* DETAILS: patchlevel
+
 2010-11-03 Ladislav Hagara <hgr at vabo.cz>
 	* DEPENDS: jpeg -> JPEG
 
diff --git a/editors/xfig/INSTALL b/editors/xfig/INSTALL
index 280c330..3222674 100755
--- a/editors/xfig/INSTALL
+++ b/editors/xfig/INSTALL
@@ -1,5 +1,5 @@
-make -j1 DESTDIR="${INSTALL_ROOT}/usr" install.all &&
-cd  /etc/X11/app-defaults        &&
+make -j1 DESTDIR="${INSTALL_ROOT}" install.all &&
+cd "$INSTALL_ROOT/usr/share/X11/app-defaults"  &&
 
 # Changes netscape to mozilla and acroread to xpdf as defaults,
 # if they're installed



More information about the SM-Commit mailing list