From owner-freebsd-gecko@FreeBSD.ORG  Thu Sep  6 06:17:10 2012
Return-Path: <owner-freebsd-gecko@FreeBSD.ORG>
Delivered-To: freebsd-gecko@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id AE0CF1065687
	for <freebsd-gecko@freebsd.org>; Thu,  6 Sep 2012 06:17:10 +0000 (UTC)
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: from trillian.chruetertee.ch (trillian.chruetertee.ch
	[217.150.245.56])
	by mx1.freebsd.org (Postfix) with ESMTP id 3B4C08FC1B
	for <freebsd-gecko@freebsd.org>; Thu,  6 Sep 2012 06:17:09 +0000 (UTC)
Received: from trillian.chruetertee.ch (trillian [217.150.245.56])
	by trillian.chruetertee.ch (8.14.4/8.14.3) with ESMTP id q866H2lV012460
	for <freebsd-gecko@freebsd.org>; Thu, 6 Sep 2012 06:17:02 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Received: (from www@localhost)
	by trillian.chruetertee.ch (8.14.4/8.14.3/Submit) id q866Gvjg011758
	for freebsd-gecko@freebsd.org; Thu, 6 Sep 2012 06:16:57 GMT
	(envelope-from svn-freebsd-gecko@chruetertee.ch)
Date: Thu, 6 Sep 2012 06:16:57 GMT
Message-Id: <201209060616.q866Gvjg011758@trillian.chruetertee.ch>
X-Authentication-Warning: trillian.chruetertee.ch: www set sender to
	svn-freebsd-gecko@chruetertee.ch using -f
From: svn-freebsd-gecko@chruetertee.ch
To: freebsd-gecko@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [SVN-Commit] r993 - in trunk/devel/nspr: . files
X-BeenThere: freebsd-gecko@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
Reply-To: freebsd-gecko@freebsd.org
List-Id: Gecko Rendering Engine issues <freebsd-gecko.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-gecko>
List-Post: <mailto:freebsd-gecko@freebsd.org>
List-Help: <mailto:freebsd-gecko-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-gecko>,
	<mailto:freebsd-gecko-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Sep 2012 06:17:10 -0000

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 */