summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--math/units/Makefile19
-rw-r--r--math/units/PLIST7
-rw-r--r--math/units/distinfo9
-rw-r--r--math/units/patches/patch-Makefile.in29
4 files changed, 48 insertions, 16 deletions
diff --git a/math/units/Makefile b/math/units/Makefile
index eb714c18a2e..d9dfb7b4a9e 100644
--- a/math/units/Makefile
+++ b/math/units/Makefile
@@ -1,29 +1,28 @@
-# $NetBSD: Makefile,v 1.5 2012/09/11 23:04:35 asau Exp $
+# $NetBSD: Makefile,v 1.6 2012/09/13 23:27:05 asau Exp $
-DISTNAME= units-1.86
-PKGREVISION= 2
+DISTNAME= units-2.00
CATEGORIES= math
MASTER_SITES= ${MASTER_SITE_GNU:=units/}
MAINTAINER= cameron@patrick.wattle.id.au
HOMEPAGE= http://www.gnu.org/software/units/
COMMENT= GNU Units - a calculator capable of performing unit conversions
-
-LICENSE= gnu-gpl-v2
-
-INFO_FILES= YES
-
-GNU_CONFIGURE= YES
+LICENSE= gnu-gpl-v3
.include "../../mk/bsd.prefs.mk"
-CONFIGURE_ARGS= --program-prefix=g
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS= --program-prefix=g
+INFO_FILES= yes
INSTALLATION_DIRS= gnu/bin
+REPLACE_PYTHON= units_cur
+
post-install:
set -e; cd ${DESTDIR}${PREFIX}/gnu/bin; \
ln -s ../../bin/gunits units
.include "../../devel/readline/buildlink3.mk"
+.include "../../lang/python/application.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/units/PLIST b/math/units/PLIST
index 033a9658b89..f839c32d26c 100644
--- a/math/units/PLIST
+++ b/math/units/PLIST
@@ -1,6 +1,9 @@
-@comment $NetBSD: PLIST,v 1.2 2012/05/29 18:33:34 cheusov Exp $
+@comment $NetBSD: PLIST,v 1.3 2012/09/13 23:27:05 asau Exp $
bin/gunits
+bin/gunits_cur
gnu/bin/units
info/units.info
man/man1/gunits.1
-share/units.dat
+share/units/currency.units
+share/units/definitions.units
+share/units/locale.map
diff --git a/math/units/distinfo b/math/units/distinfo
index b45ef9b2a70..6764127f029 100644
--- a/math/units/distinfo
+++ b/math/units/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2006/11/19 04:56:17 obache Exp $
+$NetBSD: distinfo,v 1.2 2012/09/13 23:27:05 asau Exp $
-SHA1 (units-1.86.tar.gz) = f6386d7fb476ffc808c6658af53a66f8f1027b1f
-RMD160 (units-1.86.tar.gz) = d54d8074445bbe60832301174544c40192a50dd7
-Size (units-1.86.tar.gz) = 232898 bytes
+SHA1 (units-2.00.tar.gz) = 6da9ea78ff0dc21bc43cf1809c530e61d9394ce0
+RMD160 (units-2.00.tar.gz) = 1a272a6dc6c38d0a3571205180146e25e3e0845c
+Size (units-2.00.tar.gz) = 653473 bytes
+SHA1 (patch-Makefile.in) = 1d2b0b7023e4be683a8fcfd3917cb5d1cd4617ec
diff --git a/math/units/patches/patch-Makefile.in b/math/units/patches/patch-Makefile.in
new file mode 100644
index 00000000000..416cffa036e
--- /dev/null
+++ b/math/units/patches/patch-Makefile.in
@@ -0,0 +1,29 @@
+$NetBSD: patch-Makefile.in,v 1.1 2012/09/13 23:27:05 asau Exp $
+
+--- Makefile.in.orig 2012-05-02 20:37:55.000000000 +0000
++++ Makefile.in
+@@ -31,6 +31,7 @@ CC = @CC@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ MAKEINFO = makeinfo
+ TEXI2DVI = texi2dvi
+ TEXI2PDF = texi2pdf
+@@ -84,11 +85,11 @@ units_cur_inst: units_cur
+ 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
+- $(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`
++ $(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_SCRIPT) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`
+
+ install: units@EXEEXT@ install-doc install-support
+ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir)