ports/113809: databases/mysql-editor remove 4.x workaround

[Erwin Lansing]

>Number:         113809
>Category:       ports
>Synopsis:       databases/mysql-editor 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 07:30:04 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 workaround for 4.x

>How-To-Repeat:
	
>Fix:

	

--- editor.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/mysql-editor/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile	10 Nov 2006 18:36:28 -0000	1.7
+++ Makefile	18 Jun 2007 07:22:44 -0000
@@ -15,7 +15,9 @@
 MAINTAINER=	mi at aldan.algebra.com
 COMMENT=	CGI scripts in Perl to edit your MySQL tables
 
-RUN_DEPENDS=	${CGI_BIN}:${PORTSDIR}/${APACHE_PORT}
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI \
+		${CGI_BIN}:${PORTSDIR}/${APACHE_PORT}
 
 NO_BUILD=	True
 APACHE_COMPAT=	True
@@ -32,14 +34,4 @@
 	${INSTALL_DATA} ${WRKSRC}/readme.html ${PREFIX}/share/doc/mysql-editor
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${PERL_LEVEL} < 500600
-BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137
-RUN_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
-RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- editor.diff ends here ---


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