4 files changed, 81 insertions, 5 deletions

diff --git a/archivers/fpc-paszlib/Makefile b/archivers/fpc-paszlib/Makefile
index 569c5cf1d299..143f2e770100 100644
--- a/archivers/fpc-paszlib/Makefile
+++ b/archivers/fpc-paszlib/Makefile
@@ -8,11 +8,14 @@
 CATEGORIES=	archivers devel
 PKGNAMESUFFIX=	-paszlib
 
-MAINTAINER=	acardenas@bsd.org.pe
+MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal unit for native compression IO
 
-RUN_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
+BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
+WRKUNITDIR=	${PORTNAME}/packages/base/${PKGNAMESUFFIX:S/-//}
+EXTRACTUNITDIR+=	${WRKUNITDIR}
+HAVE_EXAMPLES=	true
 
 .include "${MASTERDIR}/Makefile"
diff --git a/archivers/fpc-paszlib/pkg-plist b/archivers/fpc-paszlib/pkg-plist
new file mode 100644
index 000000000000..bdc0d5424cda
--- /dev/null
+++ b/archivers/fpc-paszlib/pkg-plist
@@ -0,0 +1,58 @@
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/paszlib.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/adler.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/gzcrc.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/gzio.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infblock.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infcodes.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inffast.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inftrees.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infutil.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/trees.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zcompres.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zdeflate.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zinflate.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zbase.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zuncompr.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zutil.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/paszlib.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/adler.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/gzcrc.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/gzio.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infblock.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infcodes.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inffast.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/inftrees.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/infutil.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/trees.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zcompres.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zdeflate.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zinflate.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zbase.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zuncompr.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/zutil.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libppaszlib.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpadler.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpgzcrc.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpgzio.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpinfblock.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpinfcodes.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpinffast.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpinftrees.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpinfutil.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libptrees.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzcompres.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzdeflate.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzinflate.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzbase.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzuncompr.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib/libpzutil.a
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/paszlib/minigzip.pas
+%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/paszlib/example.pas
+@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/paszlib
+@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
+@dirrmtry lib/fpc/%%PORTVERSION%%/units
+@dirrmtry lib/fpc/%%PORTVERSION%%
+@dirrmtry lib/fpc
+%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/paszlib
+%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/archivers/fpc-unzip/Makefile b/archivers/fpc-unzip/Makefile
index 23d23aaee449..6d9ffd5ab5b3 100644
--- a/archivers/fpc-unzip/Makefile
+++ b/archivers/fpc-unzip/Makefile
@@ -8,12 +8,15 @@
 CATEGORIES=	archivers lang
 PKGNAMESUFFIX=	-unzip
 
-MAINTAINER=	acardenas@bsd.org.pe
+MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Free Pascal routines for unzipping zip files
 
-RUN_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
-		unzip:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
+		fpcmake:${PORTSDIR}/lang/fpc-utils
+RUN_DEPENDS=	unzip:${PORTSDIR}/archivers/unzip
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
+WRKUNITDIR=	${PORTNAME}/packages/extra/${PKGNAMESUFFIX:S/-//}
+EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/archivers/fpc-unzip/pkg-plist b/archivers/fpc-unzip/pkg-plist
new file mode 100644
index 000000000000..d6c04494f779
--- /dev/null
+++ b/archivers/fpc-unzip/pkg-plist
@@ -0,0 +1,12 @@
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/ziptypes.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/unzip.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/ziptypes.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/unzip.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/libpziptypes.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip/libpunzip.a
+@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/unzip
+@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
+@dirrmtry lib/fpc/%%PORTVERSION%%/units
+@dirrmtry lib/fpc/%%PORTVERSION%%
+@dirrmtry lib/fpc