diff options
| author | joerg <joerg@pkgsrc.org> | 2013-10-03 11:15:48 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2013-10-03 11:15:48 +0000 |
| commit | 5897bd6d884e0fa65c1b02a50def39cd2e260687 (patch) | |
| tree | 786c0e2a05aaa918e919c09abaeb750d1628f098 /security | |
| parent | e222dd5c170ed4935d1e3d027875327ea26c7e97 (diff) | |
| download | pkgsrc-5897bd6d884e0fa65c1b02a50def39cd2e260687.tar.gz | |
Don't mess with the normal PLIST.${OPSYS} logic. Use a variable to
control whether PLIST.shlib should be included or not.
Diffstat (limited to 'security')
| -rw-r--r-- | security/openssl/Makefile | 17 | ||||
| -rw-r--r-- | security/openssl/PLIST.OSF1 | 3 | ||||
| -rw-r--r-- | security/openssl/PLIST.osf1 | 3 |
3 files changed, 10 insertions, 13 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index fb11581bfde..3e7e929ed07 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.179 2013/07/26 11:27:02 ryoon Exp $ +# $NetBSD: Makefile,v 1.180 2013/10/03 11:15:48 joerg Exp $ DISTNAME= openssl-1.0.1e MASTER_SITES= http://ftp.openssl.org/source/ @@ -62,7 +62,7 @@ CONFIGURE_ARGS+= irix64-mips4-cc . endif . endif .elif ${OPSYS} == "OSF1" -PLIST_OPSYS= PLIST.osf1 +USE_PLIST_SHLIB= no CONFIGURE_SCRIPT= ./Configure . if !empty(CC_VERSION:Mgcc*) CONFIGURE_ARGS+= tru64-alpha-gcc @@ -112,7 +112,8 @@ CONFIGURE_ARGS+= hpux-parisc-${CC} CONFIGURE_ARGS+= hpux-ia64-${CC} . endif . endif - +.elif ${OPSYS} == "Cygwin" +USE_PLIST_SHLIB= no .endif .include "../../security/openssl/options.mk" @@ -120,14 +121,10 @@ CONFIGURE_ARGS+= hpux-ia64-${CC} CONFIGURE_ARGS+= ${CFLAGS} ${LDFLAGS} CONFIGURE_ENV+= PERL=${PERL5:Q} -PLIST_OPSYS?= ${PKGDIR}/PLIST.${LOWER_OPSYS:C/([.0-9]*)$//} -.if exists(${PLIST_OPSYS}) -PLIST_SHLIB= ${PLIST_OPSYS} -.else -PLIST_SHLIB= ${PKGDIR}/PLIST.shlib +USE_PLIST_SHLIB?= yes +.if ${USE_PLIST_SHLIB} == "yes" +PLIST_SRC+= ${PKGDIR}/PLIST.shlib .endif -PLIST_SRC= ${PLIST_SHLIB} -PLIST_SRC+= ${PKGDIR}/PLIST.common PLIST_SUBST+= SHLIB_VERSION=${OPENSSL_VERS:C/[^0-9]*$//} PLIST_SUBST+= SHLIB_MAJOR=${OPENSSL_VERS:C/\..*$//} diff --git a/security/openssl/PLIST.OSF1 b/security/openssl/PLIST.OSF1 new file mode 100644 index 00000000000..4e6db45f7e1 --- /dev/null +++ b/security/openssl/PLIST.OSF1 @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST.OSF1,v 1.1 2013/10/03 11:15:48 joerg Exp $ +lib/libcrypto.so +lib/libssl.so diff --git a/security/openssl/PLIST.osf1 b/security/openssl/PLIST.osf1 deleted file mode 100644 index 5176720b93d..00000000000 --- a/security/openssl/PLIST.osf1 +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST.osf1,v 1.1 2007/08/04 14:29:43 tnn Exp $ -lib/libcrypto.so -lib/libssl.so |