pkg/32230: [patch] devel/nspr devel/nss build tweaks

[mjl%luckie.org.nz@localhost]

>Number:         32230
>Category:       pkg
>Synopsis:       [patch] devel/nspr devel/nss build tweaks
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Sun Dec 04 00:25:00 +0000 2005
>Originator:     Matthew Luckie
>Release:        NetBSD 2.0.2
>Organization:
        
>Environment:
        
        
System: NetBSD spandex.plunket.luckie.org.nz 2.0.2 NetBSD 2.0.2 (spandex) #4: 
Mon Aug 29 20:11:26 NZST 2005 
root%spandex.plunket.luckie.org.nz@localhost:/usr/src/sys/arch/i386/compile/spandex
 i386
Architecture: i386
Machine: i386
>Description:
There are two minor issues in nss and nspr addressed by these patches.

The first is that the Makefiles for both nss and nspr are passing -pe to pax,
which causes the uid of the builder to be preserved in installation.  If built
by a non-root user, the owner is not updated to root.  This was reported to me
in private mail by Philipp Lay.

The second is that nss won't install on FreeBSD.  This is because the
build procedure by nss strips everything after the hyphen in uname -r
out in nss-3.9.2/mozilla/nsprpub/config/arch.mk

  #
  # Handle FreeBSD 2.2-STABLE and Linux 2.0.30-osfmach3
  #

  ifeq (,$(filter-out Linux FreeBSD,$(OS_ARCH)))
  OS_RELEASE    := $(shell echo "$(OS_RELEASE)" | sed 's/-.*//')
  endif

The fix was provided in private mail by Anders Nor Berle.

Finally, pkglint complains about the use of echo in nss/Makefile.  this
change was committed by reed@

[mjl@spandex nss]$ pkglint
WARN: Makefile:50: Possible direct use of "echo" in variable 
_NSS_SHORT_OS_VERSION. Please use ${ECHO} instead.
0 errors and 1 warnings found.
>How-To-Repeat:
issue 1: build as normal user, install as root.
issue 2: build on FreeBSD.
>Fix:
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nss/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile    16 Oct 2005 11:15:10 -0000      1.10
+++ Makefile    4 Dec 2005 00:05:37 -0000
@@ -42,8 +42,10 @@ 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/'
 .if ${MACHINE_ARCH} == "i386"
@@ -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}"; \
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nspr/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile    16 Oct 2005 11:15:10 -0000      1.9
+++ Makefile    4 Dec 2005 00:14:55 -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"; \

>Unformatted: