9 files changed, 22 insertions, 21 deletions

diff --git a/sysutils/fpc-syslog/Makefile b/sysutils/fpc-syslog/Makefile
index 4890643e8df6..5fef5b21f5cd 100644
--- a/sysutils/fpc-syslog/Makefile
+++ b/sysutils/fpc-syslog/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	sysutils lang
 PKGNAMESUFFIX=	-syslog
 
diff --git a/sysutils/fpc-syslog/pkg-plist b/sysutils/fpc-syslog/pkg-plist
index 696ed5835303..ae6cb1f0e4bd 100644
--- a/sysutils/fpc-syslog/pkg-plist
+++ b/sysutils/fpc-syslog/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/syslog/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/syslog/systemlog.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/syslog.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/syslog/systemlog.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/syslog/libpsystemlog.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/syslog/systemlog.ppu
diff --git a/sysutils/fpc-users/Makefile b/sysutils/fpc-users/Makefile
index e35f1bc1bd20..0a686be85b69 100644
--- a/sysutils/fpc-users/Makefile
+++ b/sysutils/fpc-users/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	sysutils lang
 PKGNAMESUFFIX=	-users
 
diff --git a/sysutils/fpc-users/pkg-plist b/sysutils/fpc-users/pkg-plist
index 1b4588c649a8..eb14e8e21efb 100644
--- a/sysutils/fpc-users/pkg-plist
+++ b/sysutils/fpc-users/pkg-plist
@@ -1,10 +1,8 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/grp.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/pwd.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/users.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/users.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/grp.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/grp.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/pwd.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/pwd.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/users.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/libpgrp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/libppwd.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/libpusers.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/users.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/users/users.rsj
diff --git a/sysutils/fpc-utmp/Makefile b/sysutils/fpc-utmp/Makefile
index 64bf1f8b12f6..174ab5753729 100644
--- a/sysutils/fpc-utmp/Makefile
+++ b/sysutils/fpc-utmp/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	sysutils lang
 PKGNAMESUFFIX=	-utmp
 
diff --git a/sysutils/fpc-utmp/pkg-plist b/sysutils/fpc-utmp/pkg-plist
index 0a93edc36138..84ea3228e2e0 100644
--- a/sysutils/fpc-utmp/pkg-plist
+++ b/sysutils/fpc-utmp/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utmp/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utmp/utmp.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/utmp.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utmp/utmp.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utmp/libputmp.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/utmp/utmp.ppu
diff --git a/sysutils/fpc-uuid/Makefile b/sysutils/fpc-uuid/Makefile
index 325f43a151dd..a358d9c4f333 100644
--- a/sysutils/fpc-uuid/Makefile
+++ b/sysutils/fpc-uuid/Makefile
@@ -1,14 +1,13 @@
 # Created by: Christopher Key <cjk32@cam.ac.uk>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	sysutils lang
 PKGNAMESUFFIX=	-uuid
 
 MAINTAINER=	freebsd-fpc@FreeBSD.org
 COMMENT=	Free Pascal uuid unit
 
-USE_FPC=	yes
+USE_FPC=	rtl-extra
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/sysutils/fpc-uuid/files/patch-packages_uuid_fpmake.pp b/sysutils/fpc-uuid/files/patch-packages_uuid_fpmake.pp
new file mode 100644
index 000000000000..a31b3e306816
--- /dev/null
+++ b/sysutils/fpc-uuid/files/patch-packages_uuid_fpmake.pp
@@ -0,0 +1,11 @@
+--- packages/uuid/fpmake.pp.orig	2015-01-05 19:27:06.000000000 +0000
++++ packages/uuid/fpmake.pp
+@@ -18,7 +18,7 @@ begin
+ {$endif ALLPACKAGES}
+     P.Version:='3.0.1';
+     P.SourcePath.Add('src');
+-    P.OSes := [linux];
++    P.OSes := [linux,dragonfly,freebsd];
+     P.Dependencies.Add('rtl-extra');
+ 
+     T:=P.Targets.AddUnit('libuuid.pp');
diff --git a/sysutils/fpc-uuid/pkg-plist b/sysutils/fpc-uuid/pkg-plist
index 2231289ec16e..8a7740c72264 100644
--- a/sysutils/fpc-uuid/pkg-plist
+++ b/sysutils/fpc-uuid/pkg-plist
@@ -1,6 +1,4 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/uuid/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/uuid/libplibuuid.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/uuid/libpmacuuid.a
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/uuid.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/uuid/libuuid.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/uuid/libuuid.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/uuid/macuuid.o