Date: Thu, 9 Sep 2004 01:53:58 +0800 (CST) From: Yen-Ming Lee <leeym@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/71498: update port: databases/p5-GDBM: update and unbreak Message-ID: <20040908175358.AF2F33EAC3B@utopia.leeym.com> Resent-Message-ID: <200409081800.i88I0g6c020967@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 71498
>Category: ports
>Synopsis: update port: databases/p5-GDBM: update and unbreak
>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: Wed Sep 08 18:00:42 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Yen-Ming Lee
>Release: FreeBSD 5.3-BETA3 i386
>Organization:
>Environment:
System: FreeBSD utopia.leeym.com 5.3-BETA3 FreeBSD 5.3-BETA3 #1: Sun Sep 5 01:06:46 CST 2004 root@utopia.leeym.com:/usr/obj/usr/src/sys/UTOPIA i386
>Description:
- Update p5-GDBM from 1.00 (included in perl-5.00503) to 1.05 (included perl-5.6.1)
- Add CONFLICTS to lang/perl5 and lang/perl5.8 if WITH_GDBM is defined
- Fix PORTNAME by adding PKGNAMEPREFIX
- Configure perl before configuring GDBM_FILE extension
- Mark IGNORE if ${PERL_LEVER} < 500600
tested under perl-5.6.1 and perl-5.8.5
>How-To-Repeat:
>Fix:
--- p5-GDBM.diff begins here ---
Index: lang/perl5/Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/perl5/Makefile,v
retrieving revision 1.63
diff -u -r1.63 Makefile
--- lang/perl5/Makefile 1 Mar 2004 15:38:43 -0000 1.63
+++ lang/perl5/Makefile 8 Sep 2004 17:34:05 -0000
@@ -40,6 +40,7 @@
CONFIGURE_ARGS+= -Di_gdbm
LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm
PLIST_SUB+= GDBM=""
+CONFLICTS+= p5-GDBM-[0-9]*
.else
CONFIGURE_ARGS+= -Ui_gdbm
PLIST_SUB+= GDBM="@comment "
Index: lang/perl5.8/Makefile
===================================================================
RCS file: /home/pcvs/ports/lang/perl5.8/Makefile,v
retrieving revision 1.76
diff -u -r1.76 Makefile
--- lang/perl5.8/Makefile 30 Jul 2004 08:31:19 -0000 1.76
+++ lang/perl5.8/Makefile 8 Sep 2004 17:34:05 -0000
@@ -57,6 +57,7 @@
CONFIGURE_ARGS+= -Di_gdbm
LIB_DEPENDS+= gdbm.3:${PORTSDIR}/databases/gdbm
PLIST_SUB+= GDBM=""
+CONFLICTS+= p5-GDBM-[0-9]*
.else
CONFIGURE_ARGS+= -Ui_gdbm
PLIST_SUB+= GDBM="@comment "
Index: databases/p5-GDBM/Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/p5-GDBM/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- databases/p5-GDBM/Makefile 2 Mar 2004 10:29:29 -0000 1.14
+++ databases/p5-GDBM/Makefile 8 Sep 2004 17:34:05 -0000
@@ -7,28 +7,50 @@
# $FreeBSD: ports/databases/p5-GDBM/Makefile,v 1.14 2004/03/02 10:29:29 kris Exp $
#
-PORTNAME= p5-GDBM
-PORTVERSION= 1.00
+PORTNAME= GDBM
+PORTVERSION= 1.05
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= ../../src
-DISTNAME= perl5.005_03
+PKGNAMEPREFIX= p5-
+DISTNAME= perl-5.6.1
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl module to use the GNU Data Base Manager (gdbm)
LIB_DEPENDS= gdbm.3:${PORTSDIR}/databases/gdbm
-PERL_CONFIGURE= yes
-
-WRKSRC= ${WRKDIR}/${DISTNAME}/ext/GDBM_File
-
-MAN3= GDBM_File.3
+USE_REINPLACE= yes
+HAS_CONFIGURE= yes
+CONFIGURE_SCRIPT=Configure
+CONFIGURE_ARGS= -sde -Dprefix=${PREFIX} \
+ -Darchlib=${PREFIX}/lib/perl5/${PERL_VER}/${PERL_ARCH} \
+ -Dprivlib=${PREFIX}/lib/perl5/${PERL_VER} \
+ -Dman3dir=${PREFIX}/lib/perl5/${PERL_VER}/perl/man/man3 \
+ -Dman1dir=${PREFIX}/man/man1 \
+ -Dsitearch=${SITE_PERL}/${PERL_ARCH} \
+ -Dsitelib=${SITE_PERL} -Dscriptdir=${PREFIX}/bin \
+ -Dsiteman3dir=${PREFIX}/lib/perl5/${PERL_VER}/man/man3 \
+ -Dsiteman1dir=${PREFIX}/man/man1 \
+ -Ui_malloc -Ui_iconv -Uinstallusrbinperl \
+ -Dcc="${CC}" -Doptimize="${CFLAGS}" -Duseshrplib \
+ -Di_gdbm
+BUILD_WRKSRC= ${WRKSRC}/ext/GDBM_File
+INSTALL_WRKSRC= ${BUILD_WRKSRC}
+
+post-patch:
+ @${REINPLACE_CMD} -Ee "s|MAN3PODS.*|INC => '-I${LOCALBASE}/include',|g" \
+ ${WRKSRC}/ext/GDBM_File/Makefile.PL
+
+post-configure:
+ ${REINPLACE_CMD} -Ee '/<(built-in|command line)>/d' ${WRKSRC}/makefile
+ cd ${WRKSRC} && ${MAKE} lib/Config.pm
+ cd ${BUILD_WRKSRC} && ${PERL5} Makefile.PL
.include <bsd.port.pre.mk>
-.if ${PERL_LEVEL} >= 500800
-BROKEN= "Does not compile"
+.if ${PERL_LEVER} < 500600
+IGNORE= Port requires perl 5.6.1 or later. Install lang/perl5 or lang/perl5.8 then try again
.endif
.include <bsd.port.post.mk>
Index: databases/p5-GDBM/distinfo
===================================================================
RCS file: /home/pcvs/ports/databases/p5-GDBM/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- databases/p5-GDBM/distinfo 29 Jan 2004 07:22:48 -0000 1.2
+++ databases/p5-GDBM/distinfo 8 Sep 2004 17:34:05 -0000
@@ -1,2 +1,2 @@
-MD5 (perl5.005_03.tar.gz) = 427890d97e32430341c1fa80f55277a7
-SIZE (perl5.005_03.tar.gz) = 3679040
+MD5 (perl-5.6.1.tar.gz) = ec1ff15464809b562aecfaa2e65edba6
+SIZE (perl-5.6.1.tar.gz) = 5983695
--- p5-GDBM.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20040908175358.AF2F33EAC3B>