pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Use SUBST framework, patch files directly.
details: https://anonhg.NetBSD.org/pkgsrc/rev/35d3a0885150
branches: trunk
changeset: 505647:35d3a0885150
user: joerg <joerg%pkgsrc.org@localhost>
date: Thu Jan 05 21:21:54 2006 +0000
description:
Use SUBST framework, patch files directly.
diffstat:
www/ap-ssl/Makefile | 29 +++++++++++++----------------
www/ap-ssl/distinfo | 4 ++--
www/ap-ssl/patches/patch-ab | 6 +++---
x11/qt2-libs/Makefile.common | 29 ++++++++---------------------
x11/qt2-libs/distinfo | 8 ++++----
x11/qt2-libs/patches/patch-ab | 6 +++---
x11/qt2-libs/patches/patch-ac | 6 +++---
x11/qt2-libs/patches/patch-ap | 6 +++---
8 files changed, 39 insertions(+), 55 deletions(-)
diffs (190 lines):
diff -r ab9692f4dcf1 -r 35d3a0885150 www/ap-ssl/Makefile
--- a/www/ap-ssl/Makefile Thu Jan 05 20:57:05 2006 +0000
+++ b/www/ap-ssl/Makefile Thu Jan 05 21:21:54 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2005/12/29 06:22:21 jlam Exp $
+# $NetBSD: Makefile,v 1.96 2006/01/05 21:21:54 joerg Exp $
DISTNAME= mod_ssl-2.8.25-1.3.34
PKGNAME= ap-ssl-2.8.25
@@ -49,21 +49,18 @@
.include "../../security/openssl/buildlink3.mk"
.include "../../www/apache/buildlink3.mk"
-post-extract:
- cd ${WRKSRC}/pkg.contrib; ${MV} -f loadcacert.cgi loadcacert.cgi.in
- cd ${WRKSRC}/pkg.sslsup; ${MV} -f mkcert.sh mkcert.sh.in
+SUBST_CLASSES+= paths perl
+SUBST_FILES.paths= README.mkcert pkg.sslsup/mkcert.sh
+SUBST_SED.paths= -e 's,@PREFIX@,${PREFIX},g'
+SUBST_SED.paths+= -e 's,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g'
+SUBST_SED.paths+= -e 's,@SH@,${SH},g'
+SUBST_STAGE.paths= post-patch
+SUBST_FILES.perl= pkg.contrib/loadcacert.cgi
+SUBST_SED.perl= -e 's,^\#!/.*,\#!${PERL5},g'
+SUBST_STAGE.perl= post-patch
-post-build:
- @${SED} -e "s|^#!/.*|#!${PERL5}|g" \
- ${WRKSRC}/pkg.contrib/loadcacert.cgi.in \
- > ${WRKSRC}/pkg.contrib/loadcacert.cgi
- @${SED} ${FILES_SUBST_SED} \
- ${WRKSRC}/pkg.sslsup/mkcert.sh.in \
- > ${WRKSRC}/pkg.sslsup/mkcert.sh
-
-pre-install:
- @${SED} ${FILES_SUBST_SED} \
- ${FILESDIR}/README.mkcert > ${WRKDIR}/README.mkcert
+post-extract:
+ ${CP} ${FILESDIR}/README.mkcert ${WRKSRC}
post-install:
${INSTALL_DATA_DIR} ${EGDIR}
@@ -84,7 +81,7 @@
cd ${WRKSRC}/pkg.contrib; ${INSTALL_SCRIPT} *.sh *.cgi \
${PREFIX}/share/mod_ssl
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_ssl
- ${INSTALL_DATA} ${WRKDIR}/README.mkcert ${PREFIX}/share/doc/mod_ssl
+ ${INSTALL_DATA} ${WRKSRC}/README.mkcert ${PREFIX}/share/doc/mod_ssl
cd ${WRKSRC}/pkg.sslcfg; ${RM} -f server.*
cd ${WRKSRC}/pkg.sslcfg; ${INSTALL_DATA} README.CRL *.crl \
diff -r ab9692f4dcf1 -r 35d3a0885150 www/ap-ssl/distinfo
--- a/www/ap-ssl/distinfo Thu Jan 05 20:57:05 2006 +0000
+++ b/www/ap-ssl/distinfo Thu Jan 05 21:21:54 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.30 2005/10/19 20:33:44 bouyer Exp $
+$NetBSD: distinfo,v 1.31 2006/01/05 21:21:55 joerg Exp $
SHA1 (mod_ssl-2.8.25-1.3.34.tar.gz) = 150f726539d74c0d2af02e482be78bbcdb811395
RMD160 (mod_ssl-2.8.25-1.3.34.tar.gz) = 90a3913d30c7f4d194907463125c90101005837a
Size (mod_ssl-2.8.25-1.3.34.tar.gz) = 820352 bytes
SHA1 (patch-aa) = f2db042ff2e15ebfc9387b254467be78747cf947
-SHA1 (patch-ab) = 936bc956761559c51263cf7645d135abe40069cd
+SHA1 (patch-ab) = d6e4f5ef249506b9b4f003f84d78e2eb075dcd34
diff -r ab9692f4dcf1 -r 35d3a0885150 www/ap-ssl/patches/patch-ab
--- a/www/ap-ssl/patches/patch-ab Thu Jan 05 20:57:05 2006 +0000
+++ b/www/ap-ssl/patches/patch-ab Thu Jan 05 21:21:54 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.4 2002/12/03 14:31:33 grant Exp $
+$NetBSD: patch-ab,v 1.5 2006/01/05 21:21:55 joerg Exp $
---- pkg.sslsup/mkcert.sh.in.orig Sun Apr 16 19:21:24 2000
-+++ pkg.sslsup/mkcert.sh.in
+--- pkg.sslsup/mkcert.sh.orig Sun Apr 16 19:21:24 2000
++++ pkg.sslsup/mkcert.sh
@@ -1,39 +1,57 @@
-#!/bin/sh
+#!@SH@
diff -r ab9692f4dcf1 -r 35d3a0885150 x11/qt2-libs/Makefile.common
--- a/x11/qt2-libs/Makefile.common Thu Jan 05 20:57:05 2006 +0000
+++ b/x11/qt2-libs/Makefile.common Thu Jan 05 21:21:54 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.25 2005/12/05 20:51:19 rillig Exp $
+# $NetBSD: Makefile.common,v 1.26 2006/01/05 21:22:13 joerg Exp $
#
DISTNAME= qt-x11-${QTVERSION}
@@ -41,28 +41,15 @@
CONFIGURE_ARGS+= -xft -platform freebsd-g++
.endif
-FILES_SUBST= BUILDLINK_DIR=${BUILDLINK_DIR:Q}
-FILES_SUBST+= BUILDLINK_X11_DIR=${BUILDLINK_X11_DIR:Q}
-FILES_SUBST+= LOCALBASE=${LOCALBASE:Q}
-FILES_SUBST+= QTDIR=${QTPREFIX:Q}
-FILES_SUBST+= X11BASE=${X11BASE:Q}
-FILES_SUBST_SED= ${FILES_SUBST:S/=/@!/:S/$/!g/:S/^/ -e s!@/}
+SUBST_CLASSES+= paths
+SUBST_FILES.paths= configs/netbsd-g++-static configs/solaris-g++-static
+SUBST_FILES.paths+= configs/freebsd-g++-static
+SUBST_SED.paths= -e 's,@X11BASE@,${X11BASE},g'
+SUBST_SED.paths+= -e 's,@LOCALBASE@,${LOCALBASE},g'
+SUBST_SED.paths+= -e 's,@QTDIR@,${QTPREFIX},g'
+SUBST_STAGE.paths= post-patch
.include "../../mk/x11.buildlink3.mk"
-post-extract:
- cd ${WRKSRC}/configs; \
- for file in netbsd-g++-static solaris-g++-static \
- freebsd-g++-static; do \
- ${MV} -f $${file} $${file}.in; \
- done
-
-post-patch:
- cd ${WRKSRC}/configs; \
- for file in netbsd-g++-static solaris-g++-static \
- freebsd-g++-static; do \
- ${SED} ${FILES_SUBST_SED} $${file}.in > $${file}; \
- done
-
pre-build:
@${TOUCH} ${WRKSRC}/.buildopts
diff -r ab9692f4dcf1 -r 35d3a0885150 x11/qt2-libs/distinfo
--- a/x11/qt2-libs/distinfo Thu Jan 05 20:57:05 2006 +0000
+++ b/x11/qt2-libs/distinfo Thu Jan 05 21:21:54 2006 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.15 2005/10/04 19:34:36 joerg Exp $
+$NetBSD: distinfo,v 1.16 2006/01/05 21:22:13 joerg Exp $
SHA1 (qt-x11-2.3.1.tar.gz) = f1403700fe80fbfb125ec84731d0dfe9c576c823
RMD160 (qt-x11-2.3.1.tar.gz) = b579018cfa5782d2f8b94b0846c35bce3a09dfa4
Size (qt-x11-2.3.1.tar.gz) = 8967271 bytes
SHA1 (patch-aa) = 10f4cea8c2719c3c70becff88022e910778c4538
-SHA1 (patch-ab) = cada94d79878a49e24211ab7d17c097bbf5a9794
-SHA1 (patch-ac) = 0d94197bd40994b0c658e466d3ebb81fabfbf30c
+SHA1 (patch-ab) = 1f5b23c519d011c3c96d7ebd68120351a6edc203
+SHA1 (patch-ac) = f230f0729397d642ccf6d511fb16df8800d495ba
SHA1 (patch-ad) = eead0ed591c575ef542052bd233981dda954eb67
SHA1 (patch-ae) = e1ef4bde84473d6b84dbd226dbd7f8802abc6b4b
SHA1 (patch-af) = ea8b1c3f7a099a5492301281476ea831134ad97b
@@ -17,5 +17,5 @@
SHA1 (patch-al) = 32f6b13393b115c56a4ca75f62f5916034189174
SHA1 (patch-am) = ebbc184b095e2adcf81461472f4723d515167a9e
SHA1 (patch-ao) = 9e9be92054f4b73c973f63d4a8524ac30a4bbb44
-SHA1 (patch-ap) = b1245b7aab4b8dd5bd19892457ffb16cc182c1ca
+SHA1 (patch-ap) = 1895d85163bcb8246cf4b8a4a692d16e7d876506
SHA1 (patch-aq) = cf7ece73766d43f68343f45b984516bae21822ad
diff -r ab9692f4dcf1 -r 35d3a0885150 x11/qt2-libs/patches/patch-ab
--- a/x11/qt2-libs/patches/patch-ab Thu Jan 05 20:57:05 2006 +0000
+++ b/x11/qt2-libs/patches/patch-ab Thu Jan 05 21:21:54 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.8 2002/08/25 18:40:44 jlam Exp $
+$NetBSD: patch-ab,v 1.9 2006/01/05 21:22:14 joerg Exp $
---- configs/netbsd-g++-static.in.orig Wed Jun 13 04:56:48 2001
-+++ configs/netbsd-g++-static.in
+--- configs/netbsd-g++-static.orig Wed Jun 13 04:56:48 2001
++++ configs/netbsd-g++-static
@@ -1,44 +1,42 @@
# Compiling
INTERFACE_DECL_PATH = .
diff -r ab9692f4dcf1 -r 35d3a0885150 x11/qt2-libs/patches/patch-ac
--- a/x11/qt2-libs/patches/patch-ac Thu Jan 05 20:57:05 2006 +0000
+++ b/x11/qt2-libs/patches/patch-ac Thu Jan 05 21:21:54 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.6 2002/10/25 10:56:05 bouyer Exp $
+$NetBSD: patch-ac,v 1.7 2006/01/05 21:22:14 joerg Exp $
---- configs/solaris-g++-static.in.orig Wed Jun 13 10:56:50 2001
-+++ configs/solaris-g++-static.in Thu Oct 17 18:28:26 2002
+--- configs/solaris-g++-static.orig Wed Jun 13 10:56:50 2001
++++ configs/solaris-g++-static Thu Oct 17 18:28:26 2002
@@ -2,24 +2,25 @@
INTERFACE_DECL_PATH = .
SYSCONF_CXX = g++
diff -r ab9692f4dcf1 -r 35d3a0885150 x11/qt2-libs/patches/patch-ap
--- a/x11/qt2-libs/patches/patch-ap Thu Jan 05 20:57:05 2006 +0000
+++ b/x11/qt2-libs/patches/patch-ap Thu Jan 05 21:21:54 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.1 2005/10/04 19:34:36 joerg Exp $
+$NetBSD: patch-ap,v 1.2 2006/01/05 21:22:14 joerg Exp $
---- configs/freebsd-g++-static.in.orig 2005-07-30 22:54:44.000000000 +0000
-+++ configs/freebsd-g++-static.in
+--- configs/freebsd-g++-static.orig 2005-07-30 22:54:44.000000000 +0000
++++ configs/freebsd-g++-static
@@ -1,44 +1,42 @@
# Compiling
INTERFACE_DECL_PATH = .
Home |
Main Index |
Thread Index |
Old Index