[SVN-Commit] r993 - in trunk/devel/nspr: . files

[svn-freebsd-gecko at chruetertee.ch]

Author: jbeich
Date: Thu Sep  6 06:16:57 2012
New Revision: 993

Log:
backout r989, too hackish and untested on tier3 archs

Let upstream deal with lots of (nearly-)identical *.cfg.

Deleted:
   trunk/devel/nspr/files/patch-..::pr::include::md::_linux.cfg
Modified:
   trunk/devel/nspr/Makefile

Modified: trunk/devel/nspr/Makefile
==============================================================================
--- trunk/devel/nspr/Makefile	Wed Sep  5 16:16:29 2012	(r992)
+++ trunk/devel/nspr/Makefile	Thu Sep  6 06:16:57 2012	(r993)
@@ -36,10 +36,7 @@
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e '/MDCPUCFG_H/s/freebsd/linux/' \
-		-e 's,-lpthread,${PTHREAD_LIBS},g' \
-		-e 's,echo aout,echo elf,g' \
-		${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's,-lpthread,${PTHREAD_LIBS},g ; s,echo aout,echo elf,g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 do-install:
 	${MKDIR} ${PREFIX}/include/nspr

Deleted: trunk/devel/nspr/files/patch-..::pr::include::md::_linux.cfg
==============================================================================
--- trunk/devel/nspr/files/patch-..::pr::include::md::_linux.cfg	Thu Sep  6 06:16:57 2012	(r992)
+++ /dev/null	00:00:00 1970	(deleted)
@@ -1,15 +0,0 @@
---- ../pr/include/md/_linux.cfg
-+++ ../pr/include/md/_linux.cfg
-@@ -17,9 +17,11 @@
- 
- #if !defined(LINUX) && defined(__linux__)
- #define LINUX
-+#elif !defined(FREEBSD) && defined(__FreeBSD__)
-+#define FREEBSD
- #endif
- 
--#ifdef __FreeBSD_kernel__
-+#if defined(__FreeBSD_kernel__) || defined(__FreeBSD__)
- #define PR_AF_INET6 28  /* same as AF_INET6 */
- #elif defined(__GNU__)
- #define PR_AF_INET6 26  /* same as AF_INET6 */