ports/113821: databases/p5-DBD-Oracle remove 4.x workaround

[Erwin Lansing]

>Number:         113821
>Category:       ports
>Synopsis:       databases/p5-DBD-Oracle remove 4.x workaround
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 18 13:00:12 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Erwin Lansing
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD bamse.staff.tdk.net 7.0-CURRENT FreeBSD 7.0-CURRENT #5: Sat May 26 14:57:41 CEST 2007 root at bamse.staff.tdk.net:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:

Remove 4.x workaround

>How-To-Repeat:
	
>Fix:

	

--- oracle.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/p5-DBD-Oracle/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile	5 Nov 2006 17:22:08 -0000	1.9
+++ Makefile	18 Jun 2007 12:49:35 -0000
@@ -18,6 +18,7 @@
 
 OPTIONS=	OCI8 "Use OCI8" off
 
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
@@ -42,24 +43,15 @@
 PORTVERSION=	1.19
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 ORACLE_HOME=	${LOCALBASE}/oracle8-client
-BUILD_DEPENDS=	${ORACLE_HOME}/lib/libclntst8.a:${PORTSDIR}/databases/oracle8-client
+BUILD_DEPENDS+=	${ORACLE_HOME}/lib/libclntst8.a:${PORTSDIR}/databases/oracle8-client
 CONFIGURE_ARGS=	-V 8.1.7
 .else
 PORTVERSION=	1.14
 ORACLE_HOME=	${LOCALBASE}/oracle7
-BUILD_DEPENDS=	${ORACLE_HOME}/rdbms/demo/oracle.mk:${PORTSDIR}/databases/oracle7-client
+BUILD_DEPENDS+=	${ORACLE_HOME}/rdbms/demo/oracle.mk:${PORTSDIR}/databases/oracle7-client
 CONFIGURE_ARGS=	-m ${ORACLE_HOME}/rdbms/demo/oracle.mk
 .endif
 
-.if ${PERL_LEVEL} < 500600
-.ifdef WITH_OCI8
-IGNORE=	perl 5.6 or newer required. Install lang/perl5.8 and try again
-.endif
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137
-.else
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
-.endif
-
 post-patch:
 .ifdef WITH_OCI8
 	@${MV} ${WRKSRC}/Oracle.ex/README ${WRKSRC}/Oracle.ex/Readme
--- oracle.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: