On Thu, 17 Nov 2011 13:13:52 -0500 Brad <b...@comstyle.com> wrote: > On 17/11/11 12:54 PM, Remi Pointel wrote: > > Hi, > > > > this is the diff to update udunits to last release: 2.1.24. > > It activates regress tests also... > > > > Are you ok? > > > > Cheers, > > +- $(MAKE) $(AM_MAKEFLAGS) install-data-hook > ++ $(MAKE) $(AM_MAKEFLAGS) > > The patch you added is wrong as is. Remove the line all together.
Yes, of course... > Also AUTOCONF_VERSION/AUTOMAKE_VERSION should be removed and > CFLAGS from CONFIGURE_ENV. Are you ok with the diff attached? Cheers, Remi.
Index: Makefile =================================================================== RCS file: /cvs/ports/math/udunits/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile 1 Jan 2011 16:58:08 -0000 1.7 +++ Makefile 17 Nov 2011 18:23:00 -0000 @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.7 2011/01/01 16:58:08 rpointel Exp $ COMMENT = library to manipulate units of physical quantities -DISTNAME = udunits-2.1.20 +DISTNAME = udunits-2.1.24 CATEGORIES = math HOMEPAGE = http://www.unidata.ucar.edu/software/udunits/ @@ -15,20 +15,16 @@ PERMIT_DISTFILES_FTP = Yes MASTER_SITES = ftp://ftp.unidata.ucar.edu/pub/udunits/ -SHARED_LIBS = udunits2 0.0 +SHARED_LIBS = udunits2 1.0 USE_LIBTOOL = Yes CONFIGURE_STYLE = gnu CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \ - CFLAGS="-std=c99 ${CFLAGS:C/ *$//} -I${LOCALBASE}/include -I${X11BASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" -# if need be... -AUTOCONF_VERSION = 2.63 -AUTOMAKE_VERSION = 1.11 - REGRESS_DEPENDS = devel/cunit +REGRESS_TARGET = check WANTLIB += c expat m .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /cvs/ports/math/udunits/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo 1 Jan 2011 16:58:08 -0000 1.4 +++ distinfo 17 Nov 2011 18:23:00 -0000 @@ -1,5 +1,5 @@ -MD5 (udunits-2.1.20.tar.gz) = 4ygq2MBV3s6dSHI9WNTUxQ== -RMD160 (udunits-2.1.20.tar.gz) = UBZOF5Rvqv5mKRQbnVsCgdkPj48= -SHA1 (udunits-2.1.20.tar.gz) = 4zSJqiKWTrMJa7ECnXo3Oha3Vs8= -SHA256 (udunits-2.1.20.tar.gz) = dOHsWLxcFV/FJFtRYVHnk3u9us/lKGDNtSVcQy1QMYE= -SIZE (udunits-2.1.20.tar.gz) = 1057888 +MD5 (udunits-2.1.24.tar.gz) = aYZUVyF0elEoXHZWRNzZ2A== +RMD160 (udunits-2.1.24.tar.gz) = FB12UzKBjAa2pLy9oXRz/eXNGFM= +SHA1 (udunits-2.1.24.tar.gz) = ZLu0uFIUb7XUdrr003ydZzz6Qvk= +SHA256 (udunits-2.1.24.tar.gz) = Ll+kWDAxsmQEpoFns4oRdzhySG88NC/d4eSMUqhuDtA= +SIZE (udunits-2.1.24.tar.gz) = 1059344 Index: patches/patch-lib_Makefile_in =================================================================== RCS file: patches/patch-lib_Makefile_in diff -N patches/patch-lib_Makefile_in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-lib_Makefile_in 17 Nov 2011 18:23:00 -0000 @@ -0,0 +1,12 @@ +$OpenBSD$ +does not install xml files twice +--- lib/Makefile.in.orig Mon Sep 12 22:52:32 2011 ++++ lib/Makefile.in Tue Nov 15 00:44:01 2011 +@@ -1040,7 +1040,6 @@ info-am: $(INFO_DEPS) + install-data-am: install-includeHEADERS install-info-am \ + install-pkgdataDATA + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-data-hook + install-dvi: install-dvi-recursive + + install-dvi-am: $(DVIS)
