diff options
-rw-r--r-- | security/openssl/Makefile | 23 | ||||
-rw-r--r-- | security/openssl/PLIST.common | 6 |
2 files changed, 13 insertions, 16 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 70c81541212..5b971fdbc7a 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2002/08/04 15:47:43 fredb Exp $ +# $NetBSD: Makefile,v 1.54 2002/08/09 14:45:05 jlam Exp $ DISTNAME= openssl-0.9.6e SVR4_PKGNAME= ossl @@ -23,25 +23,25 @@ CONFIGURE_SCRIPT= config CONFIGURE_ARGS= shared --openssldir=${PKG_SYSCONFDIR} --prefix=${PREFIX} CONFIGURE_ENV= CC="${CC}" +PLIST_SRC= ${PKGDIR}/PLIST.${LOWER_OPSYS} +PLIST_SRC+= ${PLIST_RSAREF} +PLIST_SRC+= ${PKGDIR}/PLIST.common + +PKG_SYSCONFSUBDIR= openssl CONF_FILES= ${PREFIX}/share/examples/openssl/openssl.cnf \ ${PKG_SYSCONFDIR}/openssl.cnf -PKG_SYSCONFSUBDIR= openssl -PLIST_SRC= ${WRKDIR}/.PLIST_SRC -PLIST_SUBST= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} +OWN_DIRS= ${PKG_SYSCONFDIR}/certs ${PKG_SYSCONFDIR}/private do-configure: cd ${WRKSRC} \ - && ${PERL5} util/perlpath.pl ${LOCALBASE}/bin \ + && ${PERL5} util/perlpath.pl ${PERL5} \ && ${SETENV} ${CONFIGURE_ENV} ./${CONFIGURE_SCRIPT} \ ${CONFIGURE_ARGS} -post-build: - ${CAT} ${PKGDIR}/PLIST.${LOWER_OPSYS} ${PLIST_RSAREF} \ - ${PKGDIR}/PLIST.common > ${PLIST_SRC} - test: all @cd ${WRKSRC}/test \ - && ${SETENV} ${LD_PATH_VARNAME}=${WRKSRC} ${MAKE} tests \ + && ${SETENV} ${LD_PATH_VARNAME}=${WRKSRC} \ + ${MAKE_PROGRAM} tests \ && ${ECHO} "*** Tests successful. ***" .include "../../mk/bsd.prefs.mk" @@ -51,7 +51,7 @@ PATCH_SITES= ${MASTER_SITE_LOCAL} PATCHFILES= openssl-0.9.6e-20020804-netbsd.patch.gz PATCH_DIST_STRIP= -p1 -PKG_SYSCONFBASE= /etc +PKG_SYSCONFDIR.${PKGBASE}?= /etc/openssl .endif .if ${OPSYS} == "Darwin" @@ -75,4 +75,5 @@ CONFIGURE_SCRIPT= Configure CONFIGURE_ARGS+= solaris-${SPARC_TARGET_ARCH}-${CC} .endif +.include "../../mk/bsd.pkg.install.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/openssl/PLIST.common b/security/openssl/PLIST.common index 37b8b0f8847..4ea81ae87f5 100644 --- a/security/openssl/PLIST.common +++ b/security/openssl/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.4 2002/08/04 15:47:44 fredb Exp $ +@comment $NetBSD: PLIST.common,v 1.5 2002/08/09 14:45:05 jlam Exp $ bin/openssl bin/c_hash bin/c_info @@ -293,7 +293,3 @@ share/examples/openssl/der_chop share/examples/openssl/openssl.cnf @dirrm share/examples/openssl @dirrm include/openssl -@exec ${MKDIR} ${PKG_SYSCONFDIR}/certs ${PKG_SYSCONFDIR}/private -@unexec ${RMDIR} ${PKG_SYSCONFDIR}/private 2>/dev/null || true -@unexec ${RMDIR} ${PKG_SYSCONFDIR}/certs 2>/dev/null || true -@unexec ${RMDIR} ${PKG_SYSCONFDIR} 2>/dev/null || true |