patch for bsd.port.mk to check PORTVERSION mismatch
----Security_Multipart0(Fri_Jan__7_05_19_32_2005_005)--
Content-Type: Multipart/Mixed;
boundary="--Next_Part(Fri_Jan__7_05_19_32_2005_846)--"
Content-Transfer-Encoding: 7bit
----Next_Part(Fri_Jan__7_05_19_32_2005_846)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Hi,
I think it is better to add a check if the PORTVERSION of ports/foo/bar
and dfports/foo/bar are different or not. The ports closely depend
on each other, so the new ports tree and the old dfports tree can
cause various problems (see
http://leaf.dragonflybsd.org/mailarchive/bugs/2005-01/msg00007.html,
for example).
A patch to add the check is attached.
--
| Hiroki SATO
----Next_Part(Fri_Jan__7_05_19_32_2005_846)--
Content-Type: Text/Plain; charset=us-ascii
Content-Transfer-Encoding: 7bit
Content-Disposition: inline; filename="bsd.port.mk.diff"
Index: bsd.port.mk
===================================================================
RCS file: /cvs/src/share/mk/bsd.port.mk,v
retrieving revision 1.23
diff -d -u -I\$FreeBSD:.*\$ -I\$NetBSD:.*\$ -I\$OpenBSD:.*\$ -I\$DragonFly:.*\$ -I\$Id:.*\$ -I\$hrs:.*\$ -r1.23 bsd.port.mk
--- bsd.port.mk 28 Nov 2004 22:29:19 -0000 1.23
+++ bsd.port.mk 6 Jan 2005 20:11:22 -0000
@@ -81,6 +81,11 @@
TARGETS+= install
TARGETS+= tags
+DFPORTVERSION!= cd ${DFPORTSDIR}/${PORTPATH} && ${MAKE} -VPORTVERSION
+.if ${DFPORTVERSION} != ${PORTVERSION}
+.error ERROR: version mismatch (${DFPORTVERSION} != ${PORTVERSION})
+.endif
+
.if !defined(_DFPORTS_REDIRECT)
_DFPORTS_REDIRECT=
.if !make(package-depends-list) && !make(all-depends-list) && \
----Next_Part(Fri_Jan__7_05_19_32_2005_846)----
----Security_Multipart0(Fri_Jan__7_05_19_32_2005_005)--
Content-Type: application/pgp-signature
Content-Transfer-Encoding: 7bit
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (FreeBSD)
iD8DBQBB3Z1UTyzT2CeTzy0RApqnAKCyZAn91brBYZVU3yN6MGVz3LQfhgCgj+lK
gWBCq1WJp/RZ0xL4h3Dykfo=
=SzvU
-----END PGP SIGNATURE-----
----Security_Multipart0(Fri_Jan__7_05_19_32_2005_005)----
討論串 (同標題文章)
完整討論串 (本文為第 1 之 4 篇)：