Date: Fri, 28 Jun 2013 21:19:32 +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: r321988 - in head/graphics: SciPlot colord gdk-pixbuf2 lfview librsvg2 pixmap plotmtv poppler-glib xbmbrowser xmagv xoris xtexcad xwpick Message-ID: <201306282119.r5SLJW6s000351@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Fri Jun 28 21:19:31 2013 New Revision: 321988 URL: http://svnweb.freebsd.org/changeset/ports/321988 Log: Convert to USES=imake While here: Trim headers, Remove some indefinite article Mark xmagv as broken given it doesn't build Convert to new options framework Modified: head/graphics/SciPlot/Makefile head/graphics/colord/Makefile head/graphics/gdk-pixbuf2/Makefile head/graphics/lfview/Makefile head/graphics/librsvg2/Makefile head/graphics/pixmap/Makefile head/graphics/plotmtv/Makefile head/graphics/poppler-glib/Makefile head/graphics/xbmbrowser/Makefile head/graphics/xmagv/Makefile head/graphics/xoris/Makefile head/graphics/xtexcad/Makefile head/graphics/xwpick/Makefile Modified: head/graphics/SciPlot/Makefile ============================================================================== --- head/graphics/SciPlot/Makefile Fri Jun 28 21:17:09 2013 (r321987) +++ head/graphics/SciPlot/Makefile Fri Jun 28 21:19:31 2013 (r321988) @@ -1,6 +1,4 @@ -# New ports collection makefile for: SciPlot -# Date created: Mon June 8 2004 -# Whom: thierry@pompo.net +# Created by: thierry@pompo.net # # $FreeBSD$ # @@ -13,10 +11,10 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= widgets MAINTAINER= thierry@FreeBSD.org -COMMENT= A full-featured Xt widget to display 2D data in a graph +COMMENT= Full-featured Xt widget to display 2D data in a graph +USES= imake USE_MOTIF= yes -USE_IMAKE= yes USE_XORG= xp MAKE_ENV= EXTRA_DEFINES="-fPIC" LIBNAME=${LIBNAME} USE_LDCONFIG= yes Modified: head/graphics/colord/Makefile ============================================================================== --- head/graphics/colord/Makefile Fri Jun 28 21:17:09 2013 (r321987) +++ head/graphics/colord/Makefile Fri Jun 28 21:19:31 2013 (r321988) @@ -30,6 +30,7 @@ CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ENV= USB_CFLAGS="-I/usr/include" \ USB_LIBS="-L/usr/lib -lusb" +MAKE_ENV+= GI_SCANNER_DISABLE_CACHE=yes OPTIONS_DEFINE= SANE MANPAGES Modified: head/graphics/gdk-pixbuf2/Makefile ============================================================================== --- head/graphics/gdk-pixbuf2/Makefile Fri Jun 28 21:17:09 2013 (r321987) +++ head/graphics/gdk-pixbuf2/Makefile Fri Jun 28 21:19:31 2013 (r321988) @@ -26,6 +26,7 @@ GNU_CONFIGURE= yes CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib CONFIGURE_ARGS= --enable-introspection=yes --with-x11 +MAKE_ENV+= GI_SCANNER_DISABLE_CACHE=yes MAN1= gdk-pixbuf-csource.1 gdk-pixbuf-query-loaders.1 Modified: head/graphics/lfview/Makefile ============================================================================== --- head/graphics/lfview/Makefile Fri Jun 28 21:17:09 2013 (r321987) +++ head/graphics/lfview/Makefile Fri Jun 28 21:19:31 2013 (r321988) @@ -1,9 +1,5 @@ -# ports collection makefile for: lfview -# Date created: 24 February 1999 -# Whom: Yuu Yashiki -# +# Created by: Yuu Yashiki # $FreeBSD$ -# PORTNAME= lfview PORTVERSION= 1.1a @@ -15,7 +11,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Graphic viewer for Leaf products -USE_IMAKE= yes +USES= imake USE_XORG= x11 xext USE_LDCONFIG= yes NO_INSTALL_MANPAGES= yes @@ -31,7 +27,7 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/lfview ${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/plugins/liblfv_leaf.so.1 ${PREFIX}/lib ${LN} -s ${PREFIX}/lib/liblfv_leaf.so.1 ${PREFIX}/lib/liblfv_leaf.so -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} ${MKDIR} ${PREFIX}/share/doc/ja/lfview ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/ja/lfview .endif Modified: head/graphics/librsvg2/Makefile ============================================================================== --- head/graphics/librsvg2/Makefile Fri Jun 28 21:17:09 2013 (r321987) +++ head/graphics/librsvg2/Makefile Fri Jun 28 21:19:31 2013 (r321988) @@ -31,6 +31,7 @@ CONFIGURE_ARGS= --with-svgz \ --enable-gtk-theme CROCO_VERSION= 0.6 MAN1= rsvg-convert.1 +MAKE_ENV+= GI_SCANNER_DISABLE_CACHE=yes post-patch: @${REINPLACE_CMD} -e 's|GTK3_REQUIRED=3.0.0|GTK3_REQUIRED=9.90.0|g' \ Modified: head/graphics/pixmap/Makefile ============================================================================== --- head/graphics/pixmap/Makefile Fri Jun 28 21:17:09 2013 (r321987) +++ head/graphics/pixmap/Makefile Fri Jun 28 21:19:31 2013 (r321988) @@ -20,8 +20,8 @@ BUILD_DEPENDS= showrgb:${PORTSDIR}/x11/r WRKSRC= ${WRKDIR}/${PORTNAME} +USES= imake USE_XORG= xpm xbitmaps x11 xaw xmu xt sm ice xext -USE_IMAKE= yes CFLAGS+= -D_X_SENTINEL\(x\)= -D_X_ATTRIBUTE_PRINTF\(x,y\)= \ -D_X_DEPRECATED= -DUSG Modified: head/graphics/plotmtv/Makefile ============================================================================== --- head/graphics/plotmtv/Makefile Fri Jun 28 21:17:09 2013 (r321987) +++ head/graphics/plotmtv/Makefile Fri Jun 28 21:19:31 2013 (r321988) @@ -1,9 +1,5 @@ -# New ports collection makefile for: Plotmtv -# Date created: 19 October 1996 -# Whom: pgs -# +# Created by: pgs # $FreeBSD$ -# PORTNAME= plotmtv PORTVERSION= 1.4.1 @@ -16,19 +12,21 @@ MASTER_SITE_SUBDIR= applications EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org -COMMENT= A multipurpose X11 plotting program +COMMENT= Multipurpose X11 plotting program -USE_IMAKE= yes +USES= imake USE_XORG= x11 xext xt ALL_TARGET= World MAN1= plotmtv.1 MAKE_JOBS_UNSAFE= yes +.include <bsd.port.options.mk> + post-patch: @${FIND} ${WRKSRC} -name \*.c | ${XARGS} ${REINPLACE_CMD} -e 's/<malloc.h>/<stdlib.h>/' post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${PREFIX}/share/doc/plotmtv/Tests @${INSTALL_DATA} ${WRKSRC}/Docs/DataFormat.ps.Z \ ${PREFIX}/share/doc/plotmtv @@ -49,4 +47,4 @@ post-install: .endfor .endif -.include <bsd.port.mk> +.include <bsd.port.mk> Modified: head/graphics/poppler-glib/Makefile ============================================================================== --- head/graphics/poppler-glib/Makefile Fri Jun 28 21:17:09 2013 (r321987) +++ head/graphics/poppler-glib/Makefile Fri Jun 28 21:19:31 2013 (r321988) @@ -11,6 +11,7 @@ COMMENT= Glib bindings to poppler MASTERDIR= ${.CURDIR}/../../graphics/poppler SLAVEPORT= glib PLIST= ${.CURDIR}/pkg-plist +MAKE_ENV+= GI_SCANNER_DISABLE_CACHE=yes pre-build: @cd ${WRKSRC}/poppler && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} \ Modified: head/graphics/xbmbrowser/Makefile ============================================================================== --- head/graphics/xbmbrowser/Makefile Fri Jun 28 21:17:09 2013 (r321987) +++ head/graphics/xbmbrowser/Makefile Fri Jun 28 21:19:31 2013 (r321988) @@ -1,9 +1,5 @@ -# New ports collection makefile for: xbmbrowser -# Date created: 06 September 1995 -# Whom: Thomas Gellekum <tg@FreeBSD.org> -# +# Created by: Thomas Gellekum <tg@FreeBSD.org> # $FreeBSD$ -# PORTNAME= xbmbrowser PORTVERSION= 5.1 @@ -16,7 +12,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= View complete directories of X bitmaps and X pixmaps -USE_IMAKE= yes +USES= imake USE_XORG= xaw xmu MAN1= xbmbrowser.1 Modified: head/graphics/xmagv/Makefile ============================================================================== --- head/graphics/xmagv/Makefile Fri Jun 28 21:17:09 2013 (r321987) +++ head/graphics/xmagv/Makefile Fri Jun 28 21:19:31 2013 (r321988) @@ -1,9 +1,5 @@ -# ports collection makefile for: xmagv -# Date created: 25 Oct 1998 -# Whom: Seiichirou Hiraoka -# +# Created by: Seiichirou Hiraoka # $FreeBSD$ -# PORTNAME= xmagv PORTVERSION= 1.11 @@ -15,9 +11,10 @@ DISTFILES= xmagv111.tgz MAINTAINER= ports@FreeBSD.org COMMENT= Viewer for X Window System +BROKEN= Does not build +USES= imake:env WRKSRC= ${WRKDIR}/${PORTNAME} GNU_CONFIGURE= yes -USE_IMAKE= yes USE_XORG= x11 xext XMKMF= xmkmf MANLANG= . ja Modified: head/graphics/xoris/Makefile ============================================================================== --- head/graphics/xoris/Makefile Fri Jun 28 21:17:09 2013 (r321987) +++ head/graphics/xoris/Makefile Fri Jun 28 21:19:31 2013 (r321988) @@ -1,9 +1,5 @@ -# New ports collection makefile for: xoris -# Date created: 02 April 2006 -# Whom: Alexander Gromnitsky -# +# Created by: Alexander Gromnitsky # $FreeBSD$ -# PORTNAME= xoris PORTVERSION= 0.1e @@ -12,18 +8,21 @@ CATEGORIES= graphics MASTER_SITES= SF MAINTAINER= alexander.gromnitsky@gmail.com -COMMENT= An X11 pixel color grabber +COMMENT= X11 pixel color grabber +USES= imake USE_IMAKE= yes USE_XORG= x11 -.if !defined(NOPORTDOCS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDOCS} SUB_FILES= pkg-message .endif post-install: @ ${INSTALL_SCRIPT} ${FILESDIR}/xoris-run.sh ${PREFIX}/bin -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @ ${ECHO_MSG} "===> Installing documentation for ${PORTNAME}" @ ${MKDIR} ${DOCSDIR} @ ${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/ Modified: head/graphics/xtexcad/Makefile ============================================================================== --- head/graphics/xtexcad/Makefile Fri Jun 28 21:17:09 2013 (r321987) +++ head/graphics/xtexcad/Makefile Fri Jun 28 21:19:31 2013 (r321988) @@ -10,8 +10,8 @@ MASTER_SITES= TEX_CTAN/graphics/xtexcad MAINTAINER= ports@FreeBSD.org COMMENT= Simple drawing program enforcing limited slopes and diameters +USES= imake USE_XORG= ice sm x11 xaw xext xmu xpm xt -USE_IMAKE= yes MAN1= xtexcad.1 PLIST_FILES= bin/xtexcad lib/X11/app-defaults/XTeXcad Modified: head/graphics/xwpick/Makefile ============================================================================== --- head/graphics/xwpick/Makefile Fri Jun 28 21:17:09 2013 (r321987) +++ head/graphics/xwpick/Makefile Fri Jun 28 21:19:31 2013 (r321988) @@ -1,9 +1,5 @@ -# New ports collection makefile for: xwpick -# Date created: 24 June 1998 -# Whom: Andrey Zakhvatov -# +# Created by: Andrey Zakhvatov # $FreeBSD$ -# PORTNAME= xwpick PORTVERSION= 2.20 @@ -15,11 +11,14 @@ MASTER_SITE_SUBDIR=applications MAINTAINER= ports@FreeBSD.org COMMENT= Image pick up utility for X Window System -USE_IMAKE= yes +USES= imake USE_XORG= x11 xext MAN1= xwpick.1 -.if !defined(NOPORTDOCS) +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MDOCS} + post-install: @${MKDIR} ${PREFIX}/share/doc/xwpick ${INSTALL_DATA} ${WRKSRC}/CHANGELOG ${PREFIX}/share/doc/xwpick
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201306282119.r5SLJW6s000351>