- Update to 1.89

- refine BROKEN to make portlint happier
- patch to use on Scalar::Util instead of WeakRef
- mark IGNORE under old perl which don't support weak reference

PR:		96656
Submitted by:	leeym
Approved by:	maintainer

6 files changed, 60 insertions, 16 deletions

diff --git a/biology/p5-AcePerl/Makefile b/biology/p5-AcePerl/Makefile
index 50e3d90..358277e 100644
--- a/biology/p5-AcePerl/Makefile
+++ b/biology/p5-AcePerl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	AcePerl
-PORTVERSION=	1.83
+PORTVERSION=	1.89
 CATEGORIES=	biology databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Ace
@@ -15,11 +15,14 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	pgollucci@p6m7g8.com
 COMMENT=	Perl5 interface to the ACEDB genome database system
 
-BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5 \
+		${SITE_PERL}/${PERL_ARCH}/Scalar/Util.pm:${PORTSDIR}/lang/p5-Scalar-List-Utils \
+		${SITE_PERL}/Cache/Cache.pm:${PORTSDIR}/devel/p5-Cache-Cache
+BUILD_DEPENDS=	${RUN_DEPENDS}
 
 PERL_CONFIGURE=	yes
 
+MAN1=		ace.pl.1
 MAN3=		Ace.3 Ace::Browser::AceSubs.3 Ace::Browser::SearchSubs.3 \
 		Ace::Browser::SiteDefs.3 Ace::Graphics::Fk.3 \
 		Ace::Graphics::Glyph.3 Ace::Graphics::Glyph::anchored_arrow.3 \
@@ -42,12 +45,16 @@ MAN3=		Ace.3 Ace::Browser::AceSubs.3 Ace::Browser::SearchSubs.3 \
 
 .include <bsd.port.pre.mk>
 
+.if ${PERL_LEVEL} < 500600
+IGNORE=		requires Perl 5.6.0
+.endif
+
 .if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-BROKEN=		"Does not compile on amd64 or ia64 (missing -fPIC)"
+BROKEN=		Does not compile on amd64 or ia64 (missing -fPIC)
 .endif
 
 post-patch:
 	@ ${SED} -e 's|XX__CC__XX|${CC}|' < ${FILESDIR}/FREEBSD_DEF \
-	  > ${WRKSRC}/ace/wmake/FREEBSD_DEF
+	  > ${WRKSRC}/acelib/wmake/FREEBSD_DEF
 
 .include <bsd.port.post.mk>
diff --git a/biology/p5-AcePerl/distinfo b/biology/p5-AcePerl/distinfo
index 948bd94..3cb9061 100644
--- a/biology/p5-AcePerl/distinfo
+++ b/biology/p5-AcePerl/distinfo
@@ -1,3 +1,3 @@
-MD5 (AcePerl-1.83.tar.gz) = d1cc9e852ce7fb23a0f2eac739b040fb
-SHA256 (AcePerl-1.83.tar.gz) = 58164fff2977f37ad1298492b8ef74dca8adb314611ec99d6ef466f5d55300cc
-SIZE (AcePerl-1.83.tar.gz) = 294151
+MD5 (AcePerl-1.89.tar.gz) = 547da3ca59894e99448408cfe9a8ae6e
+SHA256 (AcePerl-1.89.tar.gz) = f3be1f9d31756761f7e1a6043e86b6b39d746fc6cc2bb52663860c31d4e7d64a
+SIZE (AcePerl-1.89.tar.gz) = 299210
diff --git a/biology/p5-AcePerl/files/patch-aa b/biology/p5-AcePerl/files/patch-aa
index 3dd954a..1bcb9d1 100644
--- a/biology/p5-AcePerl/files/patch-aa
+++ b/biology/p5-AcePerl/files/patch-aa
@@ -1,5 +1,5 @@
---- ace/wh/mystdlib.h.orig	Mon Jul 16 23:04:45 2001
-+++ ace/wh/mystdlib.h	Mon Aug 13 12:42:25 2001
+--- acelib/wh/mystdlib.h.orig	Mon Jul 16 23:04:45 2001
++++ acelib/wh/mystdlib.h	Mon Aug 13 12:42:25 2001
 @@ -161,7 +161,8 @@
  #endif
  
@@ -10,8 +10,8 @@
  
  #ifdef WIN32
  #include <mbctype.h>
---- ace/wh/mydirent.h.orig	Mon Jul 16 23:04:45 2001
-+++ ace/wh/mydirent.h	Mon Aug 13 12:41:59 2001
+--- acelib/wh/mydirent.h.orig	Mon Jul 16 23:04:45 2001
++++ acelib/wh/mydirent.h	Mon Aug 13 12:41:59 2001
 @@ -55,7 +55,7 @@
  extern char *getwd(char *pathname) ;
  #endif /* HP || SOLARIS || WIN32 */
diff --git a/biology/p5-AcePerl/files/patch-ab b/biology/p5-AcePerl/files/patch-ab
index 2ad8495..982bdef 100644
--- a/biology/p5-AcePerl/files/patch-ab
+++ b/biology/p5-AcePerl/files/patch-ab
@@ -1,9 +1,9 @@
---- ace/memsubs.c.orig	Mon Jan 11 02:01:29 1999
-+++ ace/memsubs.c	Thu Jul 27 17:18:45 2000
+--- acelib/memsubs.c.orig	Mon Jan 11 02:01:29 1999
++++ acelib/memsubs.c	Thu Jul 27 17:18:45 2000
 @@ -21,7 +21,7 @@
  #if defined(NEXT) || defined(HP) || defined(MACINTOSH) 
  extern void* malloc(mysize_t size) ;
- #elif !defined(WIN32)
+ #elif !defined(WIN32) && !defined(DARWIN)
 -#include <malloc.h>   /* normal machines  */
 +#include <stdlib.h>   /* normal machines  */
  #endif
diff --git a/biology/p5-AcePerl/files/patch-weaken b/biology/p5-AcePerl/files/patch-weaken
new file mode 100644
index 0000000..63170d8
--- /dev/null
+++ b/biology/p5-AcePerl/files/patch-weaken
@@ -0,0 +1,33 @@
+--- Ace.pm.orig	Tue May  2 17:32:55 2006
++++ Ace.pm	Tue May  2 17:33:12 2006
+@@ -2,7 +2,7 @@
+ 
+ use strict;
+ use Carp qw(croak carp cluck);
+-use WeakRef;
++use Scalar::Util qw(weaken);
+ 
+ use vars qw($VERSION @ISA @EXPORT @EXPORT_OK $Error);
+ 
+--- ChangeLog.orig	Tue May  2 17:33:12 2006
++++ ChangeLog	Tue May  2 17:33:22 2006
+@@ -1,7 +1,7 @@
+ 1.89	Wed Mar  9 18:25:45 EST 2005
+ 	1. Added caching code.
+ 	2. Now requires ace binaries 4_9s or later.
+-	3. Requires CACHE::CACHE and WeakRef for caching.
++	3. Requires CACHE::CACHE and Scalar::Util for caching.
+ 	
+ 1.87  10/3/03
+ 	1. Fixed unreadable GIF images produced by recent versions of GifAceServer.
+--- Makefile.PL.orig	Tue May  2 17:33:22 2006
++++ Makefile.PL	Tue May  2 17:33:32 2006
+@@ -35,7 +35,7 @@
+ 	      'INC'	     => "-I$headers",
+ 	      PREREQ_PM      => {
+ 				 'Digest::MD5'   => 2.0,
+-				 'WeakRef'       => 0.01,
++				 'Scalar::Util'  => 1,
+ 				 'Cache::Cache'  => 1.03,
+ 				},
+ 	      'dist'         => {'COMPRESS'=>'gzip -9f', 
diff --git a/biology/p5-AcePerl/pkg-plist b/biology/p5-AcePerl/pkg-plist
index e37eb6b..5261d57 100644
--- a/biology/p5-AcePerl/pkg-plist
+++ b/biology/p5-AcePerl/pkg-plist
@@ -1,3 +1,4 @@
+bin/ace.pl
 %%SITE_PERL%%/%%PERL_ARCH%%/Ace.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Ace/Browser/AceSubs.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Ace/Browser/GeneSubs.pm
@@ -52,6 +53,7 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/_insert.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/_special_dump.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/_to_ace_date.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/_xmlNumber.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/add_row.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/add_tree.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Object/asAce.al
@@ -87,10 +89,10 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/autosplit.ix
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/class_count.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/classes.al
-%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/count.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/date.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/date_style.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/datetime.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/debug.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/fetch_many.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/find.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/freeprotect.al
@@ -106,6 +108,8 @@
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/split.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/status.al
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/timestamps.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/title.al
+%%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/version.al
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Sequence/Feature
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/Sequence
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/auto/Ace/RPC