Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 16 Oct 2012 22:47:47 +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: r305992 - head/sysutils/jfbterm
Message-ID:  <201210162247.q9GMll6C036696@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Tue Oct 16 22:47:46 2012
New Revision: 305992
URL: http://svn.freebsd.org/changeset/ports/305992

Log:
  Convert to new options framework
  
  PR:		ports/172424
  Submitted by:	Michael Gmelin <freebsd@grem.de>
  Feature safe:	yes

Modified:
  head/sysutils/jfbterm/Makefile

Modified: head/sysutils/jfbterm/Makefile
==============================================================================
--- head/sysutils/jfbterm/Makefile	Tue Oct 16 22:36:40 2012	(r305991)
+++ head/sysutils/jfbterm/Makefile	Tue Oct 16 22:47:46 2012	(r305992)
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	jfbterm
-# Date created:				Feb 23 2008
-# Whom:					nrg milk <bsdports@gmail.com>
-#
+# Created by: nrg milk <bsdports@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	jfbterm
@@ -32,17 +29,19 @@ CAP_MKDB?=	/usr/bin/cap_mkdb
 TIC?=		${LOCALBASE}/bin/tic
 TERMINFO_FILE?=	${PREFIX}/share/misc/${PORTNAME}.terminfo
 
-OPTIONS=	ICONV	"encodings support"		On \
-		PNG	"splash .png support"		On \
-		TERMCAP "add entry to termcap(5) file"	On \
-		UNIFONT	"install pan-unicode font"	On
+OPTIONS_DEFINE=		ICONV PNG SETUID TERMCAP UNIFONT
+OPTIONS_DEFAULT=	ICONV PNG SETUID TERMCAP UNIFONT
+PNG_DESC=		Splash .png support
+SETUID_DESC=		Install jfbterm with setuid bit set
+TERMCAP_DESC=		Add entry to termcap(5) file
+UNIFONT_DESC=		Install pan-unicode font
 
-.if !defined(WITHOUT_SETUID)
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MSETUID}
 BINMODE?=	4555
 .endif
 
-.include <bsd.port.pre.mk>
-
 .if ${OSVERSION} >= 800504
 ONLY_FOR_ARCHS+=amd64
 .endif
@@ -58,12 +57,12 @@ MAN1=		${PORTNAME}.1
 MAN5=		${PORTNAME}.conf.5
 .endif
 
-.if defined(WITHOUT_ICONV)
+.if !${PORT_OPTIONS:MICONV}
 MAKE_ENV+=	WITHOUT_ICONV=
 .endif
 
 .if !exists(/usr/include/iconv.h)
-. if !defined(WITHOUT_ICONV)
+. if ${PORT_OPTIONS:MICONV}
 .  if !defined(NO_SHARED)
 USE_ICONV=	yes
 .  else
@@ -74,7 +73,7 @@ BUILD_DEPENDS+=	${LOCALBASE}/include/ico
 . endif
 .endif
 
-.if !defined(WITHOUT_PNG)
+.if ${PORT_OPTIONS:MPNG}
 . if !defined(NO_SHARED)
 LIB_DEPENDS+=	png15:${PORTSDIR}/graphics/png
 . else
@@ -84,7 +83,7 @@ BUILD_DEPENDS+=	${LOCALBASE}/lib/libpng.
 MAKE_ENV+=	WITHOUT_PNG=
 .endif
 
-.if !defined(WITHOUT_TERMCAP)
+.if ${PORT_OPTIONS:MTERMCAP}
 TERMCAP_ADD_RECORD=	\
 	${ECHO_CMD} '\# begin of ${PORTNAME}.termcap' \
 		>>${TERMCAP_FILE}; \
@@ -107,7 +106,7 @@ TERMCAP_ADD_RECORD=	${DO_NADA}
 TERMCAP_DEL_RECORD=	${DO_NADA}
 .endif
 
-.if !defined(WITHOUT_UNIFONT)
+.if ${PORT_OPTIONS:MUNIFONT}
 RUN_DEPENDS+=	${LOCALBASE}/lib/X11/fonts/local/unifont.pcf.gz:${PORTSDIR}/x11-fonts/gnu-unifont
 .endif
 
@@ -122,7 +121,7 @@ post-patch:	.SILENT
 	${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' \
 		-e 's|\(share\)/${PORTNAME}/\(fonts\)|\1/misc/\2|' \
 		${WRKSRC}/*.[0-9] ${WRKSRC}/*.conf.sample
-.if defined(WITHOUT_TERMCAP)
+.if !${PORT_OPTIONS:MTERMCAP}
 	${REINPLACE_CMD} '/^term/s/:.*/: xterm/' \
 		${WRKSRC}/${PORTNAME}.conf.sample
 .endif
@@ -143,10 +142,10 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/terminfo.${PORTNAME} ${PREFIX}/share/misc/${PORTNAME}.terminfo
 	${MKDIR} ${PREFIX}/share/misc/fonts
 	${INSTALL_DATA} ${WRKSRC}/fonts/*.pcf.gz ${PREFIX}/share/misc/fonts
-. if !defined(WITHOUT_TERMCAP)
+. if ${PORT_OPTIONS:MTERMCAP}
 	${TERMCAP_ADD_RECORD}
 . endif
 	-${TIC} ${TERMINFO_FILE} 2>/dev/null
 .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?201210162247.q9GMll6C036696>