From erwin@bamse.staff.tdk.net  Mon Jun 18 12:50:39 2007
Return-Path: <erwin@bamse.staff.tdk.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id AAAC616A400
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 18 Jun 2007 12:50:39 +0000 (UTC)
	(envelope-from erwin@bamse.staff.tdk.net)
Received: from bamse.staff.tdk.net (tdk.net [194.239.134.102])
	by mx1.freebsd.org (Postfix) with ESMTP id 4BB8F13C4AD
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 18 Jun 2007 12:50:38 +0000 (UTC)
	(envelope-from erwin@bamse.staff.tdk.net)
Received: from bamse.staff.tdk.net (localhost [127.0.0.1])
	by bamse.staff.tdk.net (8.14.1/8.14.1) with ESMTP id l5ICobCG068710
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 18 Jun 2007 14:50:37 +0200 (CEST)
	(envelope-from erwin@bamse.staff.tdk.net)
Received: (from erwin@localhost)
	by bamse.staff.tdk.net (8.14.1/8.14.1/Submit) id l5ICob3e068709;
	Mon, 18 Jun 2007 14:50:37 +0200 (CEST)
	(envelope-from erwin)
Message-Id: <200706181250.l5ICob3e068709@bamse.staff.tdk.net>
Date: Mon, 18 Jun 2007 14:50:37 +0200 (CEST)
From: Erwin Lansing <erwin@freebsd.org>
Reply-To: Erwin Lansing <erwin@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: databases/p5-DBD-Oracle remove 4.x workaround 
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         113821
>Category:       ports
>Synopsis:       databases/p5-DBD-Oracle remove 4.x workaround
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    skv
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 18 13:00:12 GMT 2007
>Closed-Date:    Tue Jul 03 18:35:19 GMT 2007
>Last-Modified:  Tue Jul  3 18:40:10 GMT 2007
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->skv 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Jun 18 13:00:20 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113821 
State-Changed-From-To: open->closed 
State-Changed-By: erwin 
State-Changed-When: Tue Jul 3 18:35:11 UTC 2007 
State-Changed-Why:  
Committed with maintainer timeout 

http://www.freebsd.org/cgi/query-pr.cgi?pr=113821 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/113821: commit references a PR
Date: Tue,  3 Jul 2007 18:35:11 +0000 (UTC)

 erwin       2007-07-03 18:35:03 UTC
 
   FreeBSD ports repository
 
   Modified files:
     databases/p5-DBD-Oracle Makefile 
   Log:
   Remove 4.x workaround
   
   PR:             113821
   Submitted by:   erwin
   Approved by:    maintainer timeout
   
   Revision  Changes    Path
   1.10      +3 -11     ports/databases/p5-DBD-Oracle/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
