pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/net/openvpn + Add full DESTDIR support.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/a8168f3c3a33
branches:  trunk
changeset: 538826:a8168f3c3a33
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Feb 20 04:24:17 2008 +0000

description:
+ Add full DESTDIR support.

+ Replace unnecessary /bin/bash in easy-rsa scripts with /bin/sh.

Bump the PKGREVISION to 1.

diffstat:

 net/openvpn/Makefile |  20 ++++++++++++--------
 1 files changed, 12 insertions(+), 8 deletions(-)

diffs (59 lines):

diff -r 7c9a423c5065 -r a8168f3c3a33 net/openvpn/Makefile
--- a/net/openvpn/Makefile      Wed Feb 20 01:10:20 2008 +0000
+++ b/net/openvpn/Makefile      Wed Feb 20 04:24:17 2008 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2008/02/13 12:07:24 martti Exp $
+# $NetBSD: Makefile,v 1.25 2008/02/20 04:24:17 jlam Exp $
 #
 
 DISTNAME=      openvpn-2.1_rc7
 PKGNAME=       openvpn-2.1rc7
-#PKGREVISION=  1
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  http://openvpn.net/release/ \
                http://openvpn.net/release/old/
@@ -13,6 +13,8 @@
 COMMENT=       Easy-to-use SSL VPN daemon
 #LICENSE=      gnu-gpl-v2
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            grep:run
 USE_LIBTOOL=           yes
@@ -54,6 +56,7 @@
 .include "../../net/solaris-tap/buildlink3.mk"
 .endif
 
+REPLACE_SH=            easy-rsa/2.0/*
 SUBST_CLASSES+=                pkitool
 SUBST_STAGE.pkitool=   post-build
 SUBST_MESSAGE.pkitool= Fixing up default paths to grep & openssl in pkitool.
@@ -67,19 +70,20 @@
                case $$file in                                          \
                *.orig) ;;                                              \
                [A-Z]*|*.cnf|vars)                                      \
-                       ${INSTALL_DATA} $$file ${EASYRSADIR:Q} ;;       \
-               *)      ${INSTALL_SCRIPT} $$file ${EASYRSADIR:Q} ;;     \
+                       ${INSTALL_DATA} $$file ${DESTDIR}${EASYRSADIR:Q} ;;     \
+               *)      ${INSTALL_SCRIPT} $$file ${DESTDIR}${EASYRSADIR:Q} ;;   \
                esac;                                                   \
        done
-       ${INSTALL_DATA} ${WRKSRC:Q}/management/management-notes.txt ${DOCDIR:Q}
+       ${INSTALL_DATA} ${WRKSRC:Q}/management/management-notes.txt     \
+               ${DESTDIR}${DOCDIR:Q}
        cd ${WRKSRC:Q}/sample-config-files; for file in *; do           \
-               ${INSTALL_DATA} $$file ${EGDIR:Q}/config;               \
+               ${INSTALL_DATA} $$file ${DESTDIR}${EGDIR:Q}/config;     \
        done
        cd ${WRKSRC:Q}/sample-scripts; for file in *; do                \
-               ${INSTALL_DATA} $$file ${EGDIR:Q}/scripts;              \
+               ${INSTALL_DATA} $$file ${DESTDIR}${EGDIR:Q}/scripts;    \
        done
        cd ${WRKSRC:Q}/sample-keys; for file in *; do                   \
-               ${INSTALL_DATA} $$file ${EGDIR:Q}/keys;                 \
+               ${INSTALL_DATA} $$file ${DESTDIR}${EGDIR:Q}/keys;       \
        done
 
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index