cvs commit: ports/net/freeswitch-core Makefile

[Anonymous]

Josh Paetzel <jpaetzel at FreeBSD.org> writes:

> jpaetzel    2010-07-16 17:29:05 UTC
>
>   FreeBSD ports repository
>
>   Modified files:
>     net/freeswitch-core  Makefile
>   Log:
>   Move check for OSVERSION to a better place in the Makefile

OSVERSION is defined in bsd.port.mk, not before.

  $ make
  "Makefile", line 67: Malformed conditional (${OSVERSION} < 700000)
  "Makefile", line 69: if-less endif
  make: fatal errors encountered -- cannot continue

%%
Index: Makefile
===================================================================
RCS file: /a/.cvsup/ports/net/freeswitch-core/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile	16 Jul 2010 17:29:05 -0000	1.5
+++ Makefile	16 Jul 2010 21:21:29 -0000
@@ -64,10 +64,6 @@ CONFIGURE_ENV+=	CPPFLAGS="${CXXFLAGS} -I
 USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${PREFIX}/include
 
-.if ${OSVERSION} < 700000
-IGNORE=		freeswitch is only supported on FreeBSD 7 or newer
-.endif
-
 FREESWITCH_USER=	freeswitch
 FREESWITCH_GROUP=	${FREESWITCH_USER}
 
@@ -122,6 +118,10 @@ OPTIONS=	MODSHOUT        "Enable mod_sho
 
 .include <bsd.port.options.mk>
 
+.if ${OSVERSION} < 700000
+IGNORE=		freeswitch is only supported on FreeBSD 7 or newer
+.endif
+
 .if ${ARCH} == "amd64"
 CFLAGS+=	-fPIC
 .endif
%%

>   
>   Revision  Changes    Path
>   1.5       +4 -5      ports/net/freeswitch-core/Makefile