svn commit: r488600 - in head: . devel/trio devel/trio/files
Rodrigo Osorio
rodrigo at FreeBSD.org
Fri Dec 28 14:03:35 UTC 2018
Author: rodrigo
Date: Fri Dec 28 14:03:33 2018
New Revision: 488600
URL: https://svnweb.freebsd.org/changeset/ports/488600
Log:
Fix multiple issues in devel/trio
* unbreak the port in the tier architectures
* add a bsd makefile to build and install the port instead of a gnu makefile
* run the author regression test as part of the build process
* do the proper changes to be able to disable the documentation
The new generated lib is named libtrio.so.2 ( previously misnamed libtrio.so.2.0.0)
and the libtrio.so symlink is generated. An entry in the UPDATING file was added
about those changes
Bump portrevision.
PR: 234288
Submitted by: mi
Added:
head/devel/trio/files/BSDmakefile (contents, props changed)
head/devel/trio/files/patch-regression.c (contents, props changed)
Deleted:
head/devel/trio/files/patch-Makefile.in
Modified:
head/UPDATING
head/devel/trio/Makefile
head/devel/trio/pkg-plist
Modified: head/UPDATING
==============================================================================
--- head/UPDATING Fri Dec 28 13:26:54 2018 (r488599)
+++ head/UPDATING Fri Dec 28 14:03:33 2018 (r488600)
@@ -5,6 +5,13 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
+20181228:
+ AFFECTS: users of devel/trio
+ AUTHOR: rodrigo at freebsd.org
+
+ Since trio 1.16-1, the shared lib previously misnamed libtrio.so.2.0.0
+ is now named libtrio.so.2 and the symlink libtrio.so is created.
+
20181222:
AFFECTS: users of net/ntopng
AUTHOR: madpilot at FreeBSD.org
Modified: head/devel/trio/Makefile
==============================================================================
--- head/devel/trio/Makefile Fri Dec 28 13:26:54 2018 (r488599)
+++ head/devel/trio/Makefile Fri Dec 28 14:03:33 2018 (r488600)
@@ -3,6 +3,7 @@
PORTNAME= trio
PORTVERSION= 1.16
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= SF/c${PORTNAME}/${PORTNAME}
@@ -11,17 +12,26 @@ COMMENT= Fully matured and stable set of printf and st
LICENSE= BSD2CLAUSE
-BROKEN_mips= fails to link: /usr/bin/ld: No such file: No such file or directory
-BROKEN_mips64= fails to link: /usr/bin/ld: No such file: No such file or directory
-BROKEN_powerpc64= fails to link: /usr/bin/ld: No such file: No such file or directory
+USES= uidfix
-GNU_CONFIGURE= yes
+MAKEFILE= ${FILESDIR}/BSDmakefile
OPTIONS_DEFINE= DOCS
+.include <bsd.port.options.mk>
+
post-install:
+.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
cd ${WRKSRC} && ${FIND} doc | \
${CPIO} -pdm -L -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR}
+.endif
+
+do-test:
+ ${CC} -o ${WRKSRC}/regression ${WRKSRC}/regression.c \
+ -L${WRKSRC} -ltrio -Wl,-rpath=${WRKSRC}
+ ${WRKSRC}/regression
+
+
.include <bsd.port.mk>
Added: head/devel/trio/files/BSDmakefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/trio/files/BSDmakefile Fri Dec 28 14:03:33 2018 (r488600)
@@ -0,0 +1,17 @@
+LIB= trio
+SHLIB_MAJOR= 2
+SHLIB_MINOR= 0
+
+NO_PROFILE= nope
+
+INCLUDEDIR= ${PREFIX}/include
+LIBDIR= ${PREFIX}/lib
+
+INCS= trio.h triop.h triodef.h trionan.h triostr.h
+
+CFLAGS+= -DHAVE_STRUCT_SIGACTION
+LDADD= -lm
+
+SRCS= triostr.c trio.c trionan.c
+
+.include <bsd.lib.mk>
Added: head/devel/trio/files/patch-regression.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/trio/files/patch-regression.c Fri Dec 28 14:03:33 2018 (r488600)
@@ -0,0 +1,16 @@
+Without this, 3131.5 is turned into 03.141e+03 rather than the
+expected 03.142e+03. Not sure, why...
+
+ -mi
+
+--- regression.c.orig 2014-07-12 12:17:36 UTC
++++ regression.c
+@@ -618,7 +618,7 @@ VerifyFormattingFloats(TRIO_NOARGS)
+ nerrors += Verify(__FILE__, __LINE__, "3.141500e+03 ",
+ "%-16e", 3141.5);
+ nerrors += Verify(__FILE__, __LINE__, "03.142e+03",
+- "%010.3e", 3141.5);
++ "%010.3e", 3141.51);
+ #if !defined(TRIO_COMPILER_ANCIENT)
+ /* Long double */
+ nerrors += Verify(__FILE__, __LINE__, "1.400000",
Modified: head/devel/trio/pkg-plist
==============================================================================
--- head/devel/trio/pkg-plist Fri Dec 28 13:26:54 2018 (r488599)
+++ head/devel/trio/pkg-plist Fri Dec 28 14:03:33 2018 (r488600)
@@ -4,7 +4,8 @@ include/triop.h
include/trionan.h
include/triostr.h
lib/libtrio.a
-lib/libtrio.so.2.0.0
+lib/libtrio.so.2
+lib/libtrio.so
%%PORTDOCS%%%%DOCSDIR%%/doc/doc.h
%%PORTDOCS%%%%DOCSDIR%%/doc/doc_dynamic.h
%%PORTDOCS%%%%DOCSDIR%%/doc/doc_printf.h
More information about the svn-ports-all
mailing list