- Update to 2.6.2

- Trim Makefile headers

9 files changed, 35 insertions, 49 deletions

diff --git a/lang/fpc-base/Makefile b/lang/fpc-base/Makefile
index 8615d73c9634..e98755e61f08 100644
--- a/lang/fpc-base/Makefile
+++ b/lang/fpc-base/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	fpc-base
-# Date created:				10 February 2004
-# Whom:				John Merryweather Cooper <coop9211@uidaho.edu>
-#
+# Created by:	John Merryweather Cooper <coop9211@uidaho.edu>
 # $FreeBSD$
-#
 
 PORTNAME=	base
-PORTVERSION=	2.6.0
+PORTVERSION=	2.6.2
 CATEGORIES=	lang
 MASTER_SITES=	# empty
 PKGNAMEPREFIX=	fpc-
diff --git a/lang/fpc-docs/Makefile b/lang/fpc-docs/Makefile
index 5418f1564442..ca1a0d607dc7 100644
--- a/lang/fpc-docs/Makefile
+++ b/lang/fpc-docs/Makefile
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	Free Pascal Compiler Docs
-# Date created: 			9 February 2004
-# Whom: 				John Merryweather Cooper
-#
+# Created by:	John Merryweather Cooper
 # $FreeBSD$
-#
 
 PORTNAME=	docs
-PORTVERSION=	2.6.0
+PORTVERSION=	2.6.2
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/docs/ \
 		ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/docs/ \
diff --git a/lang/fpc-docs/distinfo b/lang/fpc-docs/distinfo
index 16b35080ed05..01d2d971fd90 100644
--- a/lang/fpc-docs/distinfo
+++ b/lang/fpc-docs/distinfo
@@ -1,2 +1,2 @@
-SHA256 (freepascal/doc-pdf.tar.gz) = b1b6cca6f1a1c341822fb86200e7c2cb88ed80b7d93bdbeb7c82cd5fba9e6f14
-SIZE (freepascal/doc-pdf.tar.gz) = 7521336
+SHA256 (freepascal/doc-pdf.tar.gz) = 19c7d2eb16bab419065802885fadfb65f41f86aa9b900c4a22c3237adbcfadf3
+SIZE (freepascal/doc-pdf.tar.gz) = 7771486
diff --git a/lang/fpc-tcl/Makefile b/lang/fpc-tcl/Makefile
index c0689681f28d..ac69fba306b3 100644
--- a/lang/fpc-tcl/Makefile
+++ b/lang/fpc-tcl/Makefile
@@ -1,4 +1,4 @@
-# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
+# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
 PORTREVISION=	0
diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile
index 05af0344725e..51a91a242f00 100644
--- a/lang/fpc-units/Makefile
+++ b/lang/fpc-units/Makefile
@@ -1,9 +1,9 @@
-# Created by: Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
+# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	units
-PORTVERSION=	2.6.0
-PORTREVISION=	3
+PORTVERSION=	2.6.2
+PORTREVISION=	0
 CATEGORIES=	lang
 MASTER_SITES=	# none
 PKGNAMEPREFIX=	fpc-
@@ -18,10 +18,10 @@ NO_BUILD=	yes
 
 BUILDNAME=	${ARCH}-freebsd
 
-OPTIONS_DEFINE=	A52 ASPELL BFD BZIP2 CAIRO CHM DBUS DTS FASTCGI FCL-ASYNC FCL-BASE \
-		FCL-EXTRA FCL-DB FCL-FPCUNIT FCL-IMAGE FCL-JSON FCL-NET FCL-PASSRC \
-		FCL-PROCESS FCL-REGISTRY FCL-RES FCL-WEB FCL-XML FFTW FPGTK FPMKUNIT \
-		FPPKG FPVECTORIAL FV GDBM GGI GMP GNOME1 GTK1 GTK2 HERMES ICONVENC \
+OPTIONS_DEFINE=	A52 ASPELL BFD BZIP2 CAIRO CHM DBUS DBLIB DTS FASTCGI FCL-ASYNC FCL-BASE \
+		FCL-EXTRA FCL-DB FCL-FPCUNIT FCL-IMAGE FCL-JS FCL-JSON FCL-NET FCL-PASSRC \
+		FCL-PROCESS FCL-REGISTRY FCL-RES FCL-WEB FCL-XML FFTW FPGTK FPINDEXER \
+		FPMKUNIT FPPKG FV GDBM GGI GMP GNOME1 GTK1 GTK2 HERMES ICONVENC \
 		IMAGEMAGICK IMLIB LDAP LIBCURL LIBGD LIBPNG LIBXML2 LUA MAD MATROSKA \
 		MODPLUG NCURSES NEWT NUMLIB OGGVORBIS OPENAL OPENGL OPENSSL PCAP PROJ4 \
 		PXLIB RSVG REXX SDL SNDFILE SVGALIB SYMBOLIC SYSLOG TCL UNZIP USERS \
@@ -34,6 +34,7 @@ BZIP2_DESC=	Free Pascal bzip2 unit
 CAIRO_DESC=	Interface to cairo library
 CHM_DESC=	Free Pbscal unit to manipulate chm files
 DBUS_DESC=	Interface to dbus library
+DBLIB_DESC=	Interface to dblib library
 DTS_DESC=	Interface to dts library
 FASTCGI_DESC=	Free Pascal fastcgi unit
 FCL_ASYNC_DESC=	Free Pascal interface to async library
@@ -42,7 +43,8 @@ FCL_DB_DESC=	Free Pascal Component Library (db)
 FCL_EXTRA_DESC=	Free Pascal Component Library (extra)
 FCL_FPCUNIT_DESC=	Free Pascal Component Library (fpcunit)
 FCL_IMAGE_DESC=	Free Pascal Component Library (image)
-FCL_JSON_DESC=	Free Pascal implementation of JSON
+FCL_JS_DESC=	Free Pascal implementation of (js)
+FCL_JSON_DESC=	Free Pascal implementation of (json)
 FCL_NET_DESC=	Free Pascal Component Library (net)
 FCL_PASSRC_DESC=	Free Pascal Component Library (passrc)
 FCL_PROCESS_DESC=	Unit to start and manipulate other programs
@@ -54,7 +56,6 @@ FFTW_DESC=	Interface to the FFTW3 library
 FPGTK_DESC=	Interface to create programs with gtk
 FPPKG_DESC=	Free Pascal package unit
 FPMKUNIT_DESC=	Free Pascal build system unit
-FPVECTORIAL_DESC=	Free Pascal fpvectorial unit
 FV_DESC=	Free Pascal unit for Delphi support
 GDBM_DESC=	Interface to the GNU database system
 GGI_DESC=	Interface to libggi library
@@ -64,6 +65,7 @@ GTK1_DESC=	Interface to gtk libraries
 GTK2_DESC=	Interface to gtk2 libraries
 HERMES_DESC=	Free Pascal hermes unit
 ICONVENC_DESC=	Interface to iconv library
+FPINDEXER_DESC=	Database indexer with database/flat file backend
 IMAGEMAGICK_DESC=	Interface to ImageMagick
 IMLIB_DESC=	Interface to imlib library
 LDAP_DESC=	Interface to OpenLDAP
@@ -105,10 +107,10 @@ LATEST_LINK=	${PKGNAMEPREFIX}${PORTNAME}
 
 .include <bsd.port.options.mk>
 
-OPTIONS_DEFAULT=	A52 ASPELL BFD BZIP2 CAIRO CHM DBUS DTS FASTCGI FCL-ASYNC FCL-BASE \
-		FCL-EXTRA FCL-DB FCL-FPCUNIT FCL-IMAGE FCL-JSON FCL-NET FCL-PASSRC \
-		FCL-PROCESS FCL-REGISTRY FCL-RES FCL-WEB FCL-XML FFTW FPGTK FPMKUNIT \
-		FPPKG FPVECTORIAL FV GDBM GGI GMP GNOME1 GTK1 GTK2 HERMES ICONVENC \
+OPTIONS_DEFAULT=A52 ASPELL BFD BZIP2 CAIRO CHM DBUS DBLIB DTS FASTCGI FCL-ASYNC FCL-BASE \
+		FCL-EXTRA FCL-DB FCL-FPCUNIT FCL-IMAGE FCL-JS FCL-JSON FCL-NET FCL-PASSRC \
+		FCL-PROCESS FCL-REGISTRY FCL-RES FCL-WEB FCL-XML FFTW FPGTK FPINDEXER \
+		FPMKUNIT FPPKG FV GDBM GGI GMP GNOME1 GTK1 GTK2 HERMES ICONVENC \
 		IMAGEMAGICK IMLIB LDAP LIBCURL LIBGD LIBPNG LIBXML2 LUA MAD MATROSKA \
 		MODPLUG NCURSES NEWT NUMLIB OGGVORBIS OPENAL OPENGL OPENSSL PCAP PROJ4 \
 		PXLIB RSVG REXX SDL SNDFILE SVGALIB SYMBOLIC SYSLOG TCL UNZIP USERS \
diff --git a/lang/fpc-utils/Makefile b/lang/fpc-utils/Makefile
index 005059474724..f43585829f73 100644
--- a/lang/fpc-utils/Makefile
+++ b/lang/fpc-utils/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	fpc-utils
-# Date created: 			2006-07-12
-# Whom: 				Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
-#
+# Created by:	Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTREVISION=	0
 CATEGORIES=	lang
diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index 331a83b6c28c..9aee0d56a793 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:	Free Pascal Compiler
-# Date created: 			28 November 2001
-# Whom: 				John Merryweather Cooper et al
-#
+# Created by:	John Merryweather Cooper et al
 # $FreeBSD$
-#
 
 PORTNAME=	fpc
-PORTVERSION=	2.6.0
-PORTREVISION?=	2
+PORTVERSION=	2.6.2
+PORTREVISION?=	0
 CATEGORIES?=	lang
 MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
 		ftp://planetmirror.com/pub/fpc/dist/${PORTVERSION}/source/:source \
@@ -85,7 +81,6 @@ MAN1=	bin2obj.1 \
 	h2pas.1 \
 	h2paspp.1 \
 	makeskel.1 \
-	mkxmlrpc.1 \
 	plex.1 \
 	postw32.1 \
 	ppc386.1 \
diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo
index f271ac99ae73..dcf060ea16c2 100644
--- a/lang/fpc/distinfo
+++ b/lang/fpc/distinfo
@@ -1,8 +1,8 @@
-SHA256 (freepascal/fpc-2.6.0.source.tar.gz) = b1ffe118bd6ce86775ac3a22ab71a88c28b91cbda6a85a8f74797a04ea7c4b8f
-SIZE (freepascal/fpc-2.6.0.source.tar.gz) = 28932564
-SHA256 (freepascal/ppc386-2.6.0-freebsd.tar.gz) = 10685d5bfc4fbf02dcd1398689d5c6e5e35831f1a38e1b34ed2312fb10099fe3
-SIZE (freepascal/ppc386-2.6.0-freebsd.tar.gz) = 958065
-SHA256 (freepascal/ppcx64-2.6.0-freebsd.tar.gz) = 7d2dbd57ea2c6986b4c6e0fc9b3a9461b19b5d9dbabe9e1a6512e97a6d9a5ef8
-SIZE (freepascal/ppcx64-2.6.0-freebsd.tar.gz) = 1026395
-SHA256 (freepascal/fpc-2.6.0.man.tar.gz) = 0a41d93d25e27f0a15ec7396586854c7001cbafd46a5a19a284e016573c261a4
-SIZE (freepascal/fpc-2.6.0.man.tar.gz) = 31808
+SHA256 (freepascal/fpc-2.6.2.source.tar.gz) = 71dd1be93593daf184556377dfde61c7882bc749ad8c0bc342210e542555f9d0
+SIZE (freepascal/fpc-2.6.2.source.tar.gz) = 29527806
+SHA256 (freepascal/ppc386-2.6.2-freebsd.tar.gz) = 57ae32389b717718df2af0588eb9c2ea32419a1266b568c3c93cd0d7be8979af
+SIZE (freepascal/ppc386-2.6.2-freebsd.tar.gz) = 962449
+SHA256 (freepascal/ppcx64-2.6.2-freebsd.tar.gz) = 80ddb220918454e1196083865e1194fea3f5551df3b0dc576513a24a9cbc2c22
+SIZE (freepascal/ppcx64-2.6.2-freebsd.tar.gz) = 1034393
+SHA256 (freepascal/fpc-2.6.2.man.tar.gz) = 0f18507e5858270ae9026339a95b82fda81ab9fbc501cb0e7629cd02f0fe05b1
+SIZE (freepascal/fpc-2.6.2.man.tar.gz) = 31044
diff --git a/lang/fpc/pkg-plist b/lang/fpc/pkg-plist
index 5b0c2f47b531..73141c5e6641 100644
--- a/lang/fpc/pkg-plist
+++ b/lang/fpc/pkg-plist
@@ -68,6 +68,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dateutils.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dateutils.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dl.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dl.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dllprt0.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dos.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dos.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/rtl/dynlibs.o