From 3b645af29ddf9763d295f798be4eceaf5158c124 Mon Sep 17 00:00:00 2001 From: Yuri Victorovich Date: Sun, 5 Aug 2018 00:44:37 +0000 Subject: [PATCH] math/triangle: Install the header; build and install the shared library Reason: other packages expect headers/library. Other port changes: * Order the USExx section * Simplify the test target * Change WWW to https --- math/triangle/Makefile | 24 +++++++++++++++--------- math/triangle/pkg-descr | 2 +- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/math/triangle/Makefile b/math/triangle/Makefile index 123a4c427439..81ed26a3ff4a 100644 --- a/math/triangle/Makefile +++ b/math/triangle/Makefile @@ -3,7 +3,7 @@ PORTNAME= triangle PORTVERSION= 1.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= NL/voronoi DISTNAME= ${PORTNAME} @@ -14,19 +14,25 @@ COMMENT= Two-Dimensional Quality Mesh Generator and Delaunay Triangulator NO_CDROM= No commercial use without prior arrangement with the author -NO_WRKSUBDIR= yes USES= zip -USE_XORG= x11 +NO_WRKSUBDIR= yes MAKEFILE= makefile +USE_XORG= x11 +USE_LDCONFIG= yes -PLIST_FILES= bin/triangle bin/showme +PLIST_FILES= bin/${PORTNAME} bin/showme \ + include/${PORTNAME}.h \ + lib/lib${PORTNAME}.so + +post-build: + @cd ${WRKSRC} && ${CC} ${CFLAGS} ${LDFLAGS} -shared -fPIC -o lib${PORTNAME}.so ${PORTNAME}.c do-install: - ${INSTALL_PROGRAM} ${PLIST_FILES:S|^bin|${WRKSRC}|} ${STAGEDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${WRKSRC}/showme ${STAGEDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.h ${STAGEDIR}${PREFIX}/include + ${INSTALL_DATA} ${WRKSRC}/lib${PORTNAME}.so ${STAGEDIR}${PREFIX}/lib -.if defined(MAINTAINER_MODE) -test: build - (cd ${INSTALL_WRKSRC} && ./triangle -p A.poly && ./showme A.1.poly) -.endif +do-test: build + @cd ${INSTALL_WRKSRC} && ./${PORTNAME} -p A.poly && ./showme A.1.poly .include diff --git a/math/triangle/pkg-descr b/math/triangle/pkg-descr index 7a8d3d7dd95d..28ae533d624a 100644 --- a/math/triangle/pkg-descr +++ b/math/triangle/pkg-descr @@ -8,4 +8,4 @@ especially those generated by Triangle, my two-dimensional quality mesh generator and Delaunay triangulator. Show Me can also write PostScript images to files. -WWW: http://www.cs.cmu.edu/~quake/triangle.html +WWW: https://www.cs.cmu.edu/~quake/triangle.html