35 files changed, 93 insertions, 30 deletions

diff --git a/lang/algol68g/Makefile b/lang/algol68g/Makefile
index cad95185a566..3c5f323964ee 100644
--- a/lang/algol68g/Makefile
+++ b/lang/algol68g/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	algol68g
 PORTVERSION=	2.3.5
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://jmvdveer.home.xs4all.nl/
 EXTRACT_SUFX=	.tgz
diff --git a/lang/basic256/Makefile b/lang/basic256/Makefile
index 835ebdcb221d..6121d8b8e20e 100644
--- a/lang/basic256/Makefile
+++ b/lang/basic256/Makefile
@@ -6,6 +6,7 @@
 
 PORTNAME=		basic256
 PORTVERSION=		0.9.6.66
+PORTREVISION=	1
 CATEGORIES=		lang
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	kidbasic/basic256
diff --git a/lang/bigloo/Makefile b/lang/bigloo/Makefile
index 2af3dfc89794..3b6ce5c7c832 100644
--- a/lang/bigloo/Makefile
+++ b/lang/bigloo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bigloo
 PORTVERSION=	3.7a.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang scheme
 MASTER_SITES=	ftp://ftp-sop.inria.fr/indes/fp/Bigloo/
 DISTNAME=	${PORTNAME}${PORTVERSION:R}-${PORTVERSION:E}
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 301f8674e328..3ad3486ebfbe 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	clisp
 PORTVERSION=	2.49
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang lisp
 MASTER_SITES=	GNU/${PORTNAME}/release/${PORTVERSION}
 
diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile
index ec0a4beb8af4..f85a10593c89 100644
--- a/lang/fpc-units/Makefile
+++ b/lang/fpc-units/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	units
 PORTVERSION=	2.6.0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	fpc-
diff --git a/lang/fpc/Makefile.units b/lang/fpc/Makefile.units
index 0edb973ce61b..3a369a8d6a9b 100644
--- a/lang/fpc/Makefile.units
+++ b/lang/fpc/Makefile.units
@@ -173,7 +173,7 @@ LIB_DEPENDS=	gd.4:${PORTSDIR}/graphics/gd
 
 .if ${PKGNAMESUFFIX} == "-libpng"
 .	if defined(WITH_LIBPNG)
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 .	endif
 .endif
 
diff --git a/lang/fsharp/Makefile b/lang/fsharp/Makefile
index 289ba94d6f0d..d39cd091f89b 100644
--- a/lang/fsharp/Makefile
+++ b/lang/fsharp/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fsharp
 PORTVERSION=	1.9.6.16
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	http://download.microsoft.com/download/F/7/4/F74A3170-261C-4E8F-B1A8-2E352C61A89B/
 DISTNAME=	fsharp
diff --git a/lang/gambas/Makefile b/lang/gambas/Makefile
index ef12f62339e1..f0b982267393 100644
--- a/lang/gambas/Makefile
+++ b/lang/gambas/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=		gambas
 PORTVERSION=		1.0.19
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=		lang
 MASTER_SITES=		SF
 
diff --git a/lang/gjs/Makefile b/lang/gjs/Makefile
index ca7409f999c9..f0f98c9d93bf 100644
--- a/lang/gjs/Makefile
+++ b/lang/gjs/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	gjs
 PORTVERSION=	0.7.7
+PORTREVISION=	1
 CATEGORIES=	lang gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
diff --git a/lang/harbour/Makefile b/lang/harbour/Makefile
index a7ed03cb5b4c..9bd059329104 100644
--- a/lang/harbour/Makefile
+++ b/lang/harbour/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	harbour
 PORTVERSION=	3.0.0
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	SF/${PORTNAME}-project/source/${PORTVERSION}
 
diff --git a/lang/klogoturtle/Makefile b/lang/klogoturtle/Makefile
index 4b42b93c6124..1ef4228ca458 100644
--- a/lang/klogoturtle/Makefile
+++ b/lang/klogoturtle/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	klogoturtle
 PORTVERSION=	0.6
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	lang kde
 MASTER_SITES=	http://klogoturtle.sourceforge.net/
 
diff --git a/lang/kroc/Makefile b/lang/kroc/Makefile
index 328b985cba48..2ae47cb682c1 100644
--- a/lang/kroc/Makefile
+++ b/lang/kroc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kroc
 PORTVERSION=	1.5.r6372
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	http://ftp.i-scream.org/pub/kroc/ \
 		ftp://ftp.i-scream.org/pub/kroc/
@@ -17,7 +17,7 @@ MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	The Kent Retargettable occam-pi Compiler
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	png.6:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
 ONLY_FOR_ARCHS=	i386
diff --git a/lang/kturtle/Makefile b/lang/kturtle/Makefile
index b2d9a618ae59..6f9bcc2915a8 100644
--- a/lang/kturtle/Makefile
+++ b/lang/kturtle/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kturtle
 PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	1
 CATEGORIES=	lang kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/lang/lafontaine/Makefile b/lang/lafontaine/Makefile
index 7c2956b618ab..df8184ac7eac 100644
--- a/lang/lafontaine/Makefile
+++ b/lang/lafontaine/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	lafontaine
 PORTVERSION=	0.4.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	lang
 MASTER_SITES=	http://www.nongnu.org/lafontaine/archives/
 DISTNAME=	${PORTNAME}_0.4-1
diff --git a/lang/lush/Makefile b/lang/lush/Makefile
index 3b2732e8aae4..5e7aa2466d59 100644
--- a/lang/lush/Makefile
+++ b/lang/lush/Makefile
@@ -6,7 +6,7 @@
 
 PORTNAME=	lush
 PORTVERSION=	1.2.1
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	lang
 MASTER_SITES=	SF
 
diff --git a/lang/mdk/Makefile b/lang/mdk/Makefile
index e65b2ca3ced7..83d0f7a04ae7 100644
--- a/lang/mdk/Makefile
+++ b/lang/mdk/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	mdk
 PORTVERSION=	1.2.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	lang gnome
 MASTER_SITES=	${MASTER_SITE_GNU:S/%SUBDIR%/${PORTNAME}\/v${PORTVERSION}/} \
 		SF
diff --git a/lang/mlton/Makefile b/lang/mlton/Makefile
index d3a556d856c5..e57b00e64ee4 100644
--- a/lang/mlton/Makefile
+++ b/lang/mlton/Makefile
@@ -12,7 +12,7 @@
 
 PORTNAME=	mlton
 PORTVERSION=	20070826
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	lang
 MASTER_SITES=	http://mlton.org/pages/Download/attachments/ \
 		http://mlton.org/pages/Experimental/attachments/ \
diff --git a/lang/nbc/Makefile b/lang/nbc/Makefile
index 7e8a08718e81..f482d0fd70a0 100644
--- a/lang/nbc/Makefile
+++ b/lang/nbc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		nbc
 PORTVERSION=		1.2.1.r4
-PORTREVISION=		3
+PORTREVISION=	4
 CATEGORIES=		lang
 MASTER_SITES=		SF
 MASTER_SITE_SUBDIR=	bricxcc/NBC_NXC/NBC%20release%20${PORTVERSION:S/.r/%20r/}
diff --git a/lang/neko/Makefile b/lang/neko/Makefile
index 49b049b5fcfb..b1110225af49 100644
--- a/lang/neko/Makefile
+++ b/lang/neko/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	neko
 PORTVERSION=	1.8.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang
 MASTER_SITES=	http://nekovm.org/_media/
 
diff --git a/lang/ofc/Makefile b/lang/ofc/Makefile
index 557481368414..25665eb905d2 100644
--- a/lang/ofc/Makefile
+++ b/lang/ofc/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	ofc
 PORTVERSION=	0.8.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	lang
 MASTER_SITES=	http://ofc.dvoudheusden.net/download/
 
@@ -15,7 +15,7 @@ MAINTAINER=	vanilla@FreeBSD.org
 COMMENT=	The Objective-C Foundation Classes library
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
-		png.6:${PORTSDIR}/graphics/png \
+		png15:${PORTSDIR}/graphics/png \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
 		freetype.9:${PORTSDIR}/print/freetype2
 
@@ -24,7 +24,7 @@ USE_AUTOTOOLS=	libtool
 USE_GNOME=	gnomehack
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CPPFLAGS+=	-I${LOCALBASE}/include -I${LOCALBASE}/include/libpng15 ${PTHREAD_CFLAGS}
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 OPTIONS=	GDBM "Add gdbm support" off \
@@ -41,7 +41,15 @@ LIB_DEPENDS+=	gmp.10:${PORTSDIR}/math/gmp
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} >= 900000
-BROKEN=		does not compile on FreeBSD 9.X
+# needs libobjc
+GCCSUFFIX=42
+CC=		gcc${GCCSUFFIX}
+CXX=		g++${GCCSUFFIX}
+OFC_GCC_PORT?=	lang/gcc${GCCSUFFIX}
+TARGLIB!=	(cd ${PORTSDIR}/${OFC_GCC_PORT} && make -V TARGLIB)
+LDFLAGS+=	-L${TARGLIB}
+BUILD_DEPENDS+=	${TARGLIB}/libobjc.so:${PORTSDIR}/${OFC_GCC_PORT}
+RUN_DEPENDS+=	${TARGLIB}/libobjc.so:${PORTSDIR}/${OFC_GCC_PORT}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/lang/ofc/files/patch-DPNGImage.m b/lang/ofc/files/patch-DPNGImage.m
new file mode 100644
index 000000000000..87a3171f4380
--- /dev/null
+++ b/lang/ofc/files/patch-DPNGImage.m
@@ -0,0 +1,46 @@
+--- ofc/DPNGImage.m.orig	2008-08-20 19:16:29.000000000 +0200
++++ ofc/DPNGImage.m	2012-05-09 13:07:56.000000000 +0200
+@@ -30,6 +30,7 @@
+ 
+ #ifdef HAVE_DPNGIMAGE
+ #include "png.h"
++#include "pngpriv.h"
+ #endif
+ 
+ 
+@@ -346,7 +347,7 @@
+     
+     if (ok)
+     {
+-      if (setjmp(png->jmpbuf))
++      if (setjmp(png_jmpbuf(png)))
+       {
+         WARNING(DW_UNKNOWN_WARNING, "Error reading PNG file");
+         ok     = NO;
+@@ -485,7 +486,7 @@
+     
+     if (ok)
+     {
+-      if (setjmp(png->jmpbuf))
++      if (setjmp(png_jmpbuf(png)))
+       {
+         WARNING(DW_UNKNOWN_WARNING, "Error writing PNG file");
+         ok     = NO;
+@@ -553,7 +554,7 @@
+     
+     pixels = _width;
+     
+-    if (setjmp(png->jmpbuf))
++    if (setjmp(png_jmpbuf(png)))
+     {
+       WARNING(DW_UNKNOWN_WARNING, "Error reading PNG file");
+       pixels = 0;
+@@ -599,7 +600,7 @@
+     
+     png_structp png = (png_structp) _png;
+     
+-    if (setjmp(png->jmpbuf))
++    if (setjmp(png_jmpbuf(png)))
+     {
+       WARNING(DW_UNKNOWN_WARNING, "Error writing PNG file");
+       ok     = NO;
diff --git a/lang/opa/Makefile b/lang/opa/Makefile
index 3b35e5b9b80a..5e089b114807 100644
--- a/lang/opa/Makefile
+++ b/lang/opa/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	opa
 PORTVERSION=	0.9.2.${GITVER}
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://download.opalang.org/tar-gz/
 DISTNAME=	${PORTNAME}_v${GITVER}
diff --git a/lang/phantomjs/Makefile b/lang/phantomjs/Makefile
index 3a43ea4bfb2d..4dc46b543d81 100644
--- a/lang/phantomjs/Makefile
+++ b/lang/phantomjs/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	phantomjs
 PORTVERSION=	1.4.1
+PORTREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext
index 8f3007eb3912..461b407798f0 100644
--- a/lang/php5/Makefile.ext
+++ b/lang/php5/Makefile.ext
@@ -84,7 +84,7 @@ USE_OPENSSL=	yes
 
 .if ${PHP_MODNAME} == "gd"
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		png.6:${PORTSDIR}/graphics/png \
+		png15:${PORTSDIR}/graphics/png \
 		jpeg.11:${PORTSDIR}/graphics/jpeg
 .	if !defined(WITHOUT_X11)
 USE_XORG=	xpm
diff --git a/lang/php52/Makefile.ext b/lang/php52/Makefile.ext
index 010dd9806492..7d632a20e4b6 100644
--- a/lang/php52/Makefile.ext
+++ b/lang/php52/Makefile.ext
@@ -94,7 +94,7 @@ USE_OPENSSL=	yes
 
 .if ${PHP_MODNAME} == "gd"
 LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2 \
-		png.6:${PORTSDIR}/graphics/png \
+		png15:${PORTSDIR}/graphics/png \
 		jpeg.11:${PORTSDIR}/graphics/jpeg
 .	if !defined(WITHOUT_X11)
 USE_XORG=	xpm
diff --git a/lang/pike76/Makefile b/lang/pike76/Makefile
index 072d7c11010c..6158dde43e88 100644
--- a/lang/pike76/Makefile
+++ b/lang/pike76/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	pike76
 PORTVERSION=	7.6.112
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	lang
 MASTER_SITES=	ftp://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \
 		http://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \
diff --git a/lang/q/Makefile b/lang/q/Makefile
index 104486e317f1..14ae7804608d 100644
--- a/lang/q/Makefile
+++ b/lang/q/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	q
 PORTVERSION=	7.11
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	lang
 MASTER_SITES=	SF/${PORTNAME}-lang/${PORTNAME}/${PORTVERSION}
 
diff --git a/lang/racket/Makefile b/lang/racket/Makefile
index d4e2816940f2..b0b17050c017 100644
--- a/lang/racket/Makefile
+++ b/lang/racket/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	racket
 PORTVERSION=	5.2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://download.racket-lang.org/installers/${PORTVERSION}/${PORTNAME}/ \
 		http://www.eecs.northwestern.edu/racket/${PORTVERSION}/${PORTNAME}/ \
@@ -48,7 +48,7 @@ USE_GNOME=	pango
 LIB_DEPENDS+=	ffi.5:${PORTSDIR}/devel/libffi		\
 		cairo.2:${PORTSDIR}/graphics/cairo	\
 		jpeg.11:${PORTSDIR}/graphics/jpeg	\
-		png.6:${PORTSDIR}/graphics/png
+		png15:${PORTSDIR}/graphics/png
 
 .if defined(WITH_RACKET_PLACES)
 CONFIGURE_ARGS+=	--enable-places
diff --git a/lang/sbcl/Makefile b/lang/sbcl/Makefile
index 59f6b3b0f846..3b947eba91e7 100644
--- a/lang/sbcl/Makefile
+++ b/lang/sbcl/Makefile
@@ -10,6 +10,7 @@
 
 PORTNAME=	sbcl
 PORTVERSION=	1.0.57
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	lang lisp
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION} \
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 90bd2ffcdb6e..d6ceca50a8e3 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	smalltalk
 PORTVERSION=	3.2.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/lang/sml-mode.el/Makefile b/lang/sml-mode.el/Makefile
index b59b709da3eb..c871dcee428f 100644
--- a/lang/sml-mode.el/Makefile
+++ b/lang/sml-mode.el/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	sml-mode
 PORTVERSION=	3.9.5
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang elisp
 MASTER_SITES=	ftp://ftp.research.bell-labs.com/dist/smlnj/contrib/emacs/ \
 		${MASTER_SITE_LOCAL}
diff --git a/lang/squeak/Makefile b/lang/squeak/Makefile
index 890bfb61fa7a..840d5c0c514d 100644
--- a/lang/squeak/Makefile
+++ b/lang/squeak/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=		squeak
 PORTVERSION=		4.4.7
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		lang
 ##################################################
 MASTER_SITES=		http://www.squeakvm.org/unix/release/:vmsrc \
diff --git a/lang/steptalk/Makefile b/lang/steptalk/Makefile
index 56a9eb822dcc..9f004d41b29c 100644
--- a/lang/steptalk/Makefile
+++ b/lang/steptalk/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	steptalk
 PORTVERSION=	0.10.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang gnustep
 MASTER_SITES=	${MASTER_SITE_GNUSTEP}
 MASTER_SITE_SUBDIR=	libs
diff --git a/lang/tuareg-mode.el/Makefile b/lang/tuareg-mode.el/Makefile
index 0cfc7d4ad412..60aafd60b3b2 100644
--- a/lang/tuareg-mode.el/Makefile
+++ b/lang/tuareg-mode.el/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	tuareg-mode
 PORTVERSION=	1.45.6
-PORTREVISION=	8
+PORTREVISION=	9
 PORTEPOCH=	1
 CATEGORIES=	lang elisp
 MASTER_SITES=	http://www-rocq.inria.fr/~acohen/tuareg/mode/
diff --git a/lang/twelf/Makefile b/lang/twelf/Makefile
index 5ee81aa3d5ad..eb864a89daf6 100644
--- a/lang/twelf/Makefile
+++ b/lang/twelf/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	twelf
 PORTVERSION=	1.5R1
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang
 MASTER_SITES=	http://www-2.cs.cmu.edu/~twelf/dist/ http://www.cs.cmu.edu/~twelf/dist/
 DISTNAME=	twelf-1-5R1