diff options
| -rw-r--r-- | academic/units/destdir-fix.patch | 29 | ||||
| -rw-r--r-- | academic/units/units.SlackBuild | 12 | ||||
| -rw-r--r-- | academic/units/units.info | 6 |
3 files changed, 10 insertions, 37 deletions
diff --git a/academic/units/destdir-fix.patch b/academic/units/destdir-fix.patch deleted file mode 100644 index b68e514eb4..0000000000 --- a/academic/units/destdir-fix.patch +++ /dev/null @@ -1,29 +0,0 @@ -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 cc4052b417..af071ad929 100644 --- a/academic/units/units.SlackBuild +++ b/academic/units/units.SlackBuild @@ -25,8 +25,8 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=units -VERSION=2.00 -BUILD=${BUILD:-2} +VERSION=${VERSION:-2.02} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} if [ -z "$ARCH" ]; then @@ -65,9 +65,11 @@ rm -rf $PRGNAM-$VERSION 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 +find -L . \ + \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ + -exec chmod 755 {} \; -o \ + \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ + -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ diff --git a/academic/units/units.info b/academic/units/units.info index 0b826c1b02..bb8971ef5b 100644 --- a/academic/units/units.info +++ b/academic/units/units.info @@ -1,8 +1,8 @@ PRGNAM="units" -VERSION="2.00" +VERSION="2.02" HOMEPAGE="http://www.gnu.org/software/units/" -DOWNLOAD="http://ftp.gnu.org/gnu/units/units-2.00.tar.gz" -MD5SUM="6d0518d493f9bab5aa318a3c7d0801b2" +DOWNLOAD="http://ftp.gnu.org/gnu/units/units-2.02.tar.gz" +MD5SUM="16b68a8437cb51da43f4cd267659e15e" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" |