Sun May 3 19:08:52 2020 UTC ()
www/aws: clean up package definition


(rillig)
diff -r1.34 -r1.35 pkgsrc/www/aws/Makefile
diff -r1.12 -r1.13 pkgsrc/www/aws/options.mk
cvs diff -r1.34 -r1.35 pkgsrc/www/aws/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/aws/Attic/Makefile 2020/05/01 07:10:19 1.34
+++ pkgsrc/www/aws/Attic/Makefile 2020/05/03 19:08:52 1.35
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
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
3DISTNAME= aws-${AWS_VERSION} 3DISTNAME= aws-${AWS_VERSION}
4PKGREVISION= 16 4PKGREVISION= 16
5CATEGORIES= www 5CATEGORIES= www
6MASTER_SITES= http://downloads.dragonlace.net/src/ 6MASTER_SITES= http://downloads.dragonlace.net/src/
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://libre.adacore.com/libre/tools/aws/ 10HOMEPAGE= http://libre.adacore.com/libre/tools/aws/
11COMMENT= Adacore Ada Web Server and framework 11COMMENT= Adacore Ada Web Server and framework
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14BROKEN= "sh: ../xoscons: not found" 14BROKEN= "sh: ../xoscons: not found"
@@ -16,44 +16,44 @@ BROKEN= "sh: ../xoscons: not found" @@ -16,44 +16,44 @@ BROKEN= "sh: ../xoscons: not found"
16AWS_VERSION= 3.1.0.0 16AWS_VERSION= 3.1.0.0
17USE_TOOLS+= gmake makeinfo sed awk 17USE_TOOLS+= gmake makeinfo sed awk
18USE_LANGUAGES= c ada c++ fortran 18USE_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
27MY_MAKE_ENV+= ADA_PROJECT_PATH=${PREFIX}/lib/gnat 27MY_MAKE_ENV+= ADA_PROJECT_PATH=${PREFIX}/lib/gnat
28MY_MAKE_ENV+= AWK=awk 28MY_MAKE_ENV+= AWK=awk
29MY_MAKE_ENV+= PATH=${PREFIX}/gcc5-aux/bin:${PATH} 29MY_MAKE_ENV+= PATH=${PREFIX}/gcc5-aux/bin:${PATH:Q}
30MY_CONF_ENV+= PATH=${PREFIX}/gcc5-aux/bin:${PATH} 30MY_CONF_ENV+= PATH=${PREFIX}/gcc5-aux/bin:${PATH:Q}
31CONFIGURE_ARGS+= LPATH=${BUILDLINK_PREFIX.openssl}/lib 31CONFIGURE_ARGS+= LPATH=${BUILDLINK_PREFIX.openssl}/lib
32CONFIGURE_ARGS+= ZPATH=${BUILDLINK_PREFIX.zlib}/lib 32CONFIGURE_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
40SUBST_CLASSES+= rpath 40SUBST_CLASSES+= rpath
41SUBST_STAGE.rpath= pre-configure 41SUBST_STAGE.rpath= pre-configure
42SUBST_MESSAGE.rpath= Adjust rpaths of shared libraries 42SUBST_MESSAGE.rpath= Adjust rpaths of shared libraries
43SUBST_FILES.rpath= src/src.gpr include/include.gpr 43SUBST_FILES.rpath= src/src.gpr include/include.gpr
44SUBST_FILES.rpath+= demos/test_ldap/test_ldap.gpr tools/tools.gpr 44SUBST_FILES.rpath+= demos/test_ldap/test_ldap.gpr tools/tools.gpr
45SUBST_VARS.rpath= ADDITIONAL_RPATH PREFIX 45SUBST_VARS.rpath= ADDITIONAL_RPATH PREFIX
46SUBST_SED.rpath+= -e "s,@RFLAG@,${LINKER_RPATH_FLAG},g" 46SUBST_SED.rpath+= -e s,@RFLAG@,${LINKER_RPATH_FLAG},g
47SUBST_SED.rpath+= -e "s,@SSL_RPATH@,${BUILDLINK_PREFIX.openssl}/lib,g" 47SUBST_SED.rpath+= -e "s,@SSL_RPATH@,${BUILDLINK_PREFIX.openssl}/lib,g"
48ADDITIONAL_RPATH= ${PREFIX}/lib:${PREFIX}/lib/aws/relocatable 48ADDITIONAL_RPATH= ${PREFIX}/lib:${PREFIX}/lib/aws/relocatable
49 49
50GENERATE_PLIST= cd ${DESTDIR}${PREFIX}; 50GENERATE_PLIST= cd ${DESTDIR}${PREFIX};
51GENERATE_PLIST+= ${FIND} * -type f | ${SORT}; 51GENERATE_PLIST+= ${FIND} * -type f | ${SORT};
52 52
53do-configure: 53do-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
57do-build: 57do-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
cvs diff -r1.12 -r1.13 pkgsrc/www/aws/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/www/aws/Attic/options.mk 2020/05/01 07:10:19 1.12
+++ pkgsrc/www/aws/Attic/options.mk 2020/05/03 19:08:52 1.13
@@ -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
12PKG_OPTIONS_VAR= PKG_OPTIONS.aws 11PKG_OPTIONS_VAR= PKG_OPTIONS.aws
13PKG_OPTIONS_OPTIONAL_GROUPS= slayer 12PKG_OPTIONS_OPTIONAL_GROUPS= slayer
14PKG_OPTIONS_GROUP.slayer= ssl gnutls 13PKG_OPTIONS_GROUP.slayer= ssl gnutls
15PKG_SUPPORTED_OPTIONS= ldap inet6 debug relocatable 14PKG_SUPPORTED_OPTIONS= ldap inet6 debug relocatable
16PKG_SUGGESTED_OPTIONS= ssl 15PKG_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
21CONFIGURE_ARGS+= GCC=ada 20CONFIGURE_ARGS+= GCC=ada
22CONFIGURE_ARGS+= PROCESSORS=${MAKE_JOBS} 21CONFIGURE_ARGS+= PROCESSORS=${MAKE_JOBS}
23CONFIGURE_ARGS+= PYTHON=python${PYVERSSUFFIX} 22CONFIGURE_ARGS+= PYTHON=python${PYVERSSUFFIX}
24CONFIGURE_ARGS+= XMLADA=true 23CONFIGURE_ARGS+= XMLADA=true
25CONFIGURE_ARGS+= prefix=${PREFIX} 24CONFIGURE_ARGS+= prefix=${PREFIX}
26DOTBUILD= 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
39CONFIGURE_ARGS+= ZLIB=false 37CONFIGURE_ARGS+= ZLIB=false
40.else 38.else
41CONFIGURE_ARGS+= ZLIB=true 39CONFIGURE_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"
50CONFIGURE_ARGS+= SOCKET=openssl 44CONFIGURE_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"
57CONFIGURE_ARGS+= SOCKET=gnutls 51CONFIGURE_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)
66CONFIGURE_ARGS+= LDAP=true 55CONFIGURE_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 
74PLIST_VARS+= ipv6 noipv6 
75.if !empty(PKG_OPTIONS:Mipv6) 
76CONFIGURE_ARGS+= IPv6=true 60CONFIGURE_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)
84CONFIGURE_ARGS+= DEBUG=true 64CONFIGURE_ARGS+= DEBUG=true
85DOTBUILD= debug 
86.endif 65.endif
87 66
88############################## 
89## Shared Runtime Library ## 
90############################## 
91 
92#.if !empty(PKG_OPTIONS:Mdisable-shared-rt) 
93CONFIGURE_ARGS+= ENABLE_SHARED=false 67CONFIGURE_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)
101CONFIGURE_ARGS+= DEFAULT_LIBRARY_TYPE=relocatable 70CONFIGURE_ARGS+= DEFAULT_LIBRARY_TYPE=relocatable
102.endif 71.endif