From owner-svn-ports-all@FreeBSD.ORG  Tue Dec 10 19:05:42 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 34644B1F;
 Tue, 10 Dec 2013 19:05:42 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 20F1B16B3;
 Tue, 10 Dec 2013 19:05:42 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBAJ5fbU073500;
 Tue, 10 Dec 2013 19:05:41 GMT (envelope-from bapt@svn.freebsd.org)
Received: (from bapt@localhost)
 by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBAJ5fpL073497;
 Tue, 10 Dec 2013 19:05:41 GMT (envelope-from bapt@svn.freebsd.org)
Message-Id: <201312101905.rBAJ5fpL073497@svn.freebsd.org>
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Tue, 10 Dec 2013 19:05:41 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r336083 - head/Mk
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 10 Dec 2013 19:05:42 -0000

Author: bapt
Date: Tue Dec 10 19:05:41 2013
New Revision: 336083
URL: http://svnweb.freebsd.org/changeset/ports/336083

Log:
  Disable NO_ARCH for now as it prevent from upgrading from pkg 1.1 to pkg 1.2 (pkg 1.1 will not understand it and claim there invalid ABIs)
  Let's wait a bit before activating it.
  
  Reported by:	mat

Modified:
  head/Mk/bsd.licenses.mk
  head/Mk/bsd.pkgng.mk

Modified: head/Mk/bsd.licenses.mk
==============================================================================
--- head/Mk/bsd.licenses.mk	Tue Dec 10 19:03:36 2013	(r336082)
+++ head/Mk/bsd.licenses.mk	Tue Dec 10 19:05:41 2013	(r336083)
@@ -748,6 +748,7 @@ PLIST_FILES+=	${_LICENSE_DIR_REL}/${lic}
 .	endfor
 .endif
 
+_DO_INSTALL_SEQ+=	install-license
 install-license:
 	@${MKDIR} ${STAGEDIR}${_LICENSE_DIR}
 	@${INSTALL_DATA} ${_LICENSE_CATALOG_TMP} ${STAGEDIR}${_LICENSE_CATALOG}
@@ -764,10 +765,6 @@ install-license:
 	@${ECHO_CMD} "@dirrm ${_LICENSE_DIR_REL}" >> ${TMPPLIST}
 	@${ECHO_CMD} "@unexec rmdir %D/share/licenses 2>/dev/null || true" >> ${TMPPLIST}
 
-.else
-install-license:
-	@${DO_NADA}
-
 .endif
 
 .else	# !LICENSE

Modified: head/Mk/bsd.pkgng.mk
==============================================================================
--- head/Mk/bsd.pkgng.mk	Tue Dec 10 19:03:36 2013	(r336082)
+++ head/Mk/bsd.pkgng.mk	Tue Dec 10 19:05:41 2013	(r336083)
@@ -45,9 +45,9 @@ create-manifest:
 	@${ECHO_CMD} "  "${COMMENT:Q} >> ${MANIFESTF}
 	@${ECHO_CMD} "maintainer: ${MAINTAINER}" >> ${MANIFESTF}
 	@${ECHO_CMD} "prefix: ${PREFIX}" >> ${MANIFESTF}
-.if defined(NO_ARCH)
-	@${ECHO_CMD} "arch: `${PKG_BIN} config abi | ${CUT} -d: -f1,2`:*" >> ${MANIFESTF}
-.endif
+#.if defined(NO_ARCH)
+#	@${ECHO_CMD} "arch: `${PKG_BIN} config abi | ${CUT} -d: -f1,2`:*" >> ${MANIFESTF}
+#.endif
 .if defined(WWW)
 	@${ECHO_CMD} "www: ${WWW}" >> ${MANIFESTF}
 .endif