From d22823d9ca1b78700d3ad087e75da39ba5ab1c16 Mon Sep 17 00:00:00 2001
From: ArTourter
Date: Fri, 27 Jul 2012 23:58:34 -0500
Subject: academic/units: Fixed packaging (improper DESTDIR usage)

Thanks to Enrich Ritz for the bug report.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 academic/units/destdir-fix.patch | 29 +++++++++++++++++++++++++++++
 academic/units/units.SlackBuild  |  8 +++++---
 2 files changed, 34 insertions(+), 3 deletions(-)
 create mode 100644 academic/units/destdir-fix.patch

(limited to 'academic')

diff --git a/academic/units/destdir-fix.patch b/academic/units/destdir-fix.patch
new file mode 100644
index 0000000000..b68e514eb4
--- /dev/null
+++ b/academic/units/destdir-fix.patch
@@ -0,0 +1,29 @@
+diff -Nur units-2.00.orig/Makefile.in units-2.00/Makefile.in
+--- units-2.00.orig/Makefile.in	2012-05-02 15:37:55.000000000 -0500
++++ units-2.00/Makefile.in	2012-07-27 23:54:02.551369930 -0500
+@@ -84,10 +84,10 @@
+ 	sed -e "s:outfile = 'currency.units':outfile='@UDAT@currency.units':" units_cur > units_cur_inst
+ 
+ install-support: definitions.units currency.units units_cur_inst
+-	$(srcdir)/mkinstalldirs @UDAT@  $(DESTDIR)$(bindir) 
+-	$(INSTALL_DATA) $(srcdir)/definitions.units @UDAT@definitions.units
+-	$(INSTALL_DATA) $(srcdir)/currency.units @UDAT@currency.units
+-	$(INSTALL_DATA) $(srcdir)/locale.map @UDAT@locale.map
++	$(srcdir)/mkinstalldirs $(DESTDIR)@UDAT@  $(DESTDIR)$(bindir) 
++	$(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)@UDAT@definitions.units
++	$(INSTALL_DATA) $(srcdir)/currency.units $(DESTDIR)@UDAT@currency.units
++	$(INSTALL_DATA) $(srcdir)/locale.map $(DESTDIR)@UDAT@locale.map
+ 	$(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`
+ 
+ install: units@EXEEXT@ install-doc install-support
+@@ -138,8 +138,8 @@
+ uninstall: 
+ 	-rm -f $(DESTDIR)$(bindir)/`echo units@EXEEXT@|sed '$(transform)'` \
+ 	       $(DESTDIR)$(mandir)/man1/`echo units|sed '$(transform)'`.1 \
+-	       $(DESTDIR)$(infodir)/units.info @UDAT@definitions.units \
+-	       @UDAT@currency.units \
++	       $(DESTDIR)$(infodir)/units.info $(DESTDIR)@UDAT@definitions.units \
++	       $(DESTDIR)@UDAT@currency.units \
+ 	@if test -f $(DESTDIR)$(infodir)/dir; then \
+ 	  echo You may need to remove units.info from $(DESTDIR)$(infodir)/dir; \
+ 	else true; fi
diff --git a/academic/units/units.SlackBuild b/academic/units/units.SlackBuild
index 19b4d779dd..cc4052b417 100644
--- a/academic/units/units.SlackBuild
+++ b/academic/units/units.SlackBuild
@@ -26,7 +26,7 @@
 
 PRGNAM=units
 VERSION=2.00
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -62,11 +62,13 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
+patch -p1 < $CWD/destdir-fix.patch
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -76,7 +78,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --mandir=/usr/man \
   --infodir=/usr/info \
   --localstatedir=/var \
-  --datadir=/usr/share/units \
+  --datadir=/usr/share \
   --build=$ARCH-slackware-linux
 
 make
-- 
cgit v1.2.3