16 files changed, 45 insertions, 50 deletions

diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
index cb371bd6f072..d60aca24243c 100644
--- a/Mk/bsd.default-versions.mk
+++ b/Mk/bsd.default-versions.mk
@@ -37,7 +37,7 @@ FIREBIRD_DEFAULT?=	2.5
 # Possible values: flang (experimental), gfortran
 FORTRAN_DEFAULT?=	gfortran
 # Possible values: 3.0.0
-FPC_DEFAULT?=		3.0.2
+FPC_DEFAULT?=		3.0.4
 # Possible values: 4.9, 5, 6, 7
 GCC_DEFAULT?=		6
 # Possible values: 7, 8, 9, agpl
diff --git a/Mk/bsd.fpc.mk b/Mk/bsd.fpc.mk
index 7d965c34309a..56ceb05fe5da 100644
--- a/Mk/bsd.fpc.mk
+++ b/Mk/bsd.fpc.mk
@@ -72,12 +72,12 @@ _FPC_ALL_UNITS=	a52 aspell bfd bzip2 cairo chm dblib dbus dts fastcgi \
 		fcl-res fcl-sdo fcl-sound fcl-stl fcl-web fcl-xml fftw \
 		fpindexer fppkg fv gdbint gdbm gmp googleapi graph gtk2 \
 		hermes httpd22 httpd24 ibase iconvenc imagemagick \
-		ldap libcurl libgd libpng libvlc libxml2 lua mad modplug mysql \
-		ncurses newt numlib odbc oggvorbis openal opengl openssl \
-		oracle pasjpeg pcap postgres proj4 pthreads pxlib regexpr \
-		rexx rsvg rtl-console rtl-extra rtl-objpas rtl-unicode sdl \
-		sqlite svgalib symbolic syslog unzip users utmp \
-		uuid x11 xforms zlib
+		ldap libcurl libgd libmicrohttpd libpng libvlc libxml2 lua mad \
+		modplug mysql ncurses newt numlib odbc oggvorbis openal opengl \
+		openssl oracle pasjpeg pcap postgres proj4 pthreads pxlib \
+		regexpr rexx rsvg rtl-console rtl-extra rtl-objpas rtl-unicode \
+		sdl sqlite svgalib symbolic syslog unzip users utmp uuid x11 \
+		xforms zlib
 
 .if defined(WANT_FPC_BASE)
 .       if ${WANT_FPC_BASE:tl} == "yes"
@@ -163,6 +163,7 @@ imagemagick_UNIT=	graphics/fpc-imagemagick
 ldap_UNIT=	net/fpc-ldap
 libcurl_UNIT=	ftp/fpc-libcurl
 libgd_UNIT=	graphics/fpc-libgd
+libmicrohttpd_UNIT=	www/fpc-libmicrohttpd
 libpng_UNIT=	graphics/fpc-libpng
 libvlc_UNIT=	multimedia/fpc-libvlc
 libxml2_UNIT=	textproc/fpc-libxml2
diff --git a/audio/fpc-mad/files/patch-packages_mad_fpmake.pp b/audio/fpc-mad/files/patch-packages_mad_fpmake.pp
index d07556713822..faf28fef7882 100644
--- a/audio/fpc-mad/files/patch-packages_mad_fpmake.pp
+++ b/audio/fpc-mad/files/patch-packages_mad_fpmake.pp
@@ -1,11 +1,11 @@
---- packages/mad/fpmake.pp.orig	2015-11-13 21:15:29 UTC
-+++ packages/mad/fpmake.pp
-@@ -17,7 +17,7 @@ begin
+--- packages/mad/fpmake.pp	2017-09-02 11:48:24.000000000 -0500
++++ packages/mad/fpmake.pp	2017-12-12 12:22:21.182111000 -0500
+@@ -17,7 +17,7 @@
      P.Directory:=ADirectory;
  {$endif ALLPACKAGES}
-     P.Version:='3.0.2';
+     P.Version:='3.0.4';
 -    P.OSes := [linux,win32,win64,wii];
-+    P.OSes := [linux,win32,win64,wii,freebsd,dragonfly];
++    P.OSes := [linux,win32,win64,wii,dragonfly,freebsd];
      P.SourcePath.Add('src');
  
      T:=P.Targets.AddUnit('mad.pas');
diff --git a/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp b/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp
index 8312b59a7908..dc5a1ae8d6b8 100644
--- a/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp
+++ b/audio/fpc-modplug/files/patch-packages_modplug_fpmake.pp
@@ -1,9 +1,9 @@
---- packages/modplug/fpmake.pp.orig	2015-11-13 21:15:29 UTC
-+++ packages/modplug/fpmake.pp
-@@ -17,7 +17,7 @@ begin
+--- packages/modplug/fpmake.pp	2017-09-02 11:48:24.000000000 -0500
++++ packages/modplug/fpmake.pp	2017-12-12 12:24:14.440128000 -0500
+@@ -17,7 +17,7 @@
      P.Directory:=ADirectory;
  {$endif ALLPACKAGES}
-     P.Version:='3.0.2';
+     P.Version:='3.0.4';
 -    P.OSes := [linux];
 +    P.OSes := [linux,dragonfly,freebsd];
      P.SourcePath.Add('src');
diff --git a/devel/fpc-fcl-passrc/pkg-plist b/devel/fpc-fcl-passrc/pkg-plist
index 7c0f1cbb226a..83fd70eb105d 100644
--- a/devel/fpc-fcl-passrc/pkg-plist
+++ b/devel/fpc-fcl-passrc/pkg-plist
@@ -11,7 +11,5 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/paswrite.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/paswrite.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pparser.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pparser.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pparser.rsj
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pscanner.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pscanner.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pscanner.rsj
diff --git a/graphics/fpc-imagemagick/Makefile b/graphics/fpc-imagemagick/Makefile
index 714c5a128556..be4c243b1146 100644
--- a/graphics/fpc-imagemagick/Makefile
+++ b/graphics/fpc-imagemagick/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	2
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-imagemagick
 
diff --git a/graphics/fpc-opengl/Makefile b/graphics/fpc-opengl/Makefile
index 101d6f964ce0..92832c56bd7b 100644
--- a/graphics/fpc-opengl/Makefile
+++ b/graphics/fpc-opengl/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	graphics lang
 PKGNAMESUFFIX=	-opengl
 
diff --git a/lang/fpc-base/Makefile b/lang/fpc-base/Makefile
index 666131adb77d..3591886853b5 100644
--- a/lang/fpc-base/Makefile
+++ b/lang/fpc-base/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	base
-PORTVERSION=	3.0.2
+PORTVERSION=	3.0.4
 CATEGORIES=	lang
 PKGNAMEPREFIX=	fpc-
 
diff --git a/lang/fpc-docs/Makefile b/lang/fpc-docs/Makefile
index d82327b1891c..363f5b8766fc 100644
--- a/lang/fpc-docs/Makefile
+++ b/lang/fpc-docs/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	docs
-PORTVERSION=	3.0.2
+PORTVERSION=	3.0.4
 CATEGORIES=	lang
 MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/docs/ \
 		ftp://freepascal.stack.nl/pub/fpc/dist/${PORTVERSION}/docs/
diff --git a/lang/fpc-docs/distinfo b/lang/fpc-docs/distinfo
index 9720cc93874c..3fb596935218 100644
--- a/lang/fpc-docs/distinfo
+++ b/lang/fpc-docs/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488124955
-SHA256 (freepascal/3.0.2/doc-pdf.tar.gz) = f43d782346773913cda49b4fefd304f0ba10bc5e027f515629e43679c19cf1d6
-SIZE (freepascal/3.0.2/doc-pdf.tar.gz) = 9313946
+TIMESTAMP = 1517333020
+SHA256 (freepascal/3.0.4/doc-pdf.tar.gz) = 0c70ac388a5a6a1c775308661ce4feb9cfa9d9c1084fd6939bfa101d5488817b
+SIZE (freepascal/3.0.4/doc-pdf.tar.gz) = 9161471
diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile
index f2df562353c8..6a823b176f7a 100644
--- a/lang/fpc-units/Makefile
+++ b/lang/fpc-units/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	units
-PORTVERSION=	3.0.2
-PORTREVISION=	1
+PORTVERSION=	3.0.4
 CATEGORIES=	lang
 PKGNAMEPREFIX=	fpc-
 
@@ -20,7 +19,7 @@ ALL_OPTIONS=	A52 ASPELL BFD BZIP2 CAIRO CHM DBLIB DBUS DTS FASTCGI \
 		FCL_JS FCL_JSON FCL_NET FCL_PASSRC FCL_PDF FCL_REGISTRY FCL_RES \
 		FCL_SDO FCL_SOUND FCL_STL FCL_WEB FCL_XML FFTW \
 		FPINDEXER FPPKG FV GDBM GMP GOOGLEAPI GTK2 HERMES ICONVENC \
-		IMAGEMAGICK LDAP LIBCURL LIBGD LIBPNG LIBXML2 LIBVLC LUA MAD \
+		IMAGEMAGICK LDAP LIBCURL LIBGD LIBMICROHTTPD LIBPNG LIBXML2 LIBVLC LUA MAD \
 		MODPLUG NCURSES NEWT NUMLIB OGGVORBIS OPENAL OPENGL \
 		OPENSSL PASJPEG PCAP PROJ4 PXLIB RSVG REXX RTL_CONSOLE \
 		RTL_EXTRA RTL_OBJPAS RTL_UNICODE SDL SVGALIB SYMBOLIC \
@@ -74,6 +73,7 @@ IMAGEMAGICK_DESC=	Interface to ImageMagick
 LDAP_DESC=		Interface to OpenLDAP
 LIBCURL_DESC=		Interface to curl library
 LIBGD_DESC=		Interface to gd library
+LIBMICROHTTPD_DESC=	Interface to libmicrohttpd library
 LIBPNG_DESC=		Interface to png library
 LIBVLC_DESC=		Unit for VLC
 LIBXML2_DESC=		Interface to libxml2 library
diff --git a/lang/fpc/Makefile b/lang/fpc/Makefile
index 0c469dad90da..6ae4deea2375 100644
--- a/lang/fpc/Makefile
+++ b/lang/fpc/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	fpc
-PORTVERSION=	3.0.2
+PORTVERSION=	3.0.4
 PORTREVISION?=	0
 CATEGORIES?=	lang
 MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/${PORTVERSION}/source/:source \
@@ -23,8 +23,8 @@ COMMENT?=	Free Pascal compiler with Turbo and Delphi
 
 USES=		gmake iconv
 ONLY_FOR_ARCHS=	i386 amd64
-BOOTVER=	3.0.2
-MANVER=		3.0.2
+BOOTVER=	3.0.4
+MANVER=		3.0.4
 
 #USE_GITHUB=	yes
 #GH_ACCOUNT=	fpc-svn
@@ -36,12 +36,12 @@ FPCSRCDIR=	${PORTNAME}-${PORTVERSION}
 .if ${ARCH} == "i386"
 PPNAME=		ppc386
 FPC_ARCH=	i386
-PLIST_SUB+=	FPC_I386="" \
+PLIST_SUB=	FPC_I386="" \
 		FPC_AMD64="@comment "
 .elif ${ARCH} == "amd64"
 PPNAME=		ppcx64
 FPC_ARCH=	x86_64
-PLIST_SUB+=	FPC_I386="@comment " \
+PLIST_SUB=	FPC_I386="@comment " \
 		FPC_AMD64=""
 .endif
 
@@ -177,7 +177,7 @@ do-install:
 		"${STAGEDIR}${PREFIX}/lib/fpc/${PORTVERSION}" \
 		"${STAGEDIR}${PREFIX}/etc"
 	@${REINPLACE_CMD} -i "" -e 's|${STAGEDIR}||' \
-		-e 's|^-Fl/usr/local/lib|-Fl${LOCALBASE}/lib;${LOCALBASE}/lib/qt4|g' \
+		-e 's|^-Fl/usr/local/lib|-Fl${LOCALBASE}/lib;${LOCALBASE}/lib/qt4;${LOCALBASE}/lib/qt5|g' \
 		${STAGEDIR}${PREFIX}/etc/fpc.cfg.sample
 
 .else
diff --git a/lang/fpc/distinfo b/lang/fpc/distinfo
index e549ae0bfef5..e829580efe99 100644
--- a/lang/fpc/distinfo
+++ b/lang/fpc/distinfo
@@ -1,11 +1,9 @@
-TIMESTAMP = 1487994867
-SHA256 (freepascal/fpc-3.0.2.source.tar.gz) = 67fccddf5da992356f4e90d836444750ce9363608c7db8e38c077f710fcb6258
-SIZE (freepascal/fpc-3.0.2.source.tar.gz) = 39841597
-SHA256 (freepascal/ppc386-3.0.2-freebsd.tar.gz) = 4f362bdd6cd6917d9623e5e2cdcf9d501713ff86c290c2320f8b0cac2d742d2d
-SIZE (freepascal/ppc386-3.0.2-freebsd.tar.gz) = 1145982
-SHA256 (freepascal/ppcx64-3.0.2-freebsd.tar.gz) = 7fcdd9431501420c00b78e21d20bf0caa571cfede8bc98af222b23470ef7f3ef
-SIZE (freepascal/ppcx64-3.0.2-freebsd.tar.gz) = 1210777
-SHA256 (freepascal/ppcx64-2.6.4-freebsd.tar.gz) = f74a268a206fbd52d3c92f4e0722cd135ca91c1988a83826401cabdd78b3222b
-SIZE (freepascal/ppcx64-2.6.4-freebsd.tar.gz) = 1035650
-SHA256 (freepascal/fpc-3.0.2.man.tar.gz) = daaf316588f35eab08b6c9cec9a0702cebaf985c68e5d3a607e04145f32f27d3
-SIZE (freepascal/fpc-3.0.2.man.tar.gz) = 47298
+TIMESTAMP = 1517441652
+SHA256 (freepascal/fpc-3.0.4.source.tar.gz) = 69b3b7667b72b6759cf27226df5eb54112ce3515ff5efb79d95ac14bac742845
+SIZE (freepascal/fpc-3.0.4.source.tar.gz) = 40347617
+SHA256 (freepascal/ppc386-3.0.4-freebsd.tar.gz) = ab8512393c62c93f5f5a8ca35754c28029dbbb17ab9b600408ff830a583e9bfc
+SIZE (freepascal/ppc386-3.0.4-freebsd.tar.gz) = 1145936
+SHA256 (freepascal/ppcx64-3.0.4-freebsd.tar.gz) = 9ed86babfae9f4e2c9be22ce21d1e508dbbd8a7b689b12bcec643bf475e6f129
+SIZE (freepascal/ppcx64-3.0.4-freebsd.tar.gz) = 1210933
+SHA256 (freepascal/fpc-3.0.4.man.tar.gz) = 948abb4a4a7c512e3b67122088b43bcf2f272452558903fa1fca3f63bf9091ba
+SIZE (freepascal/fpc-3.0.4.man.tar.gz) = 47294
diff --git a/multimedia/fpc-libvlc/Makefile b/multimedia/fpc-libvlc/Makefile
index 91d50888d1fd..4f21b00f9577 100644
--- a/multimedia/fpc-libvlc/Makefile
+++ b/multimedia/fpc-libvlc/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	multimedia lang
 PKGNAMESUFFIX=	-libvlc
 
diff --git a/multimedia/fpc-libvlc/files/patch-packages_libvlc_fpmake.pp b/multimedia/fpc-libvlc/files/patch-packages_libvlc_fpmake.pp
index e231091c74f6..2d85944ec243 100644
--- a/multimedia/fpc-libvlc/files/patch-packages_libvlc_fpmake.pp
+++ b/multimedia/fpc-libvlc/files/patch-packages_libvlc_fpmake.pp
@@ -1,13 +1,13 @@
---- packages/libvlc/fpmake.pp.orig	2015-08-07 13:22:31 UTC
-+++ packages/libvlc/fpmake.pp
-@@ -15,15 +15,15 @@ begin
+--- packages/libvlc/fpmake.pp	2017-09-02 11:48:24.000000000 -0500
++++ packages/libvlc/fpmake.pp	2017-12-12 12:19:09.246128000 -0500
+@@ -15,15 +15,15 @@
  {$ifdef ALLPACKAGES}
      P.Directory:=ADirectory;
  {$endif ALLPACKAGES}
 -    P.OSes := [win32, win64, linux, freebsd];
 +    P.OSes := [win32, win64, linux, dragonfly, freebsd];
      P.Dependencies.Add('fcl-base');
-     P.Version:='3.0.2';
+     P.Version:='3.0.4';
      P.License := 'LGPL with modification';
      P.HomepageURL := 'www.freepascal.org';
      P.Email := 'michael@freepascal.org';
diff --git a/www/Makefile b/www/Makefile
index bf1c2c58ea67..07021276d92a 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -181,6 +181,7 @@
     SUBDIR += fpc-googleapi
     SUBDIR += fpc-httpd22
     SUBDIR += fpc-httpd24
+    SUBDIR += fpc-libmicrohttpd
     SUBDIR += free-sa-devel
     SUBDIR += freeway
     SUBDIR += fswiki