diff --git a/graphics/libfpx/Makefile b/graphics/libfpx/Makefile
index c232d610c5f1..58f0aaf4e36e 100644
--- a/graphics/libfpx/Makefile
+++ b/graphics/libfpx/Makefile
@@ -1,47 +1,46 @@
 # New ports collection makefile for:	fpx
 # Date created:				Jan 10 2001
 # Whom:					Mikhail Teterin <mi@aldan.algebra.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	libfpx
-PORTVERSION=	1.2.0.4
-PORTREVISION=	1
+PORTVERSION=	1.2.0.7
 CATEGORIES=	graphics
-MASTER_SITES=	http://imagemagick.sourceforge.net/http/delegates/ \
-		ftp://gd.tuwien.ac.at/pub/graphics/%SUBDIR%/ \
+MASTER_SITES=	ftp://gd.tuwien.ac.at/pub/graphics/%SUBDIR%/ \
 		ftp://ftp.sunet.se/pub/multimedia/graphics/%SUBDIR%/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/ImageMagick,} \
 		ftp://ftp.crc.ca/pub/packages/graphics/imagemagick/ \
 		ftp://ftp.imagemagick.org/pub/%SUBDIR%/ \
 		ftp://ftp.planetmirror.com/pub/%SUBDIR%/ \
 		ftp://ftp.fu-berlin.de/unix/X11/graphics/%SUBDIR%/ \
 		ftp://zoffy.asahi-net.or.jp/pub/graphics/%SUBDIR%/ \
 		ftp://ftp.u-aizu.ac.jp/pub/graphics/image/%SUBDIR%/ \
 		ftp://ftp.eos.hokudai.ac.jp/pub/graphics/%SUBDIR%/ \
 		ftp://ftp.kddlabs.co.jp/graphics/%SUBDIR%/ \
 		ftp://ftp.icm.edu.pl/pub/graphics/%SUBDIR%/ \
 		ftp://giswitch.sggw.waw.pl/pub/graphics/%SUBDIR%/ \
 		ftp://ftp.fifi.org/pub/%SUBDIR%/ \
 		ftp://ftp.simplesystems.org/pub/%SUBDIR%/
 MASTER_SITE_SUBDIR=	ImageMagick/delegates
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	Library routines for working with Flashpix images
 
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg
 MAKE_ARGS+=	-j2
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
+USE_BZIP2=	yes
 
 post-patch:
 	# Replacing references to <malloc.h> with <stdlib.h>
 	# Ignore the /dev/stderr warning below. (What a hack!)
 	${REINPLACE_CMD} -e 's,<malloc\.h>,<stdlib\.h>,' \
 		${WRKSRC}/oless/h/ref.hxx ${WRKSRC}/oless/h/vect.hxx
 
 INSTALLS_SHLIB=	yes
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 
 .include <bsd.port.mk>
diff --git a/graphics/libfpx/distinfo b/graphics/libfpx/distinfo
index b697d71e209c..49d6093ea875 100644
--- a/graphics/libfpx/distinfo
+++ b/graphics/libfpx/distinfo
@@ -1 +1 @@
-MD5 (libfpx-1.2.0.4.tar.gz) = e74bc1ed5c9d912563bec5ae19ad4676
+MD5 (libfpx-1.2.0.7.tar.bz2) = 8f4dd8d6706562dcb0c7aeeb65d862fb
diff --git a/graphics/libfpx/files/Makefile.bsd b/graphics/libfpx/files/Makefile.bsd
index 528a8f1e99e9..b8418b96b359 100644
--- a/graphics/libfpx/files/Makefile.bsd
+++ b/graphics/libfpx/files/Makefile.bsd
@@ -1,38 +1,40 @@
 LIB	=	fpx
 INCS	=	fpxlib.h
 SHLIB_MAJOR=	1
-SHLIB_MINOR=	2
+SHLIB_MINOR=	7
 
 LIBDIR	=	${LOCALBASE}/lib
 INCSDIR	=	${LOCALBASE}/include
 INCDIR	=	${INCSDIR}		# for pre-bsd.incs.mk API
 
 NOPROFILE=	Don't want it
-CFLAGS+=	-DHAVE_WCHAR_H=1 -DHAVE_DLFCN_H=1
+HAVES=		-DHAVE_WCHAR_H -DHAVE_DLFCN_H \
+		-DHAVE_SYS_PARAM_H -DHAVE_SYS_MOUNT_H
+CFLAGS+=	${HAVES}
 
 CPPS	!=	find ${.CURDIR} -name \*.cpp -print
 # Some of the .cxx files are #include-ed into others, so can't use `find' here:
 OLESS	:=	ascii.cxx cdocfile.cxx chinst.cxx dffuncs.cxx dfiter.cxx \
 		dfstream difat.cxx dir.cxx dirp.cxx docfile.cxx entry.cxx \
 		expdf.cxx expiter expst.cxx fat.cxx funcs.cxx header.cxx \
 		iter.cxx mem.cxx msf msfiter.cxx mstream.cxx page.cxx \
 		refilb.cxx rexpdf.cxx sstream.cxx storage.cxx time.cxx \
 		vect.cxx wchar.c
 JPGS	!=	find ${.CURDIR}/jpeg -name \*.c
 
 CPPS	+=	${OLESS:S/^/${.CURDIR}\/oless\//} ${JPGS}
 
 SRCS	=	${CPPS:T}
 
-CXXFLAGS+=	-fno-rtti -fno-exceptions -DHAVE_WCHAR_H=1 -DHAVE_DLFCN_H=1
+CXXFLAGS+=	-fno-rtti -fno-exceptions ${HAVES}
 LDADD	+=	-L${LOCALBASE}/lib -ljpeg -lstdc++
 
 .PATH: ${CPPS:H}
 
 .for d in oless/h jpeg ole basics ri_image oless fpx
 CXXFLAGS+=	-I${.CURDIR}/$d
 .endfor
 
 CXXFLAGS+=	-I${LOCALBASE}/include -D_UNIX
 
 .include <bsd.lib.mk>
diff --git a/graphics/libfpx/files/patch-basics::a_file.cpp b/graphics/libfpx/files/patch-basics::a_file.cpp
deleted file mode 100644
index b0069f69d690..000000000000
--- a/graphics/libfpx/files/patch-basics::a_file.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
---- basics/a_file.cpp	Sat Dec 23 17:10:00 2000
-+++ basics/a_file.cpp	Thu Jan 18 11:37:44 2001
-@@ -29,4 +29,4 @@
- #  include <sys/types.h>
-+#  include <sys/uio.h>
- #  include <sys/stat.h>
--#  include <sys/statfs.h>
- #  include <sys/ioctl.h>
---- basics/filename.cpp	Sat Dec 23 17:10:00 2000
-+++ basics/filename.cpp	Thu Jan 18 11:33:35 2001
-@@ -39,3 +39,4 @@
- #  include <sys/stat.h>
--#  include <sys/statfs.h>
-+#  include <sys/param.h>
-+#  include <sys/mount.h>
- #  include <stdio.h>