From fea95026bc5ac94e25cb6ca6979d805b25d7e5a0 Mon Sep 17 00:00:00 2001 From: Wen Heping Date: Wed, 28 Oct 2009 13:24:46 +0000 Subject: [PATCH] - Update to 2.1.9 PR: ports/139875 Submitted by: Sylvio Cesar Approved by: miwi,jadawin(mentors,implicit) --- science/udunits/Makefile | 15 ++------ science/udunits/distinfo | 6 ++-- science/udunits/files/patch-CUSTOMIZE | 12 ------- science/udunits/files/patch-configure | 13 ------- science/udunits/files/patch-lib_Makefile.in | 13 ------- science/udunits/files/patch-port_master.mk.in | 34 ------------------- science/udunits/pkg-plist | 25 ++++++++------ 7 files changed, 19 insertions(+), 99 deletions(-) delete mode 100644 science/udunits/files/patch-CUSTOMIZE delete mode 100644 science/udunits/files/patch-configure delete mode 100644 science/udunits/files/patch-lib_Makefile.in delete mode 100644 science/udunits/files/patch-port_master.mk.in diff --git a/science/udunits/Makefile b/science/udunits/Makefile index 7fb7e8e4ad51..fb49c10e647b 100644 --- a/science/udunits/Makefile +++ b/science/udunits/Makefile @@ -6,7 +6,7 @@ # PORTNAME= udunits -PORTVERSION= 1.12.9 +PORTVERSION= 2.1.9 CATEGORIES= science math MASTER_SITES= ftp://ftp.unidata.ucar.edu/pub/${PORTNAME}/ \ ${MASTER_SITE_LOCAL:S|%SUBDIR%|glewis/udunits|} @@ -14,21 +14,10 @@ MASTER_SITES= ftp://ftp.unidata.ucar.edu/pub/${PORTNAME}/ \ MAINTAINER= ports@FreeBSD.org COMMENT= A library for manipulating units of physical quantities -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/src GNU_CONFIGURE= yes USE_PERL5= yes +USE_LDCONFIG= yes MAKE_JOBS_UNSAFE= yes - CFLAGS+= -fPIC -MAN1= udunits.1 \ - udunitsperl.1 -MAN3= udunits.3 \ - udunits.3f - -post-build: - ${REINPLACE_CMD} -e 's: doc_[^_]*_install::' \ - -e 's: doc_install::' \ - "${WRKSRC}/perl/Makefile" - .include diff --git a/science/udunits/distinfo b/science/udunits/distinfo index e123b3920aaa..91755c390188 100644 --- a/science/udunits/distinfo +++ b/science/udunits/distinfo @@ -1,3 +1,3 @@ -MD5 (udunits-1.12.9.tar.gz) = 2bf4ba7a92e4c45b9e6003a295ca4e65 -SHA256 (udunits-1.12.9.tar.gz) = a53b95d754e7c8a769ab889844e83b03739814084b903c9d734ee98fd274722e -SIZE (udunits-1.12.9.tar.gz) = 239016 +MD5 (udunits-2.1.9.tar.gz) = b1eafe8854f1c94c52ede253c5cdb017 +SHA256 (udunits-2.1.9.tar.gz) = 50cc4687d589c36a23a5069efa73e47a90c8e093326c2bd28844a421d1613780 +SIZE (udunits-2.1.9.tar.gz) = 1033486 diff --git a/science/udunits/files/patch-CUSTOMIZE b/science/udunits/files/patch-CUSTOMIZE deleted file mode 100644 index 496bee316716..000000000000 --- a/science/udunits/files/patch-CUSTOMIZE +++ /dev/null @@ -1,12 +0,0 @@ -$FreeBSD$ - ---- CUSTOMIZE.orig 2004-05-08 14:04:53.199958510 -0700 -+++ CUSTOMIZE 2004-05-08 13:58:48.843900138 -0700 -@@ -33,3 +33,7 @@ - # Ancillary libraries. SunOS 4 user's might need something like the - # following in order to resolve strerror() in the perl/ subdirectory. - # LIBS='-L/usr/lang/SC3.0.1/lib -lansi' -+ -+FC=g77 -+CPPFLAGS=-Df2cFortran -+LD_MATH=-lm diff --git a/science/udunits/files/patch-configure b/science/udunits/files/patch-configure deleted file mode 100644 index 0653a69c52e8..000000000000 --- a/science/udunits/files/patch-configure +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- configure.orig Sat Jan 1 00:30:00 2005 -+++ configure Sat Jan 1 00:30:39 2005 -@@ -4648,7 +4648,7 @@ - exit(0); - } - EOF -- doit='$CC -o conftest ${CFLAGS-} ${CPPFLAGS-} ${LDFLAGS-} conftest.c ${LIBS-}' -+ doit='$CC -o conftest ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} conftest.c ${LIBS}' - if { (eval echo "$as_me:$LINENO: \"$doit\"") >&5 - (eval $doit) 2>&5 - ac_status=$? diff --git a/science/udunits/files/patch-lib_Makefile.in b/science/udunits/files/patch-lib_Makefile.in deleted file mode 100644 index bba74e99c9c3..000000000000 --- a/science/udunits/files/patch-lib_Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -$FreeBSD$ - ---- lib/Makefile.in.orig Sat Jan 1 00:03:38 2005 -+++ lib/Makefile.in Sat Jan 1 00:04:39 2005 -@@ -6,7 +6,7 @@ - - LIBRARY = udunits - --FLEX = /usr/local/gnu/bin/flex -+FLEX = /usr/bin/flex - cpp_path = -DUT_DEFAULT_PATH='"$(prefix)/etc/udunits.dat"' - CPPFLAGS = -I../port/misc -I../port/cfortran $(cpp_path) @CPPFLAGS@ - CFLAGS = @CFLAGS@ diff --git a/science/udunits/files/patch-port_master.mk.in b/science/udunits/files/patch-port_master.mk.in deleted file mode 100644 index 0c60f67e0b7a..000000000000 --- a/science/udunits/files/patch-port_master.mk.in +++ /dev/null @@ -1,34 +0,0 @@ -$FreeBSD$ - ---- port/master.mk.in.orig Tue Sep 30 12:39:28 2003 -+++ port/master.mk.in Mon Jan 3 10:38:26 2005 -@@ -433,21 +433,6 @@ - -e '/^\.TH/s/$$D\ate: \([0-9]*\)\/\([0-9]*\)\/\([0-9]*\).*\$$/\1-\2-\3/'\ - $(MANUAL) | $(TBL) | $(NEQN) > $@;; \ - esac -- extension=`echo $(MANUAL) | sed 's/[^.]*\.//'`; \ -- subchapter=`echo $$extension | sed 's/.//'`; \ -- case "$$subchapter" in \ -- '') ;; \ -- *) chapter=`echo $$extension | sed 's/\(.\).*/\1/'`; \ -- if test -d $(MANDIR)$$subchapter; then \ -- : true; \ -- else \ -- mkdir $(MANDIR)$$subchapter; \ -- fi; \ -- rm -f $(MANDIR)$$subchapter/$(MANUAL); \ -- ln -s ../`basename $(MANDIR)`/$(MANUAL) \ -- $(MANDIR)$$subchapter/$(MANUAL); \ -- ;; \ -- esac - - dummy_mandir $(MANDIR): - mkdir -p $@ -@@ -455,7 +440,6 @@ - - whatis: $(MANDIR)/$(WHATIS) - $(MANDIR)/$(WHATIS): $(MANDIR) -- $(MAKEWHATIS_CMD) - - - ############################################################################ diff --git a/science/udunits/pkg-plist b/science/udunits/pkg-plist index 2dab1c3aa019..89eafcf1b06f 100644 --- a/science/udunits/pkg-plist +++ b/science/udunits/pkg-plist @@ -1,12 +1,15 @@ -bin/udunits -etc/udunits.dat +bin/udunits2 +include/converter.h include/udunits.h -include/udunits.inc -lib/libudport.a -lib/libudunits.a -%%SITE_PERL%%/%%PERL_ARCH%%/UDUNITS.pm -%%SITE_PERL%%/%%PERL_ARCH%%/auto/UDUNITS/.packlist -%%SITE_PERL%%/%%PERL_ARCH%%/auto/UDUNITS/UDUNITS.bs -%%SITE_PERL%%/%%PERL_ARCH%%/auto/UDUNITS/UDUNITS.so -%%SITE_PERL%%/%%PERL_ARCH%%/auto/UDUNITS/autosplit.ix -@dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/UDUNITS +include/udunits2.h +lib/libudunits2.a +lib/libudunits2.la +lib/libudunits2.so +lib/libudunits2.so.0 +%%DATADIR%%/udunits2-accepted.xml +%%DATADIR%%/udunits2-base.xml +%%DATADIR%%/udunits2-common.xml +%%DATADIR%%/udunits2-derived.xml +%%DATADIR%%/udunits2-prefixes.xml +%%DATADIR%%/udunits2.xml +@dirrm %%DATADIR%%