diff options
| author | rillig <rillig@pkgsrc.org> | 2005-11-04 11:22:24 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-11-04 11:22:24 +0000 |
| commit | 3c728add0c596005d773f02a4805a742c9e08991 (patch) | |
| tree | 282016ba78afd7c138068797f8b934ddc778ee85 /security | |
| parent | 3525c40187867874c7fb311be75e3ad82928865e (diff) | |
| download | pkgsrc-3c728add0c596005d773f02a4805a742c9e08991.tar.gz | |
Fixed wrong use of WRKSRC. Converted explicit ${SED} substitution to
appropriate SUBST_* definitions.
Diffstat (limited to 'security')
| -rw-r--r-- | security/gnustep-ssl/Makefile | 15 | ||||
| -rw-r--r-- | security/gnustep-ssl/distinfo | 4 | ||||
| -rw-r--r-- | security/gnustep-ssl/patches/patch-aa | 6 |
3 files changed, 11 insertions, 14 deletions
diff --git a/security/gnustep-ssl/Makefile b/security/gnustep-ssl/Makefile index e6939c467ed..7d7773bbc2a 100644 --- a/security/gnustep-ssl/Makefile +++ b/security/gnustep-ssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/11/03 13:44:59 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2005/11/04 11:22:24 rillig Exp $ # DISTNAME= gnustep-base-1.10.1 @@ -14,8 +14,7 @@ BUILDLINK_DEPENDS.gnustep-base= gnustep-base>1.10.1 PTHREAD_LIBS= -lpthread -CONFIGURE_DIRS= ${WRKDIR}/${DISTNAME} -WRKSRC= ${CONFIGURE_DIRS}/SSL +BUILD_DIRS= SSL MAKEFILE= GNUmakefile USE_TOOLS+= gmake GNU_CONFIGURE= yes @@ -23,12 +22,10 @@ GNU_CONFIGURE_PREFIX= ${PREFIX}/share/GNUstep CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/libexec/GNUstep CONFIGURE_ENV+= INSTALL_PROGRAM="${INSTALL_SCRIPT}" -pre-configure: -.for pfile in configure ../base.make.in - ${CP} ${WRKSRC}/${pfile} ${WRKSRC}/${pfile}.tmpl - ${SED} 's|@PTHREAD_LIBS@|${PTHREAD_LIBS}|g' \ - <${WRKSRC}/${pfile}.tmpl >${WRKSRC}/${pfile} -.endfor +SUBST_CLASSES+= gsssl +SUBST_STAGE.gsssl= pre-configure +SUBST_FILES.gsssl= SSL/configure base.make.in +SUBST_SED.gsssl= -e 's|@PTHREAD_LIBS@|${PTHREAD_LIBS}|g' .include "../../devel/gnustep-base/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/security/gnustep-ssl/distinfo b/security/gnustep-ssl/distinfo index 69f34aaef23..ea933f623f3 100644 --- a/security/gnustep-ssl/distinfo +++ b/security/gnustep-ssl/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.4 2005/02/24 13:10:06 agc Exp $ +$NetBSD: distinfo,v 1.5 2005/11/04 11:22:24 rillig Exp $ SHA1 (gnustep-base-1.10.1.tar.gz) = 2835e23fe5627dc59028409acca288bbd9f8f524 RMD160 (gnustep-base-1.10.1.tar.gz) = f445d222d33db292de3a77d26366645bd1cf1a62 Size (gnustep-base-1.10.1.tar.gz) = 1909988 bytes -SHA1 (patch-aa) = f7c59f52d95b1965d1321ebfb6fd17e1cd8aafc9 +SHA1 (patch-aa) = 96cb92d28086344df9bbfe2ce60f07856152b8db diff --git a/security/gnustep-ssl/patches/patch-aa b/security/gnustep-ssl/patches/patch-aa index 6c168dbd3d7..58f3f26613f 100644 --- a/security/gnustep-ssl/patches/patch-aa +++ b/security/gnustep-ssl/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.1.1.1 2004/04/11 00:08:11 rh Exp $ +$NetBSD: patch-aa,v 1.2 2005/11/04 11:22:24 rillig Exp $ ---- GNUmakefile.orig 2004-01-13 12:39:43.000000000 +1000 -+++ GNUmakefile +--- SSL/GNUmakefile.orig 2004-01-13 12:39:43.000000000 +1000 ++++ SSL/GNUmakefile @@ -35,7 +35,6 @@ include $(GNUSTEP_MAKEFILES)/common.make srcdir = . PACKAGE_NAME = gnustep-base |