From owner-svn-ports-head@FreeBSD.ORG Fri Apr 26 09:23:57 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id F0F2EFEC; Fri, 26 Apr 2013 09:23:56 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id E1AEF1C17; Fri, 26 Apr 2013 09:23:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r3Q9Nu7r096369; Fri, 26 Apr 2013 09:23:56 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r3Q9NsrN096353; Fri, 26 Apr 2013 09:23:54 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201304260923.r3Q9NsrN096353@svn.freebsd.org> From: Baptiste Daroussin Date: Fri, 26 Apr 2013 09:23:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r316593 - in head: cad/layouteditor chinese/bg5ps graphics/gltt graphics/ocaml-images graphics/py-paint misc/magicpoint print/freetype print/latex-cjk print/ttftot42 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Apr 2013 09:23:57 -0000 Author: bapt Date: Fri Apr 26 09:23:54 2013 New Revision: 316593 URL: http://svnweb.freebsd.org/changeset/ports/316593 Log: In preparation of the removal of USE_FREETYPE from bsd.port.mk: remove USE_FREETYPE from all ports using it While here trim some headers, and do some conversion to new options framework. Modified: head/cad/layouteditor/Makefile head/chinese/bg5ps/Makefile head/graphics/gltt/Makefile head/graphics/ocaml-images/Makefile head/graphics/py-paint/Makefile head/graphics/py-paint/pkg-plist head/misc/magicpoint/Makefile head/print/freetype/Makefile head/print/latex-cjk/Makefile head/print/ttftot42/Makefile Modified: head/cad/layouteditor/Makefile ============================================================================== --- head/cad/layouteditor/Makefile Fri Apr 26 09:19:34 2013 (r316592) +++ head/cad/layouteditor/Makefile Fri Apr 26 09:23:54 2013 (r316593) @@ -1,9 +1,5 @@ -# New ports collection makefile for: layouteditor -# Date created: Sun, Apr 29 2007 -# Whom: Hiroki Sato -# +# Created by: Hiroki Sato # $FreeBSD$ -# PORTNAME= layouteditor PORTVERSION= 0.0.20110614 @@ -16,10 +12,11 @@ DISTNAME= LayoutEditor-${PORTVERSION:S,^ MAINTAINER= hrs@FreeBSD.org COMMENT= IC/MEMS layout editor +LIB_DEPENDS= ttf:${PORTSDIR}/print/freetype + USE_QT4= corelib gui network moc_build sql uic_build \ rcc_build qmake qt3support xml USE_ZIP= yes -USE_FREETYPE= yes WRKSRC= ${WRKDIR}/layout PLIST_FILES= bin/layout Modified: head/chinese/bg5ps/Makefile ============================================================================== --- head/chinese/bg5ps/Makefile Fri Apr 26 09:19:34 2013 (r316592) +++ head/chinese/bg5ps/Makefile Fri Apr 26 09:23:54 2013 (r316593) @@ -1,9 +1,5 @@ -# New ports collection makefile for: bg5ps -# Date created: 17 June 1998 -# Whom: Jing-Tang Keith Jang -# +# Created by: Jing-Tang Keith Jang # $FreeBSD$ -# PORTNAME= bg5ps PORTVERSION= 1.3.0p3 @@ -15,17 +11,20 @@ DISTNAME= bg5ps-1.3.0 MAINTAINER= ports@FreeBSD.org COMMENT= Convert Chinese-Big5/GB encoded files to Postscript, using TTF fonts -USE_FREETYPE= yes +LIB_DEPENDS= ttf:${PORTSDIR}/print/freetype + USE_PYTHON= yes PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES= pkg-message +.include + do-install: ${INSTALL_SCRIPT} ${WRKSRC}/bg5ps ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/ttf2psm ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/bg5ps.conf ${PREFIX}/etc/bg5ps.conf.sample ${INSTALL_DATA} ${WRKSRC}/gb2312-bg5ps.conf ${PREFIX}/etc/gb2312-bg5ps.conf.sample -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${CP} -R ${WRKSRC}/doc/* ${DOCSDIR} .endif Modified: head/graphics/gltt/Makefile ============================================================================== --- head/graphics/gltt/Makefile Fri Apr 26 09:19:34 2013 (r316592) +++ head/graphics/gltt/Makefile Fri Apr 26 09:23:54 2013 (r316593) @@ -1,9 +1,5 @@ -# New ports collection makefile for: gltt -# Date created: 12 Aug 2002 -# Whom: Igor Pokrovsky -# +# Created by: Igor Pokrovsky # $FreeBSD$ -# PORTNAME= gltt PORTVERSION= 2.5.2 @@ -14,9 +10,10 @@ MASTER_SITES= http://gltt.sourceforge.ne MAINTAINER= ports@FreeBSD.org COMMENT= TrueType fonts rendering using OpenGL +LIB_DEPENDS= ttf:${PORTSDIR}/print/freetype + USE_AUTOTOOLS= libtool USE_GL= gl glut -USE_FREETYPE= yes USE_GMAKE= yes GNU_CONFIGURE= yes CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib" Modified: head/graphics/ocaml-images/Makefile ============================================================================== --- head/graphics/ocaml-images/Makefile Fri Apr 26 09:19:34 2013 (r316592) +++ head/graphics/ocaml-images/Makefile Fri Apr 26 09:23:54 2013 (r316593) @@ -36,67 +36,62 @@ LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS+= --without-lablgtk MAKE_JOBS_UNSAFE= yes -OPTIONS= PNG "Enable PNG support" on \ - JPEG "Enable JPEG support" on \ - TIFF "Enable TIFF support" on \ - XPM "Enable XPM support" on \ - GIF "Enable GIF support" on \ - FREETYPE "Enable text rendering via freetype" on \ - GS "Enable PostScript support via Ghostscript" on \ - GTK2 "Enable LablGTK2 support" off +OPTIONS_DEFINE= PNG JPEG TIFF XPM GIF FREETYPE GS GTK2 DOCS +OPTIONS_DEFAULT= PNG JPEG TIFF XPM GIT FREETYPE GS +GS_DESC= PostScript support via Ghostscript .include -.if !defined(WITHOUT_PNG) +.if ${PORT_OPTIONS:MPNG} LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png CONFIGURE_ARGS+= --with-png .else CONFIGURE_ARGS+= --without-png .endif -.if !defined(WITHOUT_JPEG) +.if ${PORT_OPTIONS:MJPEG} LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg CONFIGURE_ARGS+= --with-jpeg .else CONFIGURE_ARGS+= --without-jpeg .endif -.if !defined(WITHOUT_TIFF) +.if ${PORT_OPTIONS:MTIFF} LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff CONFIGURE_ARGS+= --with-tiff .else CONFIGURE_ARGS+= --without-tiff .endif -.if !defined(WITHOUT_XPM) +.if ${PORT_OPTIONS:MXPM} USE_XORG= xpm CONFIGURE_ARGS+= --with-xpm .else CONFIGURE_ARGS+= --without-xpm .endif -.if !defined(WITHOUT_GIF) +.if ${PORT_OPTIONS:MGIF} LIB_DEPENDS+= gif.5:${PORTSDIR}/graphics/giflib CONFIGURE_ARGS+= --with-gif .else CONFIGURE_ARGS+= --without-gif .endif -.if !defined(WITHOUT_FREETYPE) -USE_FREETYPE= yes +.if ${PORT_OPTIONS:MFREETYPE} +LIB_DEPENDS+= ttf:${PORTSDIR}/print/freetype CONFIGURE_ARGS+= --with-freetype .else CONFIGURE_ARGS+= --without-freetype .endif -.if defined(WITH_GS) +.if ${PORT_OPTIONS:MGS} USE_GHOSTSCRIPT= yes CONFIGURE_ARGS+= --with-gs .else CONFIGURE_ARGS+= --without-gs .endif -.if defined(WITH_GTK2) +.if ${PORT_OPTIONS:MGTK2} CONFIGURE_ARGS+= --with-lablgtk2 BUILD_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 RUN_DEPENDS+= lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 @@ -112,12 +107,12 @@ GNU_CONFIGURE= yes DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} DOCSFILES= CHANGES README LICENSE -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} PORTDOCS= ${DOCSFILES} doc .endif post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR}/doc @(cd ${WRKSRC} && ${COPYTREE_SHARE} \* ${DOCSDIR}/doc '-name "*.jpg" -o -name "*.html"') @${INSTALL_DATA} ${DOCSFILES:S,^,${WRKSRC}/,g} ${DOCSDIR}/ Modified: head/graphics/py-paint/Makefile ============================================================================== --- head/graphics/py-paint/Makefile Fri Apr 26 09:19:34 2013 (r316592) +++ head/graphics/py-paint/Makefile Fri Apr 26 09:23:54 2013 (r316593) @@ -1,13 +1,9 @@ -# New ports collection makefile for: py-paint -# Date created: 8 July 2001 -# Whom: Hye-Shik Chang -# +# Created by: Hye-Shik Chang # $FreeBSD$ -# PORTNAME= paint PORTVERSION= 0.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics python MASTER_SITES= SF/py${PORTNAME}/py${PORTNAME}/py${PORTNAME}%20${PORTVERSION} PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,11 +12,11 @@ DISTNAME= pypaint-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Simple and flexible painting adaptor to libart for Python -LIB_DEPENDS= png15:${PORTSDIR}/graphics/png +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ + ttf:${PORTSDIR}/print/freetype USE_PYTHON= yes USE_PYDISTUTILS= yes -USE_FREETYPE= yes USE_GNOME= libartlgpl2 NO_WRKSUBDIR= yes CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/libart-2.0 \ @@ -29,10 +25,11 @@ LDFLAGS+= -L${LOCALBASE}/lib EXAMPLESDIR= ${PREFIX}/share/examples/py-${PORTNAME} +.include post-patch: @${REINPLACE_CMD} -e "s,art_lgpl,art_lgpl_2," ${WRKSRC}/setup.py -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MEXAMPLES} post-install: @${MKDIR} ${EXAMPLESDIR} ${CP} ${WRKSRC}/test* ${EXAMPLESDIR} Modified: head/graphics/py-paint/pkg-plist ============================================================================== --- head/graphics/py-paint/pkg-plist Fri Apr 26 09:19:34 2013 (r316592) +++ head/graphics/py-paint/pkg-plist Fri Apr 26 09:23:54 2013 (r316593) @@ -1,5 +1,5 @@ %%PYTHON_SITELIBDIR%%/paint.so -%%PORTDOCS%%%%EXAMPLESDIR%%/test_bar.py -%%PORTDOCS%%%%EXAMPLESDIR%%/test_paint.py -%%PORTDOCS%%%%EXAMPLESDIR%%/testpie.py -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_bar.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/test_paint.py +%%PORTEXAMPLES%%%%EXAMPLESDIR%%/testpie.py +%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%% Modified: head/misc/magicpoint/Makefile ============================================================================== --- head/misc/magicpoint/Makefile Fri Apr 26 09:19:34 2013 (r316592) +++ head/misc/magicpoint/Makefile Fri Apr 26 09:23:54 2013 (r316593) @@ -14,7 +14,7 @@ LIB_DEPENDS+= png15:${PORTSDIR}/graphics mng:${PORTSDIR}/graphics/libmng RUN_DEPENDS+= pnmscale:${PORTSDIR}/graphics/netpbm -USE_IMAKE= yes +USE_IMAKE= yese USE_XORG= x11 xext xmu xt sm ice xi xtst WANT_GNOME= yes GNU_CONFIGURE= yes @@ -46,7 +46,7 @@ NO_OPTIONS_SORT=yes .if ${PORT_OPTIONS:MFREETYPE} # Only freetype 1.x is supported -USE_FREETYPE= yes +LIB_DEPENDS+= ttf:${PORTSDIR}/print/freetype CONFIGURE_ARGS+= --enable-freetype \ --enable-freetype-charset16 .else Modified: head/print/freetype/Makefile ============================================================================== --- head/print/freetype/Makefile Fri Apr 26 09:19:34 2013 (r316592) +++ head/print/freetype/Makefile Fri Apr 26 09:23:54 2013 (r316593) @@ -1,9 +1,5 @@ -# New ports collection makefile for: freetype -# Date created: January 24, 1998 -# Whom: jseger@FreeBSD.org -# +# Created by: jseger@FreeBSD.org # $FreeBSD$ -# PORTNAME= freetype PORTVERSION= 1.3.1 @@ -25,10 +21,6 @@ CONFIGURE_ARGS= --disable-nls --enable-s PORTSCOUT= limit:^1\. -.ifdef USE_FREETYPE -IGNORE= cannot be installed: you have the 'USE_FREETYPE' variable defined either in environment or in make(1) arguments. Please undefine and try again -.endif - post-patch: @${REINPLACE_CMD} -e 's|$${CONFIG_SHELL-/bin/sh} $$ac_aux_dir|$$ac_aux_dir|' \ ${WRKSRC}/configure Modified: head/print/latex-cjk/Makefile ============================================================================== --- head/print/latex-cjk/Makefile Fri Apr 26 09:19:34 2013 (r316592) +++ head/print/latex-cjk/Makefile Fri Apr 26 09:23:54 2013 (r316593) @@ -19,9 +19,9 @@ RUN_DEPENDS= zh-arphicttf>=0:${PORTSDIR} BUILD_DEPENDS:= ${RUN_DEPENDS} \ ${LOCALBASE}/share/ttf2pt1/maps/cugb.map:${PORTSDIR}/chinese/ttf2pt1 \ ttf2pt1:${PORTSDIR}/print/ttf2pt1 +LIB_DEPENDS= ttf:${PORTSDIR}/print/freetype USE_GMAKE= yes -USE_FREETYPE= yes MAN1= bg5conv.1 cef5conv.1 cefconv.1 cefsconv.1 extconv.1 \ hbf2gf.1 sjisconv.1 Modified: head/print/ttftot42/Makefile ============================================================================== --- head/print/ttftot42/Makefile Fri Apr 26 09:19:34 2013 (r316592) +++ head/print/ttftot42/Makefile Fri Apr 26 09:23:54 2013 (r316593) @@ -1,9 +1,5 @@ -# New ports collection makefile for: ttftot42 -# Date created: 22 April 2001 -# Whom: Yukihiro Nakai -# +# Created by: Yukihiro Nakai # $FreeBSD$ -# PORTNAME= ttftot42 PORTVERSION= 0.3.1 @@ -14,7 +10,7 @@ MASTER_SITES= http://www.nih.at/ttftot42 MAINTAINER= ports@FreeBSD.org COMMENT= TrueType to Type42 font converter -USE_FREETYPE= yes +LIB_DEPENDS= ttf:${PORTSDIR}/print/freetype GNU_CONFIGURE= yes PLIST_FILES= bin/ttftot42