[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: problems compiling packages via ports..



On Wed, Mar 16, 2005 at 11:12:40AM +0100, Marc Espie wrote:
> Current ports tree and stable source don't match. If you're still in 3.6,
> use the 3.6 branch of the ports tree.

Yeah, this seems to become the king of FAQ.

Maybe the following could help save traffic?

--- /usr/ports/infrastructure/mk/bsd.port.mk.orig	Wed Mar  9 21:00:19 2005
+++ /usr/ports/infrastructure/mk/bsd.port.mk	Wed Mar 16 20:48:14 2005
@@ -19,6 +19,9 @@
 # Enquiries as to the bsd.port.mk framework should usually be directed
 # to ports_(_at_)_openbsd_(_dot_)_org_(_dot_)_
 
+.if ${OSREV} != "3.7" || ${OSFLAVOR} != "-beta"
+ERRORS+= "Fatal: ports tree and system versions don't match."
+.endif
 
 .if ${.MAKEFLAGS:MFLAVOR=*}
 ERRORS+= "Fatal: Use 'env FLAVOR=${FLAVOR} ${MAKE}' instead."
--- /usr/src/share/mk/sys.mk.orig	Mon Mar  7 20:22:26 2005
+++ /usr/src/share/mk/sys.mk	Wed Mar 16 20:48:35 2005
@@ -11,6 +11,7 @@
 unix=		We run OpenBSD.
 OSMAJOR=	3
 OSMINOR=	7
+OSFLAVOR=	-beta
 OSREV=		$(OSMAJOR).$(OSMINOR)
 OSrev=		$(OSMAJOR)$(OSMINOR)
 

The OSFLAVOR could be empty for -release and -stable, -current for
-current. Not sure wether that -beta I'm using above makes much
sense, though.

Ciao,
	Kili