Sat Oct 5 07:01:06 2013 UTC ()
Unbreak previous.


(jperkin)
diff -r1.180 -r1.181 pkgsrc/security/openssl/Makefile
cvs diff -r1.180 -r1.181 pkgsrc/security/openssl/Makefile (switch to unified diff)

--- pkgsrc/security/openssl/Makefile 2013/10/03 11:15:48 1.180
+++ pkgsrc/security/openssl/Makefile 2013/10/05 07:01:06 1.181
@@ -1,142 +1,143 @@ @@ -1,142 +1,143 @@
1# $NetBSD: Makefile,v 1.180 2013/10/03 11:15:48 joerg Exp $ 1# $NetBSD: Makefile,v 1.181 2013/10/05 07:01:06 jperkin Exp $
2 2
3DISTNAME= openssl-1.0.1e 3DISTNAME= openssl-1.0.1e
4MASTER_SITES= http://ftp.openssl.org/source/ 4MASTER_SITES= http://ftp.openssl.org/source/
5PKGREVISION= 2 5PKGREVISION= 2
6SVR4_PKGNAME= ossl 6SVR4_PKGNAME= ossl
7CATEGORIES= security 7CATEGORIES= security
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.openssl.org/ 10HOMEPAGE= http://www.openssl.org/
11COMMENT= Secure Socket Layer and cryptographic library 11COMMENT= Secure Socket Layer and cryptographic library
12 12
13CONFLICTS= SSLeay-[0-9]* ssleay-[0-9]* 13CONFLICTS= SSLeay-[0-9]* ssleay-[0-9]*
14 14
15CRYPTO= yes 15CRYPTO= yes
16 16
17PKG_INSTALLATION_TYPES= overwrite pkgviews 17PKG_INSTALLATION_TYPES= overwrite pkgviews
18 18
19BUILD_DEPENDS+= p5-Perl4-CoreLibs-[0-9]*:../../devel/p5-Perl4-CoreLibs 19BUILD_DEPENDS+= p5-Perl4-CoreLibs-[0-9]*:../../devel/p5-Perl4-CoreLibs
20 20
21.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
22.include "../../mk/compiler.mk" 22.include "../../mk/compiler.mk"
23 23
24EXTRACT_USING= gtar 24EXTRACT_USING= gtar
25USE_TOOLS+= fgrep gmake perl 25USE_TOOLS+= fgrep gmake perl
26TEST_TARGET= tests 26TEST_TARGET= tests
27MAKE_JOBS_SAFE= no 27MAKE_JOBS_SAFE= no
28 28
29HAS_CONFIGURE= yes 29HAS_CONFIGURE= yes
30CONFIGURE_SCRIPT= ./config 30CONFIGURE_SCRIPT= ./config
31CONFIGURE_ARGS+= --prefix=${PREFIX:Q} 31CONFIGURE_ARGS+= --prefix=${PREFIX:Q}
32CONFIGURE_ARGS+= --install_prefix=${DESTDIR} 32CONFIGURE_ARGS+= --install_prefix=${DESTDIR}
33CONFIGURE_ARGS+= --openssldir=${PKG_SYSCONFDIR:Q} 33CONFIGURE_ARGS+= --openssldir=${PKG_SYSCONFDIR:Q}
34CONFIGURE_ARGS+= shared no-fips 34CONFIGURE_ARGS+= shared no-fips
35 35
36.if ${OPSYS} == "SunOS" 36.if ${OPSYS} == "SunOS"
37. if ${MACHINE_ARCH} == "sparc" 37. if ${MACHINE_ARCH} == "sparc"
38OPENSSL_MACHINE_ARCH= ${SPARC_TARGET_ARCH} 38OPENSSL_MACHINE_ARCH= ${SPARC_TARGET_ARCH}
39. elif ${MACHINE_ARCH} == "i386" 39. elif ${MACHINE_ARCH} == "i386"
40OPENSSL_MACHINE_ARCH= x86 40OPENSSL_MACHINE_ARCH= x86
41. elif ${MACHINE_ARCH} == "x86_64" 41. elif ${MACHINE_ARCH} == "x86_64"
42OPENSSL_MACHINE_ARCH= ${MACHINE_ARCH} 42OPENSSL_MACHINE_ARCH= ${MACHINE_ARCH}
43. endif 43. endif
44# only override the configure target if we know the platform, falling 44# only override the configure target if we know the platform, falling
45# back to ./config's autodetection if not. 45# back to ./config's autodetection if not.
46. if defined(OPENSSL_MACHINE_ARCH) && !empty(OPENSSL_MACHINE_ARCH) 46. if defined(OPENSSL_MACHINE_ARCH) && !empty(OPENSSL_MACHINE_ARCH)
47CONFIGURE_SCRIPT= ./Configure 47CONFIGURE_SCRIPT= ./Configure
48. if !empty(CC_VERSION:Mgcc*) 48. if !empty(CC_VERSION:Mgcc*)
49CONFIGURE_ARGS+= solaris${${ABI}==64:?64:}-${OPENSSL_MACHINE_ARCH}-gcc 49CONFIGURE_ARGS+= solaris${${ABI}==64:?64:}-${OPENSSL_MACHINE_ARCH}-gcc
50. else 50. else
51CONFIGURE_ARGS+= solaris${${ABI}==64:?64:}-${OPENSSL_MACHINE_ARCH}-cc 51CONFIGURE_ARGS+= solaris${${ABI}==64:?64:}-${OPENSSL_MACHINE_ARCH}-cc
52. endif 52. endif
53. endif 53. endif
54.elif ${OPSYS} == "IRIX" 54.elif ${OPSYS} == "IRIX"
55CONFIGURE_ARGS+= no-asm 55CONFIGURE_ARGS+= no-asm
56. if ${ABI} == "64" 56. if ${ABI} == "64"
57CONFIGURE_SCRIPT= ./Configure 57CONFIGURE_SCRIPT= ./Configure
58. if !empty(CC_VERSION:Mgcc*) 58. if !empty(CC_VERSION:Mgcc*)
59CONFIGURE_ARGS+= irix64-mips4-gcc 59CONFIGURE_ARGS+= irix64-mips4-gcc
60. else 60. else
61CONFIGURE_ARGS+= irix64-mips4-cc 61CONFIGURE_ARGS+= irix64-mips4-cc
62. endif 62. endif
63. endif 63. endif
64.elif ${OPSYS} == "OSF1" 64.elif ${OPSYS} == "OSF1"
65USE_PLIST_SHLIB= no 65USE_PLIST_SHLIB= no
66CONFIGURE_SCRIPT= ./Configure 66CONFIGURE_SCRIPT= ./Configure
67. if !empty(CC_VERSION:Mgcc*) 67. if !empty(CC_VERSION:Mgcc*)
68CONFIGURE_ARGS+= tru64-alpha-gcc 68CONFIGURE_ARGS+= tru64-alpha-gcc
69. else 69. else
70CONFIGURE_ARGS+= tru64-alpha-cc 70CONFIGURE_ARGS+= tru64-alpha-cc
71. endif 71. endif
72.elif ${OPSYS} == "Darwin" 72.elif ${OPSYS} == "Darwin"
73CONFIGURE_SCRIPT= ./Configure 73CONFIGURE_SCRIPT= ./Configure
74. if defined(ABI) && ${ABI} == "64" 74. if defined(ABI) && ${ABI} == "64"
75CONFIGURE_ARGS+= darwin64-${MACHINE_ARCH}-cc 75CONFIGURE_ARGS+= darwin64-${MACHINE_ARCH}-cc
76. elif ${MACHINE_ARCH} == "powerpc" 76. elif ${MACHINE_ARCH} == "powerpc"
77CONFIGURE_ARGS+= darwin-ppc-cc 77CONFIGURE_ARGS+= darwin-ppc-cc
78. else 78. else
79CONFIGURE_ARGS+= darwin-${MACHINE_ARCH}-cc 79CONFIGURE_ARGS+= darwin-${MACHINE_ARCH}-cc
80. endif 80. endif
81 81
82.include "../../mk/dlopen.buildlink3.mk" 82.include "../../mk/dlopen.buildlink3.mk"
83 83
84SUBST_CLASSES+= dl 84SUBST_CLASSES+= dl
85SUBST_MESSAGE.dl= Adding dynamic link compatibility library. 85SUBST_MESSAGE.dl= Adding dynamic link compatibility library.
86SUBST_STAGE.dl= post-configure 86SUBST_STAGE.dl= post-configure
87SUBST_FILES.dl= Makefile apps/Makefile crypto/Makefile \ 87SUBST_FILES.dl= Makefile apps/Makefile crypto/Makefile \
88 crypto/pkcs7/Makefile test/Makefile 88 crypto/pkcs7/Makefile test/Makefile
89SUBST_SED.dl= -e 's,^EX_LIBS=,EX_LIBS=${DL_LDFLAGS:Q} ,g' 89SUBST_SED.dl= -e 's,^EX_LIBS=,EX_LIBS=${DL_LDFLAGS:Q} ,g'
90 90
91.elif ${OPSYS} == "Interix" 91.elif ${OPSYS} == "Interix"
92 92
93SUBST_CLASSES+= soname 93SUBST_CLASSES+= soname
94SUBST_STAGE.soname= post-configure 94SUBST_STAGE.soname= post-configure
95SUBST_FILES.soname= Makefile.shared 95SUBST_FILES.soname= Makefile.shared
96SUBST_SED.soname= -e 's/-Wl,-soname=/-Wl,-h,/g' 96SUBST_SED.soname= -e 's/-Wl,-soname=/-Wl,-h,/g'
97 97
98.elif ${OPSYS} == "HPUX" 98.elif ${OPSYS} == "HPUX"
99 99
100CONFIGURE_SCRIPT= ./Configure 100CONFIGURE_SCRIPT= ./Configure
101 101
102. if ${ABI} == "64" 102. if ${ABI} == "64"
103. if ${MACHINE_ARCH} == "hppa" 103. if ${MACHINE_ARCH} == "hppa"
104CONFIGURE_ARGS+= hpux64-parisc2-${CC} 104CONFIGURE_ARGS+= hpux64-parisc2-${CC}
105. else 105. else
106CONFIGURE_ARGS+= hpux64-ia64-${CC} 106CONFIGURE_ARGS+= hpux64-ia64-${CC}
107. endif 107. endif
108. else 108. else
109. if ${MACHINE_ARCH} == "hppa" 109. if ${MACHINE_ARCH} == "hppa"
110CONFIGURE_ARGS+= hpux-parisc-${CC} 110CONFIGURE_ARGS+= hpux-parisc-${CC}
111. else 111. else
112CONFIGURE_ARGS+= hpux-ia64-${CC} 112CONFIGURE_ARGS+= hpux-ia64-${CC}
113. endif 113. endif
114. endif 114. endif
115.elif ${OPSYS} == "Cygwin" 115.elif ${OPSYS} == "Cygwin"
116USE_PLIST_SHLIB= no 116USE_PLIST_SHLIB= no
117.endif 117.endif
118 118
119.include "../../security/openssl/options.mk" 119.include "../../security/openssl/options.mk"
120 120
121CONFIGURE_ARGS+= ${CFLAGS} ${LDFLAGS} 121CONFIGURE_ARGS+= ${CFLAGS} ${LDFLAGS}
122CONFIGURE_ENV+= PERL=${PERL5:Q} 122CONFIGURE_ENV+= PERL=${PERL5:Q}
123 123
 124PLIST_SRC+= ${PKGDIR}/PLIST.common
124USE_PLIST_SHLIB?= yes 125USE_PLIST_SHLIB?= yes
125.if ${USE_PLIST_SHLIB} == "yes" 126.if ${USE_PLIST_SHLIB} == "yes"
126PLIST_SRC+= ${PKGDIR}/PLIST.shlib 127PLIST_SRC+= ${PKGDIR}/PLIST.shlib
127.endif 128.endif
128PLIST_SUBST+= SHLIB_VERSION=${OPENSSL_VERS:C/[^0-9]*$//} 129PLIST_SUBST+= SHLIB_VERSION=${OPENSSL_VERS:C/[^0-9]*$//}
129PLIST_SUBST+= SHLIB_MAJOR=${OPENSSL_VERS:C/\..*$//} 130PLIST_SUBST+= SHLIB_MAJOR=${OPENSSL_VERS:C/\..*$//}
130 131
131PKG_SYSCONFSUBDIR= openssl 132PKG_SYSCONFSUBDIR= openssl
132CONF_FILES= ${PREFIX}/share/examples/openssl/openssl.cnf \ 133CONF_FILES= ${PREFIX}/share/examples/openssl/openssl.cnf \
133 ${PKG_SYSCONFDIR}/openssl.cnf 134 ${PKG_SYSCONFDIR}/openssl.cnf
134OWN_DIRS= ${PKG_SYSCONFDIR}/certs ${PKG_SYSCONFDIR}/private 135OWN_DIRS= ${PKG_SYSCONFDIR}/certs ${PKG_SYSCONFDIR}/private
135 136
136INSTALLATION_DIRS+= share/examples/openssl 137INSTALLATION_DIRS+= share/examples/openssl
137 138
138# Fix the path to perl in various scripts. 139# Fix the path to perl in various scripts.
139pre-configure: 140pre-configure:
140 cd ${WRKSRC} && ${PERL5} util/perlpath.pl ${PERL5} 141 cd ${WRKSRC} && ${PERL5} util/perlpath.pl ${PERL5}
141 142
142.include "../../mk/bsd.pkg.mk" 143.include "../../mk/bsd.pkg.mk"