Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 Jun 2006 18:52:30 GMT
From:      Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/98641: [PATCH] databases/fpc-oracle: update to 2.0.2, take maintainership
Message-ID:  <200606071852.k57IqUrO067734@www.freebsd.org>
Resent-Message-ID: <200606071910.k57JAGkp055591@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         98641
>Category:       ports
>Synopsis:       [PATCH] databases/fpc-oracle: update to 2.0.2, take maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jun 07 19:10:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Jose Alonso Cardenas Marquez
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
BSDPeru (http://www.bsd.org.pe)
>Environment:
FreeBSD HellFire.BSD.org.pe 6.1-STABLE FreeBSD 6.1-STABLE #0: Wed May 24 08:30:45 PET 2006
>Description:
- Update to 2.0.2
- Take maintainership

Removed file(s):
- files/patch-share::src::fpc-1.0.10::packages::base::oracle::Makefile.fpc

>How-To-Repeat:

>Fix:
--- fpc-oracle-2.0.2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/databases/fpc-oracle/Makefile /usr/ports/databases/fpc-oracle-new/Makefile
--- /usr/ports/databases/fpc-oracle/Makefile	Thu May  4 19:23:57 2006
+++ /usr/ports/databases/fpc-oracle-new/Makefile	Wed Jun  7 13:47:09 2006
@@ -6,69 +6,65 @@
 #
 
 PORTNAME=	oracle
-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 Oracle
 
+RUN_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
+		${ORACLE8_LIB}/env_rdbms.mk:${PORTSDIR}/databases/oracle8-client
+
+ORACLE8_LIB=	${LOCALBASE}/oracle8/rdbms/lib
+
 .include <bsd.port.pre.mk>
 
-ORACLE7_LIB=	${LOCALBASE}/oracle7/rdbms/lib
-BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
-		${ORACLE7_LIB}/libnlsrtl3.a:${PORTSDIR}/databases/oracle7-client
-RUN_DEPENDS=	${BUILD_DEPENDS}
 .if ${OSVERSION} >= 500000
 LIB_DEPENDS+=	c.4:${PORTSDIR}/misc/compat4x
 .endif
-.if ${OSVERSION} < 470000
-EXTRACT_DEPENDS=	gtar:${PORTSDIR}/archivers/gtar
-TAR=			${LOCALBASE}/bin/gtar
-.endif
-USE_GMAKE=	yes
-ONLY_FOR_ARCHS=	i386
 
-PLIST_SUB+=	PORTVERSION=${PORTVERSION}
+ONLY_FOR_ARCHS=	i386
+NO_BUILD=	yes
 
-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
-#
-# postgres sources
-	@${TAR} zxf ${WRKSRC}/sources/unitsoraclesrc.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'
-
-	${REINPLACE_CMD} 's|/usr/local/oracle8cli/lib|${ORACLE7_LIB}|g' \
-		${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/oracle/Makefile.fpc
-
-do-build:
-	cd ${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/oracle && \
-		${GMAKE} ${MAKE_ENV} all
+# unpack binary and oracle distribution
+	@${MKDIR} ${WRKSRC}/${PORTNAME}
+	@${TAR} zxf ${WRKSRC}/units-${PORTNAME}.${BUILDNAME}.tar.gz \
+		--directory ${WRKSRC}/${PORTNAME}
 
 do-install:
-	cd ${WRKSRC}/share/src/fpc-${PORTVERSION}/packages/base/oracle && \
-		${GMAKE} ${MAKE_ENV} 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>
diff -ruN --exclude=CVS /usr/ports/databases/fpc-oracle/distinfo /usr/ports/databases/fpc-oracle-new/distinfo
--- /usr/ports/databases/fpc-oracle/distinfo	Thu Nov 24 13:54:34 2005
+++ /usr/ports/databases/fpc-oracle-new/distinfo	Mon Jun  5 16:23:47 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
diff -ruN --exclude=CVS /usr/ports/databases/fpc-oracle/files/patch-share::src::fpc-1.0.10::packages::base::oracle::Makefile.fpc /usr/ports/databases/fpc-oracle-new/files/patch-share::src::fpc-1.0.10::packages::base::oracle::Makefile.fpc
--- /usr/ports/databases/fpc-oracle/files/patch-share::src::fpc-1.0.10::packages::base::oracle::Makefile.fpc	Thu Feb 26 09:57:34 2004
+++ /usr/ports/databases/fpc-oracle-new/files/patch-share::src::fpc-1.0.10::packages::base::oracle::Makefile.fpc	Wed Dec 31 19:00:00 1969
@@ -1,10 +0,0 @@
---- share/src/fpc-1.0.10/packages/base/oracle/Makefile.fpc.bak	Sun Apr  6 07:44:46 2003
-+++ share/src/fpc-1.0.10/packages/base/oracle/Makefile.fpc	Thu Jan  8 22:16:08 2004
-@@ -21,5 +21,5 @@
- 
- # in libdir variable must be path to libraries
- # libclntsh.*,libnlsrtl3.*
--#[compiler]
--#libdir=/usr/local/oracle8cli/lib
-+[compiler]
-+libdir=/usr/local/oracle8cli/lib
diff -ruN --exclude=CVS /usr/ports/databases/fpc-oracle/pkg-descr /usr/ports/databases/fpc-oracle-new/pkg-descr
--- /usr/ports/databases/fpc-oracle/pkg-descr	Thu Feb 26 09:57:34 2004
+++ /usr/ports/databases/fpc-oracle-new/pkg-descr	Wed Jun  7 13:49:05 2006
@@ -3,6 +3,3 @@
 interface to Oracle databases.
 
 WWW: http://www.freepascal.org/
-
---
-John Merryweather Cooper <coop9211@uidaho.edu>
diff -ruN --exclude=CVS /usr/ports/databases/fpc-oracle/pkg-plist /usr/ports/databases/fpc-oracle-new/pkg-plist
--- /usr/ports/databases/fpc-oracle/pkg-plist	Thu Feb 26 09:57:34 2004
+++ /usr/ports/databases/fpc-oracle-new/pkg-plist	Wed Jun  7 13:48:18 2006
@@ -1,3 +1,15 @@
-lib/fpc/%%PORTVERSION%%/units/freebsd/oracle/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/freebsd/oracle/oraoci.ppu
-@dirrm lib/fpc/%%PORTVERSION%%/units/freebsd/oracle
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/Package.fpc
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oraoci.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oraoci.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/libporaoci.a
+%%EXAMPLESDIR%%/oracle/test01.pp
+%%EXAMPLESDIR%%/oracle/oraclew.pp
+%%EXAMPLESDIR%%/oracle/Makefile.fpc
+%%EXAMPLESDIR%%/oracle/Makefile
+@dirrm %%EXAMPLESDIR%%/oracle
+@dirrmtry %%EXAMPLESDIR%%
+@dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle
+@dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
+@dirrmtry lib/fpc/%%PORTVERSION%%/units
+@dirrmtry lib/fpc/%%PORTVERSION%%
+@dirrmtry lib/fpc
--- fpc-oracle-2.0.2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200606071852.k57IqUrO067734>