From fa8e7fc56e3710cf9058bd0f55bac1a8759f2de5 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Fri, 1 Jun 2012 06:57:16 +0000 Subject: Convert to new options framework --- astro/nightfall/Makefile | 26 +++++++++++++------------- astro/viking/Makefile | 10 ++++++---- 2 files changed, 19 insertions(+), 17 deletions(-) (limited to 'astro') diff --git a/astro/nightfall/Makefile b/astro/nightfall/Makefile index b294ff8eb103..161e24a7a2d2 100644 --- a/astro/nightfall/Makefile +++ b/astro/nightfall/Makefile @@ -14,9 +14,9 @@ MASTER_SITES= http://www.la-samhna.de/nightfall/ MAINTAINER= ports@FreeBSD.org COMMENT= An interactive binary star application -OPTIONS= GNOMEUI "Enable LibGnomeUI support" off \ - PGPLOT "Enable PGPLOT support" on \ - OPENGL "Enable OpenGL support" on +OPTIONS_DEFINE= GNOME PGPLOT OPENGL +OPTIONS_DEFAULT= PGPLOT OPENGL +PGPLOT_DESC= Enable PGPLOT support USE_GNOME= gnomehack gnomehier gtk20 USE_PERL5= yes @@ -29,9 +29,9 @@ CONFIGURE_ARGS= --with-locale-prefix=${PREFIX}/share/locale MAN1= nightfall.1 -.include +.include -.if defined(WITH_GNOMEUI) +.if ${PORT_OPTIONS:MGNOMEUI} USE_GNOME+= gnomeprefix libgnomeui CONFIGURE_ARGS+= --with-gnomedoc-prefix=${PREFIX}/share INSTALLS_OMF= yes @@ -41,22 +41,22 @@ CONFIGURE_ARGS+= --disable-gnome PLIST_SUB+= GNOMEUI="@comment " .endif -.if defined(WITHOUT_PGPLOT) -RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot -CONFIGURE_ARGS+= --with-gnuplot -.else +.if ${PORT_OPTIONS:MPGPLOT} LIB_DEPENDS+= pgplot.5:${PORTSDIR}/graphics/pgplot USE_FORTRAN= yes CONFIGURE_ARGS+= --with-pgplot-include=${LOCALBASE}/include \ --with-pgplot-lib=${LOCALBASE}/lib +.else +RUN_DEPENDS+= gnuplot:${PORTSDIR}/math/gnuplot +CONFIGURE_ARGS+= --with-gnuplot .endif -.if defined(WITHOUT_OPENGL) -CONFIGURE_ARGS+= --disable-opengl -.else +.if ${PORT_OPTIONS:MOPENGL} LIB_DEPENDS+= gtkgl-2.0.1:${PORTSDIR}/x11-toolkits/gtkglarea2 USE_GL= glut CONFIGURE_ARGS+= --with-lib-GL +.else +CONFIGURE_ARGS+= --disable-opengl .endif post-patch: @@ -69,4 +69,4 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/nightfall.desktop \ ${PREFIX}/share/applications -.include +.include diff --git a/astro/viking/Makefile b/astro/viking/Makefile index 760393e61e25..146906c556c5 100644 --- a/astro/viking/Makefile +++ b/astro/viking/Makefile @@ -20,8 +20,10 @@ LIB_DEPENDS= curl.6:${PORTSDIR}/ftp/curl \ expat.6:${PORTSDIR}/textproc/expat2 RUN_DEPENDS= gpsbabel:${PORTSDIR}/astro/gpsbabel -OPTIONS= GEOTAG "Enable Geotag support" on \ - GPSD "Enable realtime GPS tracking" off +OPTIONS_DEFINE= GEOTAR GPSD +OPTIONS_DEFAULT= GEOTAG +GEOTAG_DESC= Enable Geotag support +GPSD_DESC= Enable realtime GPS tracking USE_GNOME= gnomedocutils gtk20 USE_PERL5_RUN= yes @@ -37,13 +39,13 @@ LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_LIBS} .include -.if defined(WITH_GEOTAG) +.if ${PORT_OPTIONS:MGEOTAG} LIB_DEPENDS+= exif.12:${PORTSDIR}/graphics/libexif .else CONFIGURE_ARGS+= --disable-geotag .endif -.if defined(WITH_GPSD) +.if ${PORT_OPTIONS:MGPSD} LIB_DEPENDS+= gps.20:${PORTSDIR}/astro/gpsd .else CONFIGURE_ARGS+= --disable-realtime-gps-tracking -- cgit v1.2.3