--- /usr/ports/databases/fpc-mysql-new/Makefile	Thu May  4 19:23:57 2006
+++ /usr/ports/databases/fpc-mysql-new/Makefile	Wed Jun  7 10:21:28 2006
@@ -6,65 +6,57 @@ 
 #
 
 PORTNAME=	mysql
-PORTVERSION=	1.0.10
+PORTVERSION=	2.0.2
 CATEGORIES=	databases lang
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	ftp://ftp.freepascal.org/pub/fpc/dist/i386-freebsd-${PORTVERSION}/ \
+		ftp://planetmirror.com/pub/fpc/dist/i386-freebsd-${PORTVERSION}/ \
+		ftp://ftp.jp.freepascal.org/mirror/fpc/dist/i386-freebsd-${PORTVERSION}/ \
+		ftp://freepascal.stack.nl/pub/fpc/dist/i386-freebsd-${PORTVERSION}/ \
+		ftp://ftp.no.freepascal.org/pub/fpc/dist/i386-freebsd-${PORTVERSION}/ \
+		ftp://ftp.us.freepascal.org/pub/fpc/dist/i386-freebsd-${PORTVERSION}/ \
+		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	freepascal
 PKGNAMEPREFIX=	fpc-
-DISTNAME=	fpc-${PORTVERSION}.ELF
+DISTNAME=	${PKGNAMEPREFIX}${PORTVERSION}.${BUILDNAME}
 EXTRACT_SUFX=	.tar
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	acardenas@bsd.org.pe
 COMMENT=	Free Pascal interface to MySQL
 
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 470000
-EXTRACT_DEPENDS+=	gtar:${PORTSDIR}/archivers/gtar
-TAR=			${LOCALBASE}/bin/gtar
-.endif
-USE_GMAKE=	yes
+USE_MYSQL=	yes
 ONLY_FOR_ARCHS=	i386
+NO_BUILD=	yes
 
-PLIST_SUB+=	INSTDIR=lib/fpc/${PORTVERSION}/units/freebsd/mysql \
-		PORTVERSION=${PORTVERSION}
-
-MAKE_ENV+=	PATH=${LOCALBASE}/bin:$$PATH \
-		FPC=${LOCALBASE}/bin/ppc386 \
-		INSTALL_BASEDIR=${PREFIX}/lib/fpc/${PORTVERSION} \
-		INSTALL_BINDIR=${PREFIX}/bin \
-		GCCLIBDIR=/usr/lib \
-		RELEASE=1
+EXAMPLESDIR=	share/examples/${PKGNAMEPREFIX}${PORTVERSION}
+BUILDNAME=	i386-freebsd
+PLIST_SUB+=	PORTVERSION=${PORTVERSION} \
+		BUILDNAME=${BUILDNAME}
 
 do-extract:
 # unpack distribution
 	@${MKDIR} ${WRKSRC}
-	@${TAR} xf ${DISTDIR}/${DISTNAME}.tar --directory ${WRKSRC}
-# unpack sources distribution
-	@${MKDIR} ${WRKSRC}/sources
-	@${TAR} xf ${WRKSRC}/sources.tar --directory ${WRKSRC}/sources
-# further extract base sources
-#
-# mysql sources
-	@${TAR} zxf ${WRKSRC}/sources/unitsmysqlsrc.tar.gz \
+	@${TAR} xf ${DISTDIR}/${DISTNAME}.tar \
+		--directory ${WRKSRC}
+	@${TAR} xf ${WRKSRC}/binary.${BUILDNAME}.tar \
 		--directory ${WRKSRC}
 
-post-patch:
-# change to alter amount of optimization
-	@${FIND} ${WRKSRC}/share/src/fpc-${PORTVERSION} -name \
-		"Makefile*" | ${XARGS} ${REINPLACE_CMD} 's|-OG2p3|-OG2p1|g'
-
-do-build:
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/mysql \
-		all
+# unpack binary and mysql distribution
+	@${MKDIR} ${WRKSRC}/${PORTNAME}
+	@${TAR} zxf ${WRKSRC}/units-${PORTNAME}.${BUILDNAME}.tar.gz \
+		--directory ${WRKSRC}/${PORTNAME}
 
 do-install:
-	@${SETENV} ${MAKE_ENV} ${GMAKE} -C \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/mysql \
-		install
+.for DIRE in lib
+	@cd ${WRKSRC}/${PORTNAME}/${DIRE} && \
+	${FIND} * -type d -exec ${MKDIR} "{}" "${PREFIX}/${DIRE}/{}" \; && \
+		${FIND} * -type f -exec ${INSTALL_SCRIPT} "{}" "${PREFIX}/${DIRE}/{}" \;
+.endfor
+
+post-install:
+	@cd ${WRKSRC}/${PORTNAME}/share && \
+		${FIND} * -type d -exec ${MKDIR} "{}" "${PREFIX}/share/{}" \; && \
+			${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${PREFIX}/share/{}" \;
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- /usr/ports/databases/fpc-mysql-new/distinfo	Thu Nov 24 13:54:34 2005
+++ /usr/ports/databases/fpc-mysql-new/distinfo	Mon Jun  5 16:10:02 2006
@@ -1,3 +1,3 @@ 
-MD5 (fpc-1.0.10.ELF.tar) = 6ad56eb115152174683499da3ece7667
-SHA256 (fpc-1.0.10.ELF.tar) = 318bab9d1269dffcc5fe737d224fca939c5f130f34f12d166319b3d1ba776bfb
-SIZE (fpc-1.0.10.ELF.tar) = 17448960
+MD5 (fpc-2.0.2.i386-freebsd.tar) = e1f834f445b0f2313f41ed417a28fb1c
+SHA256 (fpc-2.0.2.i386-freebsd.tar) = 906f002dfdbdfc3380f5a66b93d68debdbb68bba65b9db0590a93f548fb9f528
+SIZE (fpc-2.0.2.i386-freebsd.tar) = 22517760
--- /usr/ports/databases/fpc-mysql-new/pkg-descr	Mon Apr 12 16:56:21 2004
+++ /usr/ports/databases/fpc-mysql-new/pkg-descr	Wed Jun  7 10:22:21 2006
@@ -3,6 +3,3 @@ 
 interface to MySQL databases.
 
 WWW: http://www.freepascal.org/
-
---
-John Merryweather Cooper <coop9211@uidaho.edu>
--- /usr/ports/databases/fpc-mysql-new/pkg-plist	Wed Jan 25 17:54:42 2006
+++ /usr/ports/databases/fpc-mysql-new/pkg-plist	Wed Jun  7 10:20:18 2006
@@ -1,12 +1,43 @@ 
-%%INSTDIR%%/Package.fpc
-%%INSTDIR%%/mysql.o
-%%INSTDIR%%/mysql.ppu
-%%INSTDIR%%/mysql_com.o
-%%INSTDIR%%/mysql_com.ppu
-%%INSTDIR%%/mysql_version.o
-%%INSTDIR%%/mysql_version.ppu
-@dirrm %%INSTDIR%%
-@dirrmtry lib/fpc/%%PORTVERSION%%/units/freebsd
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/my4_sys.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_com.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_version.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_comdyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_com.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_version.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_comdyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/my4_sys.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_com.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_version.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4dyn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_comdyn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_com.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_version.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_comdyn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3dyn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmy4_sys.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql4_com.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql4_version.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql4.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql4dyn.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql4_comdyn.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql3_com.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql3_version.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql3.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql3_comdyn.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql3dyn.a
+%%EXAMPLESDIR%%/mysql/testdb3.pp
+%%EXAMPLESDIR%%/mysql/testdb4.pp
+@dirrm %%EXAMPLESDIR%%/mysql
+@dirrmtry %%EXAMPLESDIR%%
+@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql
+@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc