*/*: sync with upstream

Taken from: FreeBSD

astro/astrometry/Makefile

@@ -16,12 +16,11 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libcairo.so:${PORTSDIR}/graphics/cairo \
 		libcfitsio.so:${PORTSDIR}/astro/cfitsio \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libnetpbm.so:${PORTSDIR}/graphics/netpbm
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		gmake pkgconfig python tar:bzip2
+USES=		gmake jpeg pkgconfig python tar:bzip2
 USE_LDCONFIG=	${PREFIX}/${PORTNAME}/lib
 ALL_TARGET=	all extra
 MAKE_ENV=	INSTALL_DIR=${STAGEDIR}${PREFIX}/${PORTNAME}

astro/boinc-astropulse/Makefile

@@ -37,7 +37,7 @@ X11_DESC=	Build screensaver (requires net/boinc-client with X11)
 OPTIONS_SUB=	yes
 
 X11_BUILD_DEPENDS=	${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client
-X11_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+X11_USES=		jpeg
 X11_USE=		GL=gl,glu,glut \
 			XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm
 X11_CONFIGURE_ENABLE=	graphics

astro/boinc-setiathome-v7/Makefile

@@ -40,7 +40,7 @@ X11_DESC=	Build screensaver (requires net/boinc-client with X11)
 OPTIONS_SUB=	yes
 
 X11_BUILD_DEPENDS=	${LOCALBASE}/lib/libboinc_graphics2.a:${PORTSDIR}/net/boinc-client
-X11_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+X11_USES=		jpeg
 X11_USE=		GL=gl,glu,glut \
 			XORG=ice,sm,x11,xau,xcb,xext,xi,xdamage,xdmcp,xfixes,xmu,xt,xxf86vm
 X11_CONFIGURE_ENABLE=	graphics

astro/celestia/Makefile

@@ -13,10 +13,9 @@ COMMENT=	Scriptable space flight simulator for X11
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
-USES=		gettext gmake libtool lua pkgconfig
+USES=		gettext gmake jpeg libtool lua pkgconfig
 USE_GL=		gl
 GNU_CONFIGURE=	yes
 EXTRA_PATCHES=	${FILESDIR}/celestia-1.6.1-lua-5.2.patch:-p1 \

astro/openuniverse/Makefile

@@ -10,11 +10,9 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/1.0beta3
 MAINTAINER=	[email protected]
 COMMENT=	OpenGL Solar System simulator for X Window System
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
-
 USE_GL=		glut
 
-USES=		gmake
+USES=		gmake jpeg
 USE_XORG=	sm ice xmu xi xext x11
 GNU_CONFIGURE=	yes
 

astro/sunclock/Makefile

@@ -13,11 +13,11 @@ COMMENT=	Shows which portion of the Earth's surface is illuminated by the Sun
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
+USES=		jpeg
 USE_XORG=	xpm
 
 CPPFLAGS+=	$$(libpng-config --I_opts) \

astro/xephem/Makefile

@@ -10,10 +10,9 @@ MASTER_SITES=	# http://www.clearskyinstitute.com/xephem/
 MAINTAINER=	[email protected]
 COMMENT=	Interactive astronomical ephemeris program
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
-USES=		gmake motif
+USES=		gmake jpeg motif
 LDFLAGS+=	-lfontconfig
 USE_XORG=	xp xt xext xmu x11 xft
 MAKE_JOBS_UNSAFE=	yes

astro/xplanet/Makefile

@@ -27,7 +27,7 @@ PANGO_USE=	GNOME=pango
 GIF_CONFIGURE_WITH=	gif
 GIF_LIB_DEPENDS=	libgif.so:${PORTSDIR}/graphics/giflib
 JPEG_CONFIGURE_WITH=	jpeg
-JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
+JPEG_USES=		jpeg
 PNG_CONFIGURE_WITH=	png
 PNG_LIB_DEPENDS+=	libpng.so:${PORTSDIR}/graphics/png
 PNM_CONFIGURE_WITH=	pnm

audio/alsa-plugins/Makefile

@@ -15,7 +15,7 @@ LICENSE=	LGPL21 # or any later version
 LIB_DEPENDS=	libasound.so:${PORTSDIR}/audio/alsa-lib
 
 GNU_CONFIGURE=	yes
-USES=		libtool:keepla pkgconfig tar:bzip2
+USES=		alias libtool:keepla pkgconfig tar:bzip2
 EXTRA_PATCHES+=	${FILESDIR}/alsa-plugins.patch
 INSTALL_TARGET=	install-strip
 CPPFLAGS+=	-I${.CURDIR}/../alsa-lib/files

audio/deadbeef/Makefile

@@ -81,8 +81,8 @@ LASTFM_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 LASTFM_CONFIGURE_OFF=	--disable-lfm
 
 ART_LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl \
-			libImlib2.so:${PORTSDIR}/graphics/imlib2 \
-			libjpeg.so:${PORTSDIR}/graphics/jpeg
+			libImlib2.so:${PORTSDIR}/graphics/imlib2
+ART_USES=		jpeg
 ART_CONFIGURE_OFF=	--disable-artwork --disable-artwork-imlib2
 
 EQ_CONFIGURE_OFF=	--disable-supereq

audio/enscribe/Makefile

@@ -12,11 +12,10 @@ COMMENT=	Create digital audio watermark images from photographic images
 
 LIB_DEPENDS=	libsndfile.so:${PORTSDIR}/audio/libsndfile \
 		libgd.so:${PORTSDIR}/graphics/gd \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 
-USES=		pkgconfig tar:tgz
+USES=		jpeg pkgconfig tar:tgz
 
 LICENSE=	GPLv2
 

biology/protomol/Makefile

@@ -12,10 +12,10 @@ MAINTAINER=	[email protected]
 COMMENT=	OO, component based, framework for molecular dynamics (MD) simulations
 
 LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libtiff.so:${PORTSDIR}/graphics/tiff
 
 GNU_CONFIGURE=	yes
+USES=		jpeg
 USE_XORG=	xmu xt sm ice xext x11 xi
 
 # Hack to cure a misbehavior of the configure script

cad/brickutils/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	brickutils
 PORTVERSION=	0.1.6.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	cad
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}-obsolete/ \
 		SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}-obsolete/:docs \
@@ -20,12 +20,12 @@ COMMENT=	Utility for building models with LEGO
 LICENSE=	GPLv3
 
 RUN_DEPENDS=	${LOCALBASE}/share/ldraw/models/car.dat:${PORTSDIR}/cad/ldraw \
-		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		${PYXML}
+		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3
 
 WRKSRC=		${WRKDIR}/BrickUtils-${PORTVERSION}
 
-USES=		python
+NO_ARCH=	yes
+USES=		python:2
 USE_GNOME=	pygtk2
 
 PORTDOCS=	*

cad/gmsh/Makefile

@@ -15,7 +15,6 @@ MAINTAINER=	[email protected]
 COMMENT=	Automatic 3D finite element mesh generator
 
 LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
 		liblapack.so:${PORTSDIR}/math/lapack
 RUN_DEPENDS=	getdp:${PORTSDIR}/science/getdp
@@ -24,7 +23,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-source
 
 SLAVEDIRS=	cad/gmsh-occ
 
-USES=		cmake fortran gmake tar:tgz
+USES=		cmake fortran gmake jpeg tar:tgz
 USE_GL=		yes
 ALL_TARGET=	all
 

cad/leocad/Makefile

@@ -15,12 +15,11 @@ COMMENT=	CAD program that uses bricks similar to those found in many toys
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-		libpng.so:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USES=		desktop-file-utils gmake pkgconfig qmake shared-mime-info
+USES=		desktop-file-utils gmake jpeg pkgconfig qmake shared-mime-info
 USE_QT4=	moc_build rcc_build uic_build iconengines_run imageformats_run \
 		corelib gui network opengl
 USE_GL=		glut

cad/netgen/Makefile

@@ -11,11 +11,10 @@ MAINTAINER=	[email protected]
 COMMENT=	Automatic 3D tetrahedral mesh generator
 
 LIB_DEPENDS=	libTix8.4.3.so:${PORTSDIR}/x11-toolkits/tix \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libtogl.so:${PORTSDIR}/graphics/togl
 
 USE_LDCONFIG=	yes
-USES=		gmake libtool tk
+USES=		gmake jpeg libtool tk
 USE_GL=		yes
 USE_XORG=	xmu xi
 GNU_CONFIGURE=	yes

cad/openvsp/Makefile

@@ -17,7 +17,6 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libopenNURBS.a:${PORTSDIR}/graphics/opennurbs
 LIB_DEPENDS=	libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libdrm.so:${PORTSDIR}/graphics/libdrm \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
@@ -30,7 +29,7 @@ GH_PROJECT=	OpenVSP
 GH_ACCOUNT=	${GH_PROJECT}
 
 CMAKE_SOURCE_PATH=	${WRKSRC}/src
-USES=		cmake:outsource dos2unix iconv
+USES=		cmake:outsource dos2unix iconv jpeg
 USE_XORG=	ice sm x11 xau xcb xdamage xdmcp xext xfixes xft \
 		xinerama xrender xxf86vm
 USE_GL=		glu

comms/hylafax/Makefile

@@ -12,13 +12,12 @@ COMMENT=	Fax software
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/afm/Courier:${PORTSDIR}/print/afm
 LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libjbig.so:${PORTSDIR}/graphics/jbigkit
 
 MAKE_JOBS_UNSAFE=	yes
 USE_GHOSTSCRIPT=yes
 HAS_CONFIGURE=	yes
-USES=		fakeroot
+USES=		fakeroot jpeg
 
 CONFIGURE_ARGS=	--with-INSTALL="" \
 		--with-LIBTIFF="-L${LOCALBASE}/lib -ltiff -ljpeg" \

comms/xastir/Makefile

@@ -12,11 +12,10 @@ COMMENT=	X Amateur Station Tracking and Information Reporting
 BUILD_DEPENDS=	xfontsel:${PORTSDIR}/x11-fonts/xfontsel
 RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png
 
 GNU_CONFIGURE=	yes
-USES=		gettext gmake motif
+USES=		gettext gmake jpeg motif
 
 SUB_FILES=	pkg-message
 

converters/wkhtmltopdf/Makefile

@@ -16,11 +16,10 @@ LICENSE_FILE_LGPL3=	${INSTALL_WRKSRC}/COPYING
 
 LIB_DEPENDS+=	libfontconfig.so:${PORTSDIR}/x11-fonts/fontconfig \
 		libfreetype.so:${PORTSDIR}/print/freetype2 \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png
 
 
-USES=			pkgconfig gmake perl5 iconv tar:bzip2
+USES=			iconv jpeg gmake perl5 pkgconfig tar:bzip2
 USE_XORG=		x11 xext xrender
 USE_PERL5=		build
 USE_LDCONFIG=		yes

databases/grass/Makefile

@@ -26,15 +26,14 @@ LICENSE=	GPLv2
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/swig:${PORTSDIR}/devel/swig13
 LIB_DEPENDS=	libgdal.so:${PORTSDIR}/graphics/gdal \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
 		libproj.so:${PORTSDIR}/graphics/proj \
 		libtiff.so:${PORTSDIR}/graphics/tiff \
 		libfftw3.so:${PORTSDIR}/math/fftw3 \
 		libfreetype.so:${PORTSDIR}/print/freetype2
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
-USES=		fortran gettext gmake iconv perl5 pkgconfig python:2 readline \
+USES=		fortran gettext gmake iconv jpeg perl5 pkgconfig python:2 readline \
 		shebangfix tk
 SHEBANG_FILES=	scripts/i.spectral/i.spectral \
 		scripts/r.tileset/r.tileset

deskutils/aspostit/Makefile

@@ -12,10 +12,8 @@ COMMENT=	AfterStep dockable version of XPostIt
 
 LICENSE=	GPLv2 # (or later)
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
-
 USE_XORG=	xpm xaw xext x11
-USES=		gmake
+USES=		gmake jpeg
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/aspostit man/man1/aspostit.1.gz

deskutils/conduit/Makefile

@@ -4,7 +4,7 @@
 
 PORTNAME=	conduit
 PORTVERSION=	0.3.17
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	deskutils
 MASTER_SITES=	GNOME
 
@@ -13,19 +13,17 @@ COMMENT=	Synchronization application for GNOME
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goocanvas \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		xmlproc_parse:${PORTSDIR}/textproc/py-xml \
 		${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:${PORTSDIR}/deskutils/py-vobject \
 		${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus
 LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/goocanvasmodule.so:${PORTSDIR}/graphics/py-goocanvas \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>0:${PORTSDIR}/databases/py-sqlite3 \
-		xmlproc_parse:${PORTSDIR}/textproc/py-xml \
 		${PYTHON_PKGNAMEPREFIX}vobject>=0.4.8:${PORTSDIR}/deskutils/py-vobject \
 		${PYTHON_PKGNAMEPREFIX}dbus>0:${PORTSDIR}/devel/py-dbus \
 		xdg-open:${PORTSDIR}/devel/xdg-utils
 
 GNU_CONFIGURE=	yes
-USES=		gettext gmake pathfix pkgconfig python
+USES=		gettext gmake pathfix pkgconfig python:2
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include

deskutils/griffith/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	griffith
 PORTVERSION=	0.13
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils
 MASTER_SITES=	http://launchpadlibrarian.net/87859599/
 
@@ -15,11 +15,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>=0:${PORTSDIR}/databases/py-sqlite3 \
 		${PYTHON_PKGNAMEPREFIX}sqlalchemy06>=0.5:${PORTSDIR}/databases/py-sqlalchemy06 \
-		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow \
-		${PYXML}
+		${PYTHON_PKGNAMEPREFIX}pillow>=0:${PORTSDIR}/graphics/py-pillow
 
 USE_GNOME=	pygtk2
-USES=		gmake gettext python tar:xz
+USES=		gmake gettext python:2 tar:xz
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=		CHARDET LXML REPORTLAB2

deskutils/spice-gtk/Makefile

@@ -11,11 +11,9 @@ COMMENT?=	Gtk client and libraries for SPICE remote desktop servers
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
-
 USE_XORG=	pixman
 USE_GNOME=	gnomeprefix gtk20 gtk30 intltool introspection:build
-USES=		cpe gmake libtool pkgconfig tar:bzip2 pathfix
+USES=		cpe gmake jpeg libtool pkgconfig tar:bzip2 pathfix
 CPE_VENDOR=	redhat
 
 .if defined(SPICE_SLAVE)

deskutils/xfce4-tumbler/Makefile

@@ -39,8 +39,8 @@ NLS_USES=	gettext-runtime
 NLS_CONFIGURE_ENABLE=	nls
 FONTS_LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 FONTS_CONFIGURE_ENABLE=	font-thumbnailer
-JPEG_LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
-	libexif.so:${PORTSDIR}/graphics/libexif
+JPEG_LIB_DEPENDS=	libexif.so:${PORTSDIR}/graphics/libexif
+JPEG_USES=		jpeg
 JPEG_CONFIGURE_ENABLE=	jpeg-thumbnailer
 FFMPEG_LIB_DEPENDS=	libffmpegthumbnailer.so:${PORTSDIR}/multimedia/ffmpegthumbnailer
 FFMPEG_CONFIGURE_ENABLE=	ffmpeg-thumbnailer

devel/Makefile

@@ -3896,6 +3896,7 @@
     SUBDIR += py-gflags
     SUBDIR += py-gitdb
     SUBDIR += py-gitosis
+    SUBDIR += py-gitpython
     SUBDIR += py-glob2
     SUBDIR += py-gobject
     SUBDIR += py-gobject3

devel/allegro-devel/Makefile

@@ -19,12 +19,11 @@ LICENSE_COMB=	dual
 
 LIB_DEPENDS+=	libjack.so:${PORTSDIR}/audio/jack \
 		libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libvorbis.so:${PORTSDIR}/audio/libvorbis \
 		libFLAC.so:${PORTSDIR}/audio/flac \
 		libphysfs.so:${PORTSDIR}/devel/physfs
 
-USES=		gmake cmake openal:soft pkgconfig
+USES=		cmake gmake jpeg openal:soft pkgconfig
 USE_XORG=	x11 xpm xext xcursor xxf86vm xxf86dga
 USE_GL=		glu
 USE_GNOME=	gtk20