pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/sysutils/webmin Use the openssl/buildlink3.mk file to ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c1a2fb1ba61e
branches:  trunk
changeset: 487990:c1a2fb1ba61e
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Jan 23 06:20:43 2005 +0000

description:
Use the openssl/buildlink3.mk file to properly handle a built-in OpenSSL
distribution for the location of the "openssl" binary (used to generate
the self-signed certificate).

diffstat:

 sysutils/webmin/Makefile |  18 ++++++++++++++----
 1 files changed, 14 insertions(+), 4 deletions(-)

diffs (49 lines):

diff -r e69c24578e85 -r c1a2fb1ba61e sysutils/webmin/Makefile
--- a/sysutils/webmin/Makefile  Sun Jan 23 05:09:46 2005 +0000
+++ b/sysutils/webmin/Makefile  Sun Jan 23 06:20:43 2005 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2005/01/23 04:36:27 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/01/23 06:20:43 jlam Exp $
 
 DISTNAME=      webmin-1.170-minimal
 PKGNAME=       ${DISTNAME:S/-minimal$//}
+PKGREVISION=   1
 CATEGORIES=    sysutils www
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=webadmin/}
 
@@ -10,11 +11,10 @@
 COMMENT=       Perl web server and CGI for Unix system administration
 
 DEPENDS+=      p5-Net-SSLeay-[0-9]*:../../security/p5-Net-SSLeay
-DEPENDS+=      openssl-[0-9]*:../../security/openssl
 
+WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
 USE_LANGUAGES= # empty
-WRKSRC=                ${WRKDIR}/${PKGNAME_NOREV}
-NO_BUILDLINK=  yes
+USE_BUILDLINK3=        yes
 NO_BUILD=      yes
 
 USE_PERL5=     yes
@@ -58,6 +58,15 @@
                fi;                                                     \
                ${MV} -f $$file.new $$file;                             \
        done
+       case "${USE_BUILTIN.openssl}" in                                \
+       [nN][oO])                                                       \
+               for file in ${WRKSRC}/acl/config ${WRKSRC}/acl/config-*; do \
+                       ${SED}  -e "s|^ssleay=.*|ssleay=${SSLBASE}/bin/openssl|" \
+                               $$file > $$file.new;                    \
+                       ${MV} -f $$file.new $$file;                     \
+               done;                                                   \
+               ;;                                                      \
+       esac
 
 pre-install:
        ${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
@@ -66,4 +75,5 @@
        ${INSTALL_DATA_DIR} ${WEBMIN_DIR}
        ${CP} -R ${WRKSRC}/* ${WEBMIN_DIR}
 
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index