pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/security Do not patch Makefile or override do-install ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/16d887ba1739
branches:  trunk
changeset: 509722:16d887ba1739
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Mon Mar 13 21:56:22 2006 +0000

description:
Do not patch Makefile or override do-install because the recent qt3-tools
generates valid Makefile.

diffstat:

 security/qca-tls/Makefile |  16 ++--------------
 security/qca/Makefile     |   8 ++------
 2 files changed, 4 insertions(+), 20 deletions(-)

diffs (53 lines):

diff -r 5d2734126cdc -r 16d887ba1739 security/qca-tls/Makefile
--- a/security/qca-tls/Makefile Mon Mar 13 21:53:47 2006 +0000
+++ b/security/qca-tls/Makefile Mon Mar 13 21:56:22 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2006/03/02 22:01:18 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2006/03/13 21:56:22 minskim Exp $
 
 DISTNAME=      qca-tls-1.0
 PKGREVISION=   2
@@ -17,20 +17,8 @@
 CONFIGURE_ARGS+=        --with-openssl-inc=${SSLBASE}/include
 CONFIGURE_ARGS+=        --with-openssl-lib=${SSLBASE}/lib
 
-# XXX the -rpath filter is somewhat ugly, and this should be eventually
-# fixed in NetBSD qmake template to not be necessary.
-post-configure:
-       cd ${WRKSRC} && ( ${SETENV} ${CONFIGURE_ENV}                    \
-               ${QTDIR}/bin/qmake qca-tls.pro -o Makefile.orig;        \
-               ${SED} -e "s,-rpath .*,-rpath ${QTDIR}/lib," Makefile.orig > Makefile;  \
-       )
-
-do-install:
-       ${INSTALL_DATA_DIR} ${QTDIR}/plugins/crypto
-       cd ${WRKSRC} && \
-       libtool --mode=install ${INSTALL_LIB} libqca-tls.la ${QTDIR}/plugins/crypto
-
 .include "../../security/openssl/buildlink3.mk"
 .include "../../x11/qt3-libs/buildlink3.mk"
+BUILDLINK_DEPENDS.qt3-tools+=  qt3-tools>=3.3.5nb6
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5d2734126cdc -r 16d887ba1739 security/qca/Makefile
--- a/security/qca/Makefile     Mon Mar 13 21:53:47 2006 +0000
+++ b/security/qca/Makefile     Mon Mar 13 21:56:22 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/02/05 23:10:47 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/03/13 21:56:22 minskim Exp $
 
 DISTNAME=      qca-1.0
 PKGREVISION=   2
@@ -16,11 +16,7 @@
 
 INSTALLATION_DIRS=     include lib
 
-do-install:
-       cd ${WRKSRC} && ${INSTALL} src/qca.h ${PREFIX}/include
-       cd ${WRKSRC} && \
-       libtool --mode=install ${INSTALL_LIB} libqca.la ${PREFIX}/lib
-
 .include "../../x11/qt3-libs/buildlink3.mk"
+BUILDLINK_DEPENDS.qt3-tools+=  qt3-tools>=3.3.5nb6
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"



Home | Main Index | Thread Index | Old Index