| From: | Hiroki Sato <hrs@xxxxxxxxxx> |
| Date: | Fri, 07 Jan 2005 05:19:32 +0900 (JST) |
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
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) && \
Attachment:
pgp00010.pgp
Description: PGP signature