Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 May 2017 20:17:48 +0000 (UTC)
From:      Eugene Grosbein <eugen@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r441491 - in head: . databases databases/p5-DBD-Oracle
Message-ID:  <201705222017.v4MKHmBd089794@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: eugen
Date: Mon May 22 20:17:48 2017
New Revision: 441491
URL: https://svnweb.freebsd.org/changeset/ports/441491

Log:
  Re-add databases/p5-DBD-Oracle removed with r435735 as there is user demand for it.
  Tested by Konstantin Stroikovsky (maintainer of databases/oracle8-client).
  Additional changes:
  
  - take maintainership;
  - simplify port: remove traces of oracle7-client and options OCI7/OCI8;
  - bump PORTREVISION because of these changes.
  
  Approved by:	vsevolod (mentor)

Added:
  head/databases/p5-DBD-Oracle/
     - copied from r433806, head/databases/p5-DBD-Oracle/
Modified:
  head/MOVED
  head/databases/Makefile
  head/databases/p5-DBD-Oracle/Makefile
  head/databases/p5-DBD-Oracle/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Mon May 22 19:28:52 2017	(r441490)
+++ head/MOVED	Mon May 22 20:17:48 2017	(r441491)
@@ -9110,7 +9110,6 @@ net/tcpdump398|net/tcpdump|2017-03-05|Ha
 databases/oracle7-client||2017-03-07|Has expired: Oracle 7 EOL by 13 years
 databases/yasql||2017-03-07|Has expired: Dependent on deprecated oracle7-client
 databases/jdbc-oracle10g||2017-03-07|Has expired: Oracle 10g EOL almost 4 years
-databases/p5-DBD-Oracle||2017-03-07|Has expired: Depends on deprecated Oracle 7 (or 8) client
 databases/jdbc-oracle8i||2017-03-07|Has expired: Oracle8i unsupported and unavailable; fetch site redirects
 databases/jdbc-oracle9i||2017-03-07|Has expired: Oracle 9i is no more supported
 x11/rsibreak-kde4|x11/rsibreak|2017-03-11|Renamed to drop the -kde4 suffix

Modified: head/databases/Makefile
==============================================================================
--- head/databases/Makefile	Mon May 22 19:28:52 2017	(r441490)
+++ head/databases/Makefile	Mon May 22 20:17:48 2017	(r441491)
@@ -303,6 +303,7 @@
     SUBDIR += p5-DBD-Mock
     SUBDIR += p5-DBD-Multi
     SUBDIR += p5-DBD-ODBC
+    SUBDIR += p5-DBD-Oracle
     SUBDIR += p5-DBD-Pg
     SUBDIR += p5-DBD-PgLite
     SUBDIR += p5-DBD-PgPP

Modified: head/databases/p5-DBD-Oracle/Makefile
==============================================================================
--- head/databases/p5-DBD-Oracle/Makefile	Fri Feb 10 15:37:08 2017	(r433806)
+++ head/databases/p5-DBD-Oracle/Makefile	Mon May 22 20:17:48 2017	(r441491)
@@ -3,22 +3,18 @@
 
 PORTNAME=	DBD-Oracle
 PORTVERSION=	1.19
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	databases perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
 
-MAINTAINER=	perl@FreeBSD.org
+MAINTAINER=	bonkor@gmail.com
 COMMENT=	DBI driver for Oracle RDBMS server
 
-DEPRECATED=	Depends on deprecated Oracle 7 (or 8) client
-EXPIRATION_DATE=	2017-03-07
-
 BUILD_DEPENDS=	p5-DBI>=0:databases/p5-DBI
-RUN_DEPENDS:=	${BUILD_DEPENDS}
+RUN_DEPENDS=	p5-DBI>=0:databases/p5-DBI
 
-OPTIONS_DEFINE=	OCI8 EXAMPLES
-OCI8_DESC=	Use OCI8
+OPTIONS_DEFINE=	EXAMPLES
 
 USES=		perl5 shebangfix
 USE_PERL5=	configure patch
@@ -28,26 +24,12 @@ SHEBANG_FILES=	Oracle.ex/*
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MOCI8}
-PORTVERSION=	1.19
 ORACLE_HOME=	${LOCALBASE}/oracle8-client
 BUILD_DEPENDS+=	${ORACLE_HOME}/lib/libclntst8.a:databases/oracle8-client
 CONFIGURE_ARGS=	-V 8.1.7
-PLIST_SUB+=	MKTA=''
-.else
-PORTVERSION=	1.14
-ORACLE_HOME=	${LOCALBASE}/oracle7
-BUILD_DEPENDS+=	${ORACLE_HOME}/rdbms/demo/oracle.mk:databases/oracle7-client
-CONFIGURE_ARGS=	-m ${ORACLE_HOME}/rdbms/demo/oracle.mk
-PLIST_SUB+=	MKTA='@comment '
-.endif
 
 post-patch:
-.if ${PORT_OPTIONS:MOCI8}
 	@${MV} ${WRKSRC}/Oracle.ex/README ${WRKSRC}/Oracle.ex/Readme
-.else
-	@${PERL} -pi -e 's!\(void\*\)(SvOK)!$$1!g' ${WRKSRC}/oci7.c
-.endif
 	@${REINPLACE_CMD} -E -e 's!([, ][&!]?)na\)!\1PL_na)!g' \
 		-e 's!([, =][,&]?)sv_(undef|yes|no)!\1PL_sv_\2!g' \
 		-e 's!dirty!PL_dirty!g' -e 's!dowarn!PL_dowarn!g' \

Modified: head/databases/p5-DBD-Oracle/pkg-plist
==============================================================================
--- head/databases/p5-DBD-Oracle/pkg-plist	Fri Feb 10 15:37:08 2017	(r433806)
+++ head/databases/p5-DBD-Oracle/pkg-plist	Mon May 22 20:17:48 2017	(r441491)
@@ -1,7 +1,7 @@
 bin/ora_explain
 %%SITE_ARCH%%/DBD/Oracle.pm
 %%SITE_ARCH%%/DBD/Oracle/GetInfo.pm
-%%MKTA%%%%SITE_ARCH%%/DBD/mkta.pl
+%%SITE_ARCH%%/DBD/mkta.pl
 %%SITE_ARCH%%/Oraperl.pm
 %%SITE_ARCH%%/auto/DBD/Oracle/Oracle.h
 %%SITE_ARCH%%/auto/DBD/Oracle/Oracle.so



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