Subject: Re: pkg/32230: [patch] devel/nspr devel/nss build tweaks
To: None <pkg-manager@netbsd.org, gnats-admin@netbsd.org,>
From: Matthew Luckie <mjl@luckie.org.nz>
List: pkgsrc-bugs
Date: 12/04/2005 09:35:01
The following reply was made to PR pkg/32230; it has been noted by GNATS.
From: Matthew Luckie <mjl@luckie.org.nz>
To: gnats-bugs@NetBSD.org
Cc:
Subject: Re: pkg/32230: [patch] devel/nspr devel/nss build tweaks
Date: Sun, 4 Dec 2005 22:13:37 +1300
On Sun, Dec 04, 2005 at 09:53:57AM +0100, Thomas Klausner wrote:
> On Sun, Dec 04, 2005 at 12:25:00AM +0000, mjl@luckie.org.nz wrote:
> > >Number: 32230
> > >Category: pkg
> > >Synopsis: [patch] devel/nspr devel/nss build tweaks
>
> Patch doesn't apply. Whitespace problem? Please send it again.
>
> Thanks,
> Thomas
Index: nspr/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nspr/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- nspr/Makefile 16 Oct 2005 11:15:10 -0000 1.9
+++ nspr/Makefile 4 Dec 2005 09:10:39 -0000
@@ -39,8 +39,8 @@ pre-configure:
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/include/nspr
${INSTALL_DATA_DIR} ${PREFIX}/lib/nspr
- (cd ${WRKSRC}/dist/include && ${PAX} -Lrwpe . ${PREFIX}/include/ )
- (cd ${WRKSRC}/dist/lib && ${PAX} -Lrwpe . ${PREFIX}/lib/nspr/ )
+ (cd ${WRKSRC}/dist/include && ${PAX} -Lrwpp . ${PREFIX}/include/ )
+ (cd ${WRKSRC}/dist/lib && ${PAX} -Lrwpp . ${PREFIX}/lib/nspr/ )
${INSTALL_SCRIPT} ${WRKSRC}/config/nspr-config ${PREFIX}/bin
${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig
{ ${ECHO} "Name: NSPR"; \
Index: nss/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nss/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- nss/Makefile 16 Oct 2005 11:15:10 -0000 1.10
+++ nss/Makefile 4 Dec 2005 09:10:39 -0000
@@ -42,10 +42,12 @@ PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX}
MAKEFLAGS+= NS_USE_GCC=YES
.endif
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
+.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
NSS_OBJ_DIR= ${OPSYS}${OS_VERSION}_OPT.OBJ
+.elif ${OPSYS} == "FreeBSD"
+NSS_OBJ_DIR= ${OPSYS}${OS_VERSION:C/[-].*//}_OPT.OBJ
.elif ${OPSYS} == "Linux"
-_NSS_SHORT_OS_VERSION!= echo ${OS_VERSION} | ${SED} -e 's/^\([[:digit:]]\.[[:digit:]]\)\..*$$/\1/'
+_NSS_SHORT_OS_VERSION!= ${ECHO} ${OS_VERSION} | ${SED} -e 's/^\([[:digit:]]\.[[:digit:]]\)\..*$$/\1/'
.if ${MACHINE_ARCH} == "i386"
_NSS_MACHINE_ARCH= _x86
.elif ${MACHINE_ARCH} == "parisc" || ${MACHINE_ARCH} == "parisc64"
@@ -65,9 +67,9 @@ pre-configure:
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/include/nss
${INSTALL_DATA_DIR} ${PREFIX}/lib/nss
- (cd ${DIST}/public && ${PAX} -Lrwpe . ${PREFIX}/include/nss/ )
+ (cd ${DIST}/public && ${PAX} -Lrwpp . ${PREFIX}/include/nss/ )
(cd ${DIST}/${NSS_OBJ_DIR}/lib && \
- ${PAX} -Lrwpe *.${SO_SUFFIX} ${PREFIX}/lib/nss/ )
+ ${PAX} -Lrwpp *.${SO_SUFFIX} ${PREFIX}/lib/nss/ )
{ ${ECHO} "Name: NSS"; \
${ECHO} "Description: Mozilla Network Security Services"; \
${ECHO} "Version: ${PKGVERSION}"; \