Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 2 May 2013 14:44:50 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r317124 - head/lang/ofc
Message-ID:  <201305021444.r42Eio6j088123@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Thu May  2 14:44:50 2013
New Revision: 317124
URL: http://svnweb.freebsd.org/changeset/ports/317124

Log:
  Please bmake(1)
  Do not hardcode make(1)
  Trim headers
  Convert to new options framework

Modified:
  head/lang/ofc/Makefile

Modified: head/lang/ofc/Makefile
==============================================================================
--- head/lang/ofc/Makefile	Thu May  2 14:34:29 2013	(r317123)
+++ head/lang/ofc/Makefile	Thu May  2 14:44:50 2013	(r317124)
@@ -1,9 +1,5 @@
-# Ports collection makefile for:	ofc
-# Date created:				06/21/2006
-# Whom:					vanilla
-#
+# Created by: vanilla
 # $FreeBSD$
-#
 
 PORTNAME=	ofc
 PORTVERSION=	0.8.1
@@ -27,29 +23,28 @@ USE_LDCONFIG=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
-OPTIONS=	GDBM "Add gdbm support" off \
-		GMP "Add gmp support" off
+OPTIONS_DEFINE=	GDBM GMP
 
-.if defined (WITH_GDBM)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGDBM}
 LIB_DEPENDS+=	gdbm.4:${PORTSDIR}/databases/gdbm
 .endif
 
-.if defined (WITH_GMP)
+.if ${PORT_OPTIONS:MGMP}
 LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} >= 900000
 # needs libobjc
 GCCSUFFIX=42
 CC=		gcc${GCCSUFFIX}
 CXX=		g++${GCCSUFFIX}
 OFC_GCC_PORT?=	lang/gcc${GCCSUFFIX}
-TARGLIB!=	(cd ${PORTSDIR}/${OFC_GCC_PORT} && make -V TARGLIB)
+TARGLIB!=	${MAKE} -C ${PORTSDIR}/${OFC_GCC_PORT} -V TARGLIB
 LDFLAGS+=	-L${TARGLIB}
 BUILD_DEPENDS+=	${TARGLIB}/libobjc.so:${PORTSDIR}/${OFC_GCC_PORT}
 RUN_DEPENDS+=	${TARGLIB}/libobjc.so:${PORTSDIR}/${OFC_GCC_PORT}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201305021444.r42Eio6j088123>