6 files changed, 33 insertions, 16 deletions

diff --git a/databases/linux-oracle-instantclient-basic/Makefile b/databases/linux-oracle-instantclient-basic/Makefile
index a33dc87082da..00cbda94155d 100644
--- a/databases/linux-oracle-instantclient-basic/Makefile
+++ b/databases/linux-oracle-instantclient-basic/Makefile
@@ -6,36 +6,35 @@
 #
 
 PORTNAME=		instantclient
-PORTVERSION=		10.1.0.3
+PORTVERSION=		10.2.0.1.${DISTDATE}
 CATEGORIES=		databases
 MASTER_SITES=		#http://www.oracle.com/technology/software/tech/oci/instantclient/
 PKGNAMEPREFIX=		linux-oracle-
 PKGNAMESUFFIX=		-basic
-DISTNAME=		${PORTNAME}${PKGNAMESUFFIX}-linux32-${PORTVERSION}
+DISTNAME=		${PORTNAME}${PKGNAMESUFFIX}-${LINUXARCH}-${PORTVERSION:S/.${DISTDATE}/-${DISTDATE}/}
 DIST_SUBDIR=		oracle
 
-MAINTAINER=		alecn2002@yandex.ru
+MAINTAINER=		nork@FreeBSD.org
 COMMENT=		Oracle 10 InstantClient basics. Works with Oracle RDBMS 8.1.2+
 
-ONLY_FOR_ARCHS=		i386
-# Couldn't test for IA64, so commented it out
-# ONLY_FOR_ARCHS+=	ia64
+ONLY_FOR_ARCHS=		i386 ia64 amd64
 NO_BUILD=		yes
 NO_FILTER_SHLIBS=	yes
+MD5_FILE=		${MASTERDIR}/distinfo.${ARCH}
 
 RESTRICTED=		Packaging prohibited by Oracle license
 
 USE_ZIP=		yes
 USE_LINUX_PREFIX=	yes
 
-LIBS_LIST=		libclntsh.so.10.1 \
-			libnnz10.so \
-			libocci.so.10.1 \
-			libociei.so \
-			libocijdbc10.so \
-			libocci10_296.so.10.1
+LIBS_LIST=		libclntsh.so.10.1	\
+			libnnz10.so		\
+			libocci.so.10.1		\
+			libociei.so		\
+			libocijdbc10.so		\
+			ojdbc14.jar
 
-WRKSRC=			${WRKDIR}/instantclient10_1
+WRKSRC=			${WRKDIR}/instantclient10_2
 
 INSTLIBSDIR=		${PREFIX}/usr/lib/oracle/${PORTVERSION}/client/lib
 
@@ -43,6 +42,17 @@ PLIST_SUB=		PORTVERSION=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
+.if		${ARCH} == "i386"
+LINUXARCH=		linux32
+DISTDATE=		20050713
+.elif		${ARCH} == "amd64"
+LINUXARCH=		linux-x86-64
+DISTDATE=		20051025
+.elif		${ARCH} == "ia64"
+LINUXARCH=		linux-ia64
+DISTDATE=		20051213
+.endif
+
 .if !exists(${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX})
 ECHO_MSG=		${PRINTF} %b
 
diff --git a/databases/linux-oracle-instantclient-basic/distinfo b/databases/linux-oracle-instantclient-basic/distinfo
deleted file mode 100644
index b66fffccb312..000000000000
--- a/databases/linux-oracle-instantclient-basic/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 (oracle/instantclient-basic-linux32-10.1.0.3.zip) = b43820c427f715cd9c26f6031334169d
-SIZE (oracle/instantclient-basic-linux32-10.1.0.3.zip) = 31409620
diff --git a/databases/linux-oracle-instantclient-basic/distinfo.amd64 b/databases/linux-oracle-instantclient-basic/distinfo.amd64
new file mode 100644
index 000000000000..8a057d5e1fc5
--- /dev/null
+++ b/databases/linux-oracle-instantclient-basic/distinfo.amd64
@@ -0,0 +1,3 @@
+MD5 (oracle/instantclient-basic-linux-x86-64-10.2.0.1-20051025.zip) = 44c5b53361756eadc470ed307260bf7c
+SHA256 (oracle/instantclient-basic-linux-x86-64-10.2.0.1-20051025.zip) = 437f811eaae7a77b560a5e624996b2e326cd50c6f7e41636f7b97546792e7033
+SIZE (oracle/instantclient-basic-linux-x86-64-10.2.0.1-20051025.zip) = 35574833
diff --git a/databases/linux-oracle-instantclient-basic/distinfo.i386 b/databases/linux-oracle-instantclient-basic/distinfo.i386
new file mode 100644
index 000000000000..bc2a6591ca4c
--- /dev/null
+++ b/databases/linux-oracle-instantclient-basic/distinfo.i386
@@ -0,0 +1,3 @@
+MD5 (oracle/instantclient-basic-linux32-10.2.0.1-20050713.zip) = 8900afe3666a6443a16bf7b04cd1c4e0
+SHA256 (oracle/instantclient-basic-linux32-10.2.0.1-20050713.zip) = d6b748dad0781b59d263b07ad0e562fe76151b27c7eec05d57edad28dc53d247
+SIZE (oracle/instantclient-basic-linux32-10.2.0.1-20050713.zip) = 33808746
diff --git a/databases/linux-oracle-instantclient-basic/distinfo.ia64 b/databases/linux-oracle-instantclient-basic/distinfo.ia64
new file mode 100644
index 000000000000..fe1b816a1aba
--- /dev/null
+++ b/databases/linux-oracle-instantclient-basic/distinfo.ia64
@@ -0,0 +1,3 @@
+MD5 (oracle/instantclient-basic-linux-ia64-10.2.0.1-20051213.zip) = f78436d2ce27813ef5971367ef0085fe
+SHA256 (oracle/instantclient-basic-linux-ia64-10.2.0.1-20051213.zip) = b4d83dccd825695fd6c0bceae1c7775e120aee43cd9c323476b316a90585c599
+SIZE (oracle/instantclient-basic-linux-ia64-10.2.0.1-20051213.zip) = 42624297
diff --git a/databases/linux-oracle-instantclient-basic/pkg-plist b/databases/linux-oracle-instantclient-basic/pkg-plist
index f33536df6085..3029618aa2e9 100644
--- a/databases/linux-oracle-instantclient-basic/pkg-plist
+++ b/databases/linux-oracle-instantclient-basic/pkg-plist
@@ -3,7 +3,7 @@ usr/lib/oracle/%%PORTVERSION%%/client/lib/libnnz10.so
 usr/lib/oracle/%%PORTVERSION%%/client/lib/libocci.so.10.1
 usr/lib/oracle/%%PORTVERSION%%/client/lib/libociei.so
 usr/lib/oracle/%%PORTVERSION%%/client/lib/libocijdbc10.so
-usr/lib/oracle/%%PORTVERSION%%/client/lib/libocci10_296.so.10.1
+usr/lib/oracle/%%PORTVERSION%%/client/lib/ojdbc14.jar
 @dirrm usr/lib/oracle/%%PORTVERSION%%/client/lib
 @dirrm usr/lib/oracle/%%PORTVERSION%%/client
 @dirrm usr/lib/oracle/%%PORTVERSION%%