diff options
| author | bsiegert <bsiegert> | 2014-03-22 09:05:24 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert> | 2014-03-22 09:05:24 +0000 |
| commit | 49138d5ec87135e604039888525689e8bf493ee1 (patch) | |
| tree | a5664f985e62e9c5e9ed44ff15f6543ba74c99d7 | |
| parent | adaedd14f2cfc1b1b334d2c15f6f6ee6551ad8cf (diff) | |
| download | pkgsrc-49138d5ec87135e604039888525689e8bf493ee1.tar.gz | |
The MirBSD stanza was wrong. Moved it below the builtin.mk inclusion and
made the conditional more robust.
Fixes at least "make describe", let's see if it helps for the bulk build.
| -rw-r--r-- | security/heimdal/Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index 6add78ba4fc..b86c35570ba 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.110 2014/03/19 13:25:04 bsiegert Exp $ +# $NetBSD: Makefile,v 1.111 2014/03/22 09:05:24 bsiegert Exp $ DISTNAME= heimdal-1.5.3 PKGREVISION= 5 @@ -81,15 +81,6 @@ PLIST_VARS+= afskauth hcrypto PLIST.afskauth= yes .endif -.if ${OPSYS} == "MirBSD" -.if ${USE_BUILTIN.openssl} == "yes" -PLIST.hcrypto= yes -.endif -PLIST.vis= yes -# all of the tools need to link against pthread, force it. -PTHREAD_AUTO_VARS= yes -.endif - OWN_DIRS_PERMS= ${HEIMDAL_HDB_DIR} ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0700 SPECIAL_PERMS+= ${PREFIX}/bin/otp ${SETUID_ROOT_PERMS} SPECIAL_PERMS= ${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS} @@ -119,6 +110,15 @@ CHECK_BUILTIN.openssl:=no PLIST.hcrypto= yes .endif +.if ${OPSYS} == "MirBSD" +.if !empty(USE_BUILTIN.openssl:Myes) +PLIST.hcrypto= yes +.endif +PLIST.vis= yes +# all of the tools need to link against pthread, force it. +PTHREAD_AUTO_VARS= yes +.endif + .include "../../mk/termcap.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/readline.buildlink3.mk" |