Index: pike76/Makefile =================================================================== --- pike76/Makefile (revision 308417) +++ pike76/Makefile (working copy) @@ -1,13 +1,9 @@ -# New ports collection makefile for: pike75 -# Date created: 05 Feb 2004 -# Whom: kiwi@oav.net -# +# Created by: kiwi@oav.net # $FreeBSD$ -# PORTNAME= pike76 PORTVERSION= 7.6.112 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= lang MASTER_SITES= ftp://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \ http://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \ @@ -30,13 +26,12 @@ CONFLICTS= pike7[28]-[0-9]* CONFLICTS_BUILD=nettle-[2-9]* -OPTIONS_DEFINE= TTF FREETYPE OPT_CFLAGS MYSQL FFMPEG PGSQL \ +OPTIONS_DEFINE= FREETYPE OPT_CFLAGS MYSQL FFMPEG PGSQL \ SANE PDF SVG2 TDS FFTW -OPTIONS_DEFAULT=TTF FREETYPE OPT_CFLAGS MYSQL NOODBC +OPTIONS_DEFAULT=FREETYPE OPT_CFLAGS MYSQL NOODBC OPTIONS_SINGLE= ODBC OPTIONS_SINGLE_ODBC= NOODBC UNIXODBC IODBC -TTF_DESC?= Add FreeType 1 support FREETYPE_DESC?= Add FreeType 2 support OPT_CFLAGS_DESC?= Enable additional compiliation optimizations FFMPEG_DESC?= Add FFmpeg support @@ -78,6 +73,7 @@ --without-ssleay \ --without-GTK \ --without-gnome \ + --without-ttflib \ --without-glade \ --without-libglade-config \ --without-machine-code \ @@ -134,13 +130,6 @@ LIB_DEPENDS+= fftw:${PORTSDIR}/math/fftw .endif -.if ${PORT_OPTIONS:MTTF} -LIB_DEPENDS+= ttf:${PORTSDIR}/print/freetype -CONFIGURE_ARGS+= --with-ttflib -.else -CONFIGURE_ARGS+= --without-ttflib -.endif - .if ${PORT_OPTIONS:MFREETYPE} LIB_DEPENDS+= freetype:${PORTSDIR}/print/freetype2 CONFIGURE_ARGS+= --with-freetype Index: pike78/Makefile =================================================================== --- pike78/Makefile (revision 308417) +++ pike78/Makefile (working copy) @@ -2,6 +2,7 @@ PORTNAME= pike78 PORTVERSION= 7.8.700 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://pike.ida.liu.se/pub/pike/all/${PORTVERSION}/ \ ftp://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \ @@ -21,10 +22,9 @@ CONFLICTS= pike7[26]-[0-9]* -OPTIONS_DEFINE= TTF FREETYPE MYSQL PGSQL -OPTIONS_DEFAULT=TTF FREETYPE MYSQL +OPTIONS_DEFINE= FREETYPE MYSQL PGSQL +OPTIONS_DEFAULT=FREETYPE MYSQL NO_OPTIONS_SORT=yes -TTF_DESC?= Enable FreeType 1 (libttf) font rendering engine MAN1= pike.1 @@ -58,6 +58,7 @@ --without-fftw \ --without-glade \ --without-gnome \ + --without-ttflib \ --without-gssapi \ --without-java \ --without-libglade-config \ @@ -91,13 +92,6 @@ BROKEN= Does not build on FreeBSD < 8.x .endif -.if ${PORT_OPTIONS:MTTF} -LIB_DEPENDS+= ttf:${PORTSDIR}/print/freetype -CONFIGURE_ARGS+= --with-ttflib -.else -CONFIGURE_ARGS+= --without-ttflib -.endif - .if ${PORT_OPTIONS:MFREETYPE} LIB_DEPENDS+= freetype:${PORTSDIR}/print/freetype2 CONFIGURE_ARGS+= --with-freetype