2 files changed, 23 insertions, 20 deletions

diff --git a/databases/p5-DBD-Oracle/Makefile b/databases/p5-DBD-Oracle/Makefile
index 2e25322cc25f..18dc44ddec80 100644
--- a/databases/p5-DBD-Oracle/Makefile
+++ b/databases/p5-DBD-Oracle/Makefile
@@ -11,15 +11,11 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	DBI driver for Oracle RDBMS server
 
-OPTIONS_DEFINE=	OCI8 DOCS
-OCI8_DESC=	Use OCI8
-
 BUILD_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-DEPRECATED=	Broken for more than 6 month
-EXPIRATION_DATE=	2013-03-05
-BROKEN=		Does not build
+OPTIONS_DEFINE=	OCI8 EXAMPLES
+OCI8_DESC=	Use OCI8
 
 PERL_CONFIGURE=	yes
 CONFIGURE_ENV=	ORACLE_HOME="${ORACLE_HOME}"
@@ -35,22 +31,28 @@ WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 ORACLE_HOME=	${LOCALBASE}/oracle8-client
 BUILD_DEPENDS+=	${ORACLE_HOME}/lib/libclntst8.a:${PORTSDIR}/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:${PORTSDIR}/databases/oracle7-client
 CONFIGURE_ARGS=	-m ${ORACLE_HOME}/rdbms/demo/oracle.mk
+PLIST_SUB+=	MKTA='@comment '
 .endif
 
 post-patch:
-.ifdef WITH_OCI8
+.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' \
+		${WRKSRC}/dbdimp.c ${WRKSRC}/Oracle.xs ${WRKSRC}/oci[78].c
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
+.if ${PORT_OPTIONS:MEXAMPLES}
 	@${ECHO_MSG} "===>   Installing examples for ${PKGNAME}"
 	@${MKDIR} ${EXAMPLESDIR}
 	@${INSTALL_DATA} ${WRKSRC}/Oracle.ex/Readme 	${EXAMPLESDIR}
diff --git a/databases/p5-DBD-Oracle/pkg-plist b/databases/p5-DBD-Oracle/pkg-plist
index 2e27f21e9cb6..7306bd8c4dd7 100644
--- a/databases/p5-DBD-Oracle/pkg-plist
+++ b/databases/p5-DBD-Oracle/pkg-plist
@@ -1,6 +1,7 @@
 bin/ora_explain
 %%SITE_PERL%%/%%PERL_ARCH%%/DBD/Oracle.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/DBD/Oracle/GetInfo.pm
+%%MKTA%%%%SITE_PERL%%/%%PERL_ARCH%%/DBD/mkta.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/Oraperl.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Oracle/.packlist
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Oracle/Oracle.bs
@@ -10,18 +11,18 @@ bin/ora_explain
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Oracle/mk.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Oracle/ocitrace.h
 %%SITE_PERL%%/%%PERL_ARCH%%/oraperl.ph
-%%PORTDOCS%%%%EXAMPLESDIR%%/Readme
-%%PORTDOCS%%%%EXAMPLESDIR%%/bind.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/commit.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/curref.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/ex.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/japh
-%%PORTDOCS%%%%EXAMPLESDIR%%/mktable.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/oradump.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/proc.pl
-%%PORTDOCS%%%%EXAMPLESDIR%%/sql
-%%PORTDOCS%%%%EXAMPLESDIR%%/tabinfo.pl
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Readme
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bind.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/commit.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/curref.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ex.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/japh
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mktable.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/oradump.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/proc.pl
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sql
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tabinfo.pl
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/DBD/Oracle
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Oracle
 @dirrmtry %%SITE_PERL%%/%%PERL_ARCH%%/DBD