www/aws: clean up package definitiondiff -r1.34 -r1.35 pkgsrc/www/aws/Makefile
(rillig)
@@ -1,73 +1,73 @@ | @@ -1,73 +1,73 @@ | |||
1 | # $NetBSD: Makefile,v 1.34 2020/05/01 07:10:19 rillig Exp $ | 1 | # $NetBSD: Makefile,v 1.35 2020/05/03 19:08:52 rillig Exp $ | |
2 | 2 | |||
3 | DISTNAME= aws-${AWS_VERSION} | 3 | DISTNAME= aws-${AWS_VERSION} | |
4 | PKGREVISION= 16 | 4 | PKGREVISION= 16 | |
5 | CATEGORIES= www | 5 | CATEGORIES= www | |
6 | MASTER_SITES= http://downloads.dragonlace.net/src/ | 6 | MASTER_SITES= http://downloads.dragonlace.net/src/ | |
7 | EXTRACT_SUFX= .tar.bz2 | 7 | EXTRACT_SUFX= .tar.bz2 | |
8 | 8 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 9 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://libre.adacore.com/libre/tools/aws/ | 10 | HOMEPAGE= http://libre.adacore.com/libre/tools/aws/ | |
11 | COMMENT= Adacore Ada Web Server and framework | 11 | COMMENT= Adacore Ada Web Server and framework | |
12 | LICENSE= gnu-gpl-v2 | 12 | LICENSE= gnu-gpl-v2 | |
13 | 13 | |||
14 | BROKEN= "sh: ../xoscons: not found" | 14 | BROKEN= "sh: ../xoscons: not found" | |
15 | 15 | |||
16 | AWS_VERSION= 3.1.0.0 | 16 | AWS_VERSION= 3.1.0.0 | |
17 | USE_TOOLS+= gmake makeinfo sed awk | 17 | USE_TOOLS+= gmake makeinfo sed awk | |
18 | USE_LANGUAGES= c ada c++ fortran | 18 | USE_LANGUAGES= c ada c++ fortran | |
19 | 19 | |||
20 | # Note: c++ and fortran aren't used, but gprconfig probes for them. | 20 | # Note: c++ and fortran aren't used, but gprconfig probes for them. | |
21 | # When that happens, pkgsrc wrapper emits a warning message which causes | 21 | # When that happens, pkgsrc wrapper emits a warning message which causes | |
22 | # gprconfig to crash due to output text not matching expected regexp | 22 | # gprconfig to crash due to output text not matching expected regexp | |
23 | # Adding c++ and fortran to USE_LANGUAGES avoids this issue. | 23 | # Adding c++ and fortran to USE_LANGUAGES avoids this issue. | |
24 | 24 | |||
25 | .include "options.mk" | 25 | .include "options.mk" | |
26 | 26 | |||
27 | MY_MAKE_ENV+= ADA_PROJECT_PATH=${PREFIX}/lib/gnat | 27 | MY_MAKE_ENV+= ADA_PROJECT_PATH=${PREFIX}/lib/gnat | |
28 | MY_MAKE_ENV+= AWK=awk | 28 | MY_MAKE_ENV+= AWK=awk | |
29 | MY_MAKE_ENV+= PATH=${PREFIX}/gcc5-aux/bin:${PATH} | 29 | MY_MAKE_ENV+= PATH=${PREFIX}/gcc5-aux/bin:${PATH:Q} | |
30 | MY_CONF_ENV+= PATH=${PREFIX}/gcc5-aux/bin:${PATH} | 30 | MY_CONF_ENV+= PATH=${PREFIX}/gcc5-aux/bin:${PATH:Q} | |
31 | CONFIGURE_ARGS+= LPATH=${BUILDLINK_PREFIX.openssl}/lib | 31 | CONFIGURE_ARGS+= LPATH=${BUILDLINK_PREFIX.openssl}/lib | |
32 | CONFIGURE_ARGS+= ZPATH=${BUILDLINK_PREFIX.zlib}/lib | 32 | CONFIGURE_ARGS+= ZPATH=${BUILDLINK_PREFIX.zlib}/lib | |
33 | 33 | |||
34 | # Link options were added for the aws library | 34 | # Link options were added for the aws library | |
35 | # "-R" option disables all rpaths except adalib and compiler libs. This is | 35 | # "-R" option disables all rpaths except adalib and compiler libs. This is | |
36 | # done because by default the rpaths will points at the WRKOBJDIR because | 36 | # done because by default the rpaths will points at the WRKOBJDIR because | |
37 | # it doesn't support the concept of DESTDIR. | 37 | # it doesn't support the concept of DESTDIR. | |
38 | # "-Wl,-R" adds a second rpath string. | 38 | # "-Wl,-R" adds a second rpath string. | |
39 | # -Wl,-rpath is a better choice, but synonym -Wl,-R works on all BSD and SunOS | 39 | # -Wl,-rpath is a better choice, but synonym -Wl,-R works on all BSD and SunOS | |
40 | SUBST_CLASSES+= rpath | 40 | SUBST_CLASSES+= rpath | |
41 | SUBST_STAGE.rpath= pre-configure | 41 | SUBST_STAGE.rpath= pre-configure | |
42 | SUBST_MESSAGE.rpath= Adjust rpaths of shared libraries | 42 | SUBST_MESSAGE.rpath= Adjust rpaths of shared libraries | |
43 | SUBST_FILES.rpath= src/src.gpr include/include.gpr | 43 | SUBST_FILES.rpath= src/src.gpr include/include.gpr | |
44 | SUBST_FILES.rpath+= demos/test_ldap/test_ldap.gpr tools/tools.gpr | 44 | SUBST_FILES.rpath+= demos/test_ldap/test_ldap.gpr tools/tools.gpr | |
45 | SUBST_VARS.rpath= ADDITIONAL_RPATH PREFIX | 45 | SUBST_VARS.rpath= ADDITIONAL_RPATH PREFIX | |
46 | SUBST_SED.rpath+= -e "s,@RFLAG@,${LINKER_RPATH_FLAG},g" | 46 | SUBST_SED.rpath+= -e s,@RFLAG@,${LINKER_RPATH_FLAG},g | |
47 | SUBST_SED.rpath+= -e "s,@SSL_RPATH@,${BUILDLINK_PREFIX.openssl}/lib,g" | 47 | SUBST_SED.rpath+= -e "s,@SSL_RPATH@,${BUILDLINK_PREFIX.openssl}/lib,g" | |
48 | ADDITIONAL_RPATH= ${PREFIX}/lib:${PREFIX}/lib/aws/relocatable | 48 | ADDITIONAL_RPATH= ${PREFIX}/lib:${PREFIX}/lib/aws/relocatable | |
49 | 49 | |||
50 | GENERATE_PLIST= cd ${DESTDIR}${PREFIX}; | 50 | GENERATE_PLIST= cd ${DESTDIR}${PREFIX}; | |
51 | GENERATE_PLIST+= ${FIND} * -type f | ${SORT}; | 51 | GENERATE_PLIST+= ${FIND} * -type f | ${SORT}; | |
52 | 52 | |||
53 | do-configure: | 53 | do-configure: | |
54 | cd ${WRKSRC} && ${SETENV} ${MY_CONF_ENV} \ | 54 | cd ${WRKSRC} && ${SETENV} ${MY_CONF_ENV} \ | |
55 | ${GMAKE} setup ${CONFIGURE_ARGS} | 55 | ${GMAKE} setup ${CONFIGURE_ARGS} | |
56 | 56 | |||
57 | do-build: | 57 | do-build: | |
58 | cd ${WRKSRC} && ${SETENV} ${MY_MAKE_ENV} \ | 58 | cd ${WRKSRC} && ${SETENV} ${MY_MAKE_ENV} \ | |
59 | ${GMAKE} build build_doc | 59 | ${GMAKE} build build_doc | |
60 | 60 | |||
61 | do-test: install | 61 | do-test: install | |
62 | cd ${WRKSRC}/regtests && ${SETENV} ${MY_MAKE_ENV} \ | 62 | cd ${WRKSRC}/regtests && ${SETENV} ${MY_MAKE_ENV} \ | |
63 | python${PYVERSSUFFIX} testsuite.py | 63 | python${PYVERSSUFFIX} testsuite.py | |
64 | 64 | |||
65 | do-install: | 65 | do-install: | |
66 | cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${GMAKE} install | 66 | cd ${WRKSRC} && ${SETENV} ${INSTALL_ENV} ${GMAKE} install | |
67 | 67 | |||
68 | .include "../../devel/zlib/buildlink3.mk" | 68 | .include "../../devel/zlib/buildlink3.mk" | |
69 | .include "../../lang/python/pyversion.mk" | 69 | .include "../../lang/python/pyversion.mk" | |
70 | .include "../../devel/gnatpython/buildlink3.mk" | 70 | .include "../../devel/gnatpython/buildlink3.mk" | |
71 | .include "../../textproc/xmlada/buildlink3.mk" | 71 | .include "../../textproc/xmlada/buildlink3.mk" | |
72 | .include "../../devel/gprbuild-aux/buildlink3.mk" | 72 | .include "../../devel/gprbuild-aux/buildlink3.mk" | |
73 | .include "../../mk/bsd.pkg.mk" | 73 | .include "../../mk/bsd.pkg.mk" |
@@ -1,102 +1,71 @@ | @@ -1,102 +1,71 @@ | |||
1 | # $NetBSD: options.mk,v 1.12 2020/05/01 07:10:19 rillig Exp $ | 1 | # $NetBSD: options.mk,v 1.13 2020/05/03 19:08:52 rillig Exp $ | |
2 | ||||
3 | 2 | |||
4 | # xmlada is built-in (not optional) due to gprbuild dependency | 3 | # xmlada is built-in (not optional) due to gprbuild dependency | |
5 | # zlib is built-in because it's mandatory. It even comes with AWS. | 4 | # zlib is built-in because it's mandatory. It even comes with AWS. | |
6 | # ASIS is not supported right now (custom build, requires part of GNAT) | 5 | # ASIS is not supported right now (custom build, requires part of GNAT) | |
7 | 6 | |||
8 | # The "ipv6" option effectively disabled IPv4 support, so it | 7 | # The "ipv6" option effectively disabled IPv4 support, so it | |
9 | # should not be switched on per default even on systems which | 8 | # should not be switched on per default even on systems which | |
10 | # support IPv6. For that reason, the option name is not "inet6". | 9 | # support IPv6. For that reason, the option name is not "inet6". | |
11 | 10 | |||
12 | PKG_OPTIONS_VAR= PKG_OPTIONS.aws | 11 | PKG_OPTIONS_VAR= PKG_OPTIONS.aws | |
13 | PKG_OPTIONS_OPTIONAL_GROUPS= slayer | 12 | PKG_OPTIONS_OPTIONAL_GROUPS= slayer | |
14 | PKG_OPTIONS_GROUP.slayer= ssl gnutls | 13 | PKG_OPTIONS_GROUP.slayer= ssl gnutls | |
15 | PKG_SUPPORTED_OPTIONS= ldap inet6 debug relocatable | 14 | PKG_SUPPORTED_OPTIONS= ldap inet6 debug relocatable | |
16 | PKG_SUGGESTED_OPTIONS= ssl | 15 | PKG_SUGGESTED_OPTIONS= ssl | |
17 | 16 | |||
18 | .include "../../mk/bsd.prefs.mk" | 17 | .include "../../mk/bsd.prefs.mk" | |
19 | .include "../../mk/bsd.options.mk" | 18 | .include "../../mk/bsd.options.mk" | |
20 | 19 | |||
21 | CONFIGURE_ARGS+= GCC=ada | 20 | CONFIGURE_ARGS+= GCC=ada | |
22 | CONFIGURE_ARGS+= PROCESSORS=${MAKE_JOBS} | 21 | CONFIGURE_ARGS+= PROCESSORS=${MAKE_JOBS} | |
23 | CONFIGURE_ARGS+= PYTHON=python${PYVERSSUFFIX} | 22 | CONFIGURE_ARGS+= PYTHON=python${PYVERSSUFFIX} | |
24 | CONFIGURE_ARGS+= XMLADA=true | 23 | CONFIGURE_ARGS+= XMLADA=true | |
25 | CONFIGURE_ARGS+= prefix=${PREFIX} | 24 | CONFIGURE_ARGS+= prefix=${PREFIX} | |
26 | DOTBUILD= release | |||
27 | 25 | |||
28 | # The system libgcc is from version 4.1 which doesn't include the symbol | 26 | # The system libgcc is from version 4.1 which doesn't include the symbol | |
29 | # _Unwind_GetIPInfo. If AWS uses the system zlib or if it's configured to use | 27 | # _Unwind_GetIPInfo. If AWS uses the system zlib or if it's configured to use | |
30 | # SSL the search path /usr/lib is inserted in the gnatmake/gprbuild | 28 | # SSL the search path /usr/lib is inserted in the gnatmake/gprbuild | |
31 | # instructions and the system libgcc.a is picked up instead of | 29 | # instructions and the system libgcc.a is picked up instead of | |
32 | # /usr/pkg/lib/libgcc.a. This is a bug confirmed by Adacore and an internal | 30 | # /usr/pkg/lib/libgcc.a. This is a bug confirmed by Adacore and an internal | |
33 | # bug report has been generated. In the meantime, this means AWS can't be | 31 | # bug report has been generated. In the meantime, this means AWS can't be | |
34 | # configured for HTTPS on NetBSD, and that zlib must be built from scratch on | 32 | # configured for HTTPS on NetBSD, and that zlib must be built from scratch on | |
35 | # NetBSD until NetBSD upgrades it's libgcc or until a new GNAT and GPRBuild | 33 | # NetBSD until NetBSD upgrades it's libgcc or until a new GNAT and GPRBuild | |
36 | # are delivered that don't have this bug. | 34 | # are delivered that don't have this bug. | |
37 | 35 | |||
38 | .if ${OPSYS} == NetBSD | 36 | .if ${OPSYS} == NetBSD | |
39 | CONFIGURE_ARGS+= ZLIB=false | 37 | CONFIGURE_ARGS+= ZLIB=false | |
40 | .else | 38 | .else | |
41 | CONFIGURE_ARGS+= ZLIB=true | 39 | CONFIGURE_ARGS+= ZLIB=true | |
42 | .endif | 40 | .endif | |
43 | 41 | |||
44 | ################### | |||
45 | ## SSL Support ## | |||
46 | ################### | |||
47 | ||||
48 | .if !empty(PKG_OPTIONS:Mssl) | 42 | .if !empty(PKG_OPTIONS:Mssl) | |
49 | .include "../../security/openssl/buildlink3.mk" | 43 | .include "../../security/openssl/buildlink3.mk" | |
50 | CONFIGURE_ARGS+= SOCKET=openssl | 44 | CONFIGURE_ARGS+= SOCKET=openssl | |
51 | .endif | 45 | .endif | |
52 | 46 | |||
53 | .if !empty(PKG_OPTIONS:Mgnutls) | 47 | .if !empty(PKG_OPTIONS:Mgnutls) | |
54 | .include "../../security/libgcrypt/buildlink3.mk" | 48 | .include "../../security/libgcrypt/buildlink3.mk" | |
55 | .include "../../security/openssl/buildlink3.mk" | 49 | .include "../../security/openssl/buildlink3.mk" | |
56 | .include "../../security/gnutls/buildlink3.mk" | 50 | .include "../../security/gnutls/buildlink3.mk" | |
57 | CONFIGURE_ARGS+= SOCKET=gnutls | 51 | CONFIGURE_ARGS+= SOCKET=gnutls | |
58 | .endif | 52 | .endif | |
59 | 53 | |||
60 | ||||
61 | #################### | |||
62 | ## LDAP Support ## | |||
63 | #################### | |||
64 | ||||
65 | .if !empty(PKG_OPTIONS:Mldap) | 54 | .if !empty(PKG_OPTIONS:Mldap) | |
66 | CONFIGURE_ARGS+= LDAP=true | 55 | CONFIGURE_ARGS+= LDAP=true | |
67 | .include "../../databases/openldap-client/buildlink3.mk" | 56 | .include "../../databases/openldap-client/buildlink3.mk" | |
68 | .endif | 57 | .endif | |
69 | 58 | |||
70 | #################### | 59 | .if !empty(PKG_OPTIONS:Minet6) | |
71 | ## IPv6 Support ## | |||
72 | #################### | |||
73 | ||||
74 | PLIST_VARS+= ipv6 noipv6 | |||
75 | .if !empty(PKG_OPTIONS:Mipv6) | |||
76 | CONFIGURE_ARGS+= IPv6=true | 60 | CONFIGURE_ARGS+= IPv6=true | |
77 | .endif | 61 | .endif | |
78 | 62 | |||
79 | ##################### | |||
80 | ## Debug Support ## | |||
81 | ##################### | |||
82 | ||||
83 | .if !empty(PKG_OPTIONS:Mdebug) | 63 | .if !empty(PKG_OPTIONS:Mdebug) | |
84 | CONFIGURE_ARGS+= DEBUG=true | 64 | CONFIGURE_ARGS+= DEBUG=true | |
85 | DOTBUILD= debug | |||
86 | .endif | 65 | .endif | |
87 | 66 | |||
88 | ############################## | |||
89 | ## Shared Runtime Library ## | |||
90 | ############################## | |||
91 | ||||
92 | #.if !empty(PKG_OPTIONS:Mdisable-shared-rt) | |||
93 | CONFIGURE_ARGS+= ENABLE_SHARED=false | 67 | CONFIGURE_ARGS+= ENABLE_SHARED=false | |
94 | #.endif | |||
95 | ||||
96 | ############################ | |||
97 | ## Default Library Type ## | |||
98 | ############################ | |||
99 | 68 | |||
100 | .if !empty(PKG_OPTIONS:Mrelocatable) | 69 | .if !empty(PKG_OPTIONS:Mrelocatable) | |
101 | CONFIGURE_ARGS+= DEFAULT_LIBRARY_TYPE=relocatable | 70 | CONFIGURE_ARGS+= DEFAULT_LIBRARY_TYPE=relocatable | |
102 | .endif | 71 | .endif |