View | Details | Raw Unified | Return to bug 218612
Collapse All | Expand All

(-)Makefile (-4 / +26 lines)
Lines 1-9 Link Here
1
# $FreeBSD$
1
# $FreeBSD$
2
2
3
PORTNAME=	amath
3
PORTNAME=	amath
4
PORTVERSION=	1.7.0
4
PORTVERSION=	1.8.0
5
CATEGORIES=	math
5
CATEGORIES=	math
6
MASTER_SITES=	http://suyai.innolan.net/
6
MASTER_SITES=	http://suyai.innolan.net/ \
7
		https://amath.innolan.net/
7
8
8
MAINTAINER=	cs@innolan.dk
9
MAINTAINER=	cs@innolan.dk
9
COMMENT=	Simple command line calculator
10
COMMENT=	Simple command line calculator
Lines 11-28 Link Here
11
LICENSE=	BSD2CLAUSE
12
LICENSE=	BSD2CLAUSE
12
LICENSE_FILE=	${WRKSRC}/LICENSE
13
LICENSE_FILE=	${WRKSRC}/LICENSE
13
14
15
OPTIONS_DEFINE=	TESTS
16
TESTS_DESC=	Build with regression tests
17
OPTIONS_RADIO=	LIBM
18
OPTIONS_RADIO_LIBM=	APPLIBM OPENLIBM SYSLIBM
19
LIBM_DESC=	Math libraries
20
APPLIBM_DESC=	Build and install application libraries
21
OPENLIBM_DESC=	Build with OpenLibm
22
SYSLIBM_DESC=	System (-lm)
23
OPTIONS_DEFAULT=	APPLIBM TESTS
24
OPTIONS_SUB=	yes
25
26
SYSLIBM_CONFIGURE_WITH=	libm
27
OPENLIBM_CONFIGURE_WITH=	openlibm
28
OPENLIBM_LIB_DEPENDS=	libopenlibm.so:math/openlibm
29
TESTS_CONFIGURE_ENABLE=	test
30
14
USES=		gmake
31
USES=		gmake
15
HAS_CONFIGURE=	yes
32
HAS_CONFIGURE=	yes
16
CONFIGURE_ARGS=	--prefix=${PREFIX} --pkgconfig=libdata/pkgconfig
33
CONFIGURE_ARGS=	--prefix=${PREFIX} --pkgconfig=libdata/pkgconfig \
34
		--mandir=man LDFLAGS="-L${LOCALBASE}/lib"
17
USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
35
USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}
18
MAKE_ARGS=	CC=${CC} CXX=${CXX}
36
MAKE_ARGS=	CC=${CC} CXX=${CXX}
19
ALL_TARGET=	static
37
ALL_TARGET=	static
20
TEST_TARGET=	test
38
TEST_TARGET=	test
21
39
22
post-install:
40
post-install-APPLIBM-on:
23
	${LN} -sf libamathapp.so ${STAGEDIR}${PREFIX}/lib/amath/libamathapp.so.1
41
	${LN} -sf libamathapp.so ${STAGEDIR}${PREFIX}/lib/amath/libamathapp.so.1
24
	${LN} -sf libamathcplex.so ${STAGEDIR}${PREFIX}/lib/amath/libamathcplex.so.1
42
	${LN} -sf libamathcplex.so ${STAGEDIR}${PREFIX}/lib/amath/libamathcplex.so.1
25
	${LN} -sf libamathc.so ${STAGEDIR}${PREFIX}/lib/amath/libamathc.so.1
43
	${LN} -sf libamathc.so ${STAGEDIR}${PREFIX}/lib/amath/libamathc.so.1
26
	${LN} -sf libamath.so ${STAGEDIR}${PREFIX}/lib/amath/libamath.so.1
44
	${LN} -sf libamath.so ${STAGEDIR}${PREFIX}/lib/amath/libamath.so.1
27
45
46
do-install-APPLIBM-off:
47
	${INSTALL_PROGRAM} ${WRKSRC}/amath ${STAGEDIR}${PREFIX}/bin/
48
	${INSTALL_MAN} ${WRKSRC}/amath.1 ${STAGEDIR}${PREFIX}/man/man1/
49
28
.include <bsd.port.mk>
50
.include <bsd.port.mk>
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1489273516
1
TIMESTAMP = 1492032535
2
SHA256 (amath-1.7.0.tar.gz) = 7ee5271e67a0091061b30658437080360a6e81f7e019e34d70ef739009ccca8a
2
SHA256 (amath-1.8.0.tar.gz) = 63a32ac5512fac5421147c04f2fd500dc7b63c209706f225cfbf28ff90da6b0d
3
SIZE (amath-1.7.0.tar.gz) = 301232
3
SIZE (amath-1.8.0.tar.gz) = 258709
(-)files/patch-configure (-114 / +19 lines)
Lines 1-115 Link Here
1
--- configure.orig	2017-03-11 22:56:45 UTC
1
--- configure.orig	2017-04-03 12:17:53 UTC
2
+++ configure
2
+++ configure
3
@@ -567,7 +567,7 @@ echo "	\${MKDIR} static"
3
@@ -465,8 +465,6 @@ catanh.c
4
 echo "	\${MKDIR} shared"
4
 ccos.c
5
 echo
5
 ccosh.c
6
 echo "\${solib}:	build ${files2}"
6
 cexp.c
7
-echo "	\${CXX} \${CXXFLAGS} -shared ${exestrip} -fPIC -Wl,-soname,\${solib}.${version} -o \${solib} ${files2}"
7
-clog.c
8
+echo "	\${CXX} \${CXXFLAGS} -shared ${exestrip} -fPIC -Wl,-soname,\${solib} -o \${solib} ${files2}"
8
-cpow.c
9
 echo
9
 csin.c
10
 echo "\${alib}:	build ${files}"
10
 csinh.c
11
 echo "	\${AR} rcs static/\${alib} ${files}"
11
 csqrt.c
12
@@ -589,7 +589,6 @@ echo "	\${INSTALL} nnumb.h \${INSTDIRI}/
12
@@ -485,6 +483,8 @@ ccot.c
13
 echo "	\${INSTALL} ntext.h \${INSTDIRI}/ntext.h"
13
 ccoth.c
14
 echo "	\${INSTALL} numb.h \${INSTDIRI}/numb.h"
14
 ccsc.c
15
 echo "	\${INSTALL} real.h \${INSTDIRI}/real.h"
15
 ccsch.c
16
-echo "	\${LDCONFIG} \${INSTDIR}"
16
+clog.c
17
 echo
17
+cpow.c
18
 echo ".PHONY:	uninstall"
18
 clogb.c
19
 echo "uninstall:"
19
 clog10.c
20
@@ -626,7 +625,7 @@ echo "PREFIX    = ${prefix}"
20
 csec.c
21
 echo "INSTDIR   = \${DESTDIR}\${PREFIX}/lib/amath"
22
 echo "INSTDIRI  = \${DESTDIR}\${PREFIX}/include/amath"
23
 echo "INSTDIRPC = \${DESTDIR}\${PREFIX}/${pkgconfigdir}"
24
-echo "INSTDIRM  = \${DESTDIR}\${PREFIX}/share/man/man3"
25
+echo "INSTDIRM  = \${DESTDIR}\${PREFIX}/man/man3"
26
 echo "alib      = lib${amathc}.a"
27
 echo "solib     = lib${amathc}.so"
28
 echo "pkgconfig = amathc.pc"
29
@@ -660,7 +659,7 @@ echo "	\${MKDIR} static"
30
 echo "	\${MKDIR} shared"
31
 echo
32
 echo "\${solib}:	build ${libcs}"
33
-echo "	\${CC} \${CFLAGS} -shared ${exestrip} -fPIC -Wl,-soname,\${solib}.${version} -o \${solib} ${libcs} -lc"
34
+echo "	\${CC} \${CFLAGS} -shared ${exestrip} -fPIC -Wl,-soname,\${solib} -o \${solib} ${libcs} -lc"
35
 echo
36
 echo "\${alib}:	build ${libc}"
37
 echo "	\${AR} rcs static/\${alib} ${libc}"
38
@@ -677,7 +676,6 @@ echo "	\${INSTALL} \${pkgconfig} \${INST
39
 echo "	\${INSTALL} \${manpage} \${INSTDIRM}/\${manpage}"
40
 echo "	\${INSTALL} ../amath.h \${INSTDIRI}"
41
 echo "	\${INSTALL} ../amathc.h \${INSTDIRI}"
42
-echo "	\${LDCONFIG} \${INSTDIR}"
43
 echo
44
 echo ".PHONY:	uninstall"
45
 echo "uninstall:"
46
@@ -710,7 +708,7 @@ echo "PREFIX    = ${prefix}"
47
 echo "INSTDIR   = \${DESTDIR}\${PREFIX}/lib/amath"
48
 echo "INSTDIRI  = \${DESTDIR}\${PREFIX}/include/amath"
49
 echo "INSTDIRPC = \${DESTDIR}\${PREFIX}/${pkgconfigdir}"
50
-echo "INSTDIRM  = \${DESTDIR}\${PREFIX}/share/man/man3"
51
+echo "INSTDIRM  = \${DESTDIR}\${PREFIX}/man/man3"
52
 echo "alib      = lib${amath}.a"
53
 echo "solib     = lib${amath}.so"
54
 echo "pkgconfig = amathr.pc"
55
@@ -744,7 +742,7 @@ echo "	\${MKDIR} static"
56
 echo "	\${MKDIR} shared"
57
 echo
58
 echo "\${solib}:	build ${libamaths}"
59
-echo "	\${CC} \${CFLAGS} -shared ${exestrip} -fPIC -Wl,-soname,\${solib}.${version} -o \${solib} ${libamaths}"
60
+echo "	\${CC} \${CFLAGS} -shared ${exestrip} -fPIC -Wl,-soname,\${solib} -o \${solib} ${libamaths}"
61
 echo
62
 echo "\${alib}:	build ${libamath}"
63
 echo "	\${AR} rcs static/\${alib} ${libamath}"
64
@@ -760,7 +758,6 @@ echo "	\${INSTALL} \${solib} \${INSTDIR}
65
 echo "	\${INSTALL} \${pkgconfig} \${INSTDIRPC}/\${pkgconfig}"
66
 echo "	\${INSTALL} \${manpage} \${INSTDIRM}/\${manpage}"
67
 echo "	\${INSTALL} ../math.h \${INSTDIRI}/amathr.h"
68
-echo "	\${LDCONFIG} \${INSTDIR}"
69
 echo
70
 echo ".PHONY:	uninstall"
71
 echo "uninstall:"
72
@@ -791,7 +788,7 @@ echo "PREFIX    = ${prefix}"
73
 echo "INSTDIR   = \${DESTDIR}\${PREFIX}/lib/amath"
74
 echo "INSTDIRI  = \${DESTDIR}\${PREFIX}/include/amath"
75
 echo "INSTDIRPC = \${DESTDIR}\${PREFIX}/${pkgconfigdir}"
76
-echo "INSTDIRM  = \${DESTDIR}\${PREFIX}/share/man/man3"
77
+echo "INSTDIRM  = \${DESTDIR}\${PREFIX}/man/man3"
78
 echo "alib      = lib${amathcplex}.a"
79
 echo "solib     = lib${amathcplex}.so"
80
 echo "pkgconfig = amathi.pc"
81
@@ -825,7 +822,7 @@ echo "	\${MKDIR} static"
82
 echo "	\${MKDIR} shared"
83
 echo
84
 echo "\${solib}:	build ${libcomplexs}"
85
-echo "	\${CC} \${CFLAGS} -shared ${exestrip} -fPIC -Wl,-soname,\${solib}.${version} -o \${solib} ${libcomplexs}"
86
+echo "	\${CC} \${CFLAGS} -shared ${exestrip} -fPIC -Wl,-soname,\${solib} -o \${solib} ${libcomplexs}"
87
 echo
88
 echo "\${alib}:	build ${libcomplex}"
89
 echo "	\${AR} rcs static/\${alib} ${libcomplex}"
90
@@ -841,7 +838,6 @@ echo "	\${INSTALL} \${solib} \${INSTDIR}
91
 echo "	\${INSTALL} \${pkgconfig} \${INSTDIRPC}/\${pkgconfig}"
92
 echo "	\${INSTALL} \${manpage} \${INSTDIRM}/\${manpage}"
93
 echo "	\${INSTALL} ../complex.h \${INSTDIRI}/amathi.h"
94
-echo "	\${LDCONFIG} \${INSTDIR}"
95
 echo
96
 echo ".PHONY: uninstall"
97
 echo "uninstall:"
98
@@ -878,7 +874,7 @@ echo "INSTALLP = install -m 0755"
99
 echo "INSTALLM = install -m 0644"
100
 echo "PREFIX   = ${prefix}"
101
 echo "INSTDIRP  = \${DESTDIR}\${PREFIX}/bin"
102
-echo "INSTDIRM  = \${DESTDIR}\${PREFIX}/share/man/man1"
103
+echo "INSTDIRM  = \${DESTDIR}\${PREFIX}/man/man1"
104
 echo
105
 echo "all:	shared-app"
106
 echo "app:	${appmain} ${appfunction} ${appstatement} ${appsystem}"
107
@@ -953,7 +949,7 @@ echo "	LD_LIBRARY_PATH=src/clib/:src/lib
108
 echo "	./amath test"
109
 echo
110
 echo ".PHONY: install"
111
-echo "install: shared-app"
112
+echo "install:"
113
 echo "	cd src/lib && \${MAKE} install"
114
 echo "	cd src/clib && \${MAKE} install"
115
 echo "	cd src/real && \${MAKE} install"
(-)pkg-plist (-31 / +33 lines)
Lines 1-33 Link Here
1
bin/amath
1
bin/amath
2
include/amath/aengine.h
2
%%APPLIBM%%include/amath/aengine.h
3
include/amath/amath.h
3
%%APPLIBM%%include/amath/bigint.h
4
include/amath/amathc.h
4
%%APPLIBM%%include/amath/amath.h
5
include/amath/amathi.h
5
%%APPLIBM%%include/amath/amathc.h
6
include/amath/amathr.h
6
%%APPLIBM%%include/amath/mathi.h
7
include/amath/charbuf.h
7
%%APPLIBM%%include/amath/mathr.h
8
include/amath/cplex.h
8
%%APPLIBM%%include/amath/charbuf.h
9
include/amath/integer.h
9
%%APPLIBM%%include/amath/cplex.h
10
include/amath/nnumb.h
10
%%APPLIBM%%include/amath/nnumb.h
11
include/amath/ntext.h
11
%%APPLIBM%%include/amath/ntext.h
12
include/amath/numb.h
12
%%APPLIBM%%include/amath/ntextd.h
13
include/amath/real.h
13
%%APPLIBM%%include/amath/ntextp.h
14
lib/amath/libamath.a
14
%%APPLIBM%%include/amath/numb.h
15
lib/amath/libamath.so
15
%%APPLIBM%%include/amath/real.h
16
lib/amath/libamath.so.1
16
%%APPLIBM%%lib/amath/libamath.a
17
lib/amath/libamathapp.a
17
%%APPLIBM%%lib/amath/libamath.so
18
lib/amath/libamathapp.so
18
%%APPLIBM%%lib/amath/libamath.so.1
19
lib/amath/libamathapp.so.1
19
%%APPLIBM%%lib/amath/libamathapp.a
20
lib/amath/libamathc.a
20
%%APPLIBM%%lib/amath/libamathapp.so
21
lib/amath/libamathc.so
21
%%APPLIBM%%lib/amath/libamathapp.so.1
22
lib/amath/libamathc.so.1
22
%%APPLIBM%%lib/amath/libamathc.a
23
lib/amath/libamathcplex.a
23
%%APPLIBM%%lib/amath/libamathc.so
24
lib/amath/libamathcplex.so
24
%%APPLIBM%%lib/amath/libamathc.so.1
25
lib/amath/libamathcplex.so.1
25
%%APPLIBM%%lib/amath/libamathcplex.a
26
libdata/pkgconfig/amatha.pc
26
%%APPLIBM%%lib/amath/libamathcplex.so
27
libdata/pkgconfig/amathc.pc
27
%%APPLIBM%%lib/amath/libamathcplex.so.1
28
libdata/pkgconfig/amathi.pc
28
%%APPLIBM%%libdata/pkgconfig/amatha.pc
29
libdata/pkgconfig/amathr.pc
29
%%APPLIBM%%libdata/pkgconfig/amathc.pc
30
%%APPLIBM%%libdata/pkgconfig/amathi.pc
31
%%APPLIBM%%libdata/pkgconfig/amathr.pc
30
man/man1/amath.1.gz
32
man/man1/amath.1.gz
31
man/man3/amathc.3.gz
33
%%APPLIBM%%man/man3/amathc.3.gz
32
man/man3/amathi.3.gz
34
%%APPLIBM%%man/man3/amathi.3.gz
33
man/man3/amathr.3.gz
35
%%APPLIBM%%man/man3/amathr.3.gz

Return to bug 218612