this fixes up the PKGNAME in databases/p5-sybperl which lost its
p5- prefix in 2005 (and regen patches, move to new REVISIONS etc
while there).
there was an old "@conflict p5-syberl-*" which doesn't make sense,
the package was never named this (not syberl not sybperl) so I've
removed that.
a quirks entry is required to allow pkg_add -u to update cleanly.
ok?
Index: databases/p5-sybperl/Makefile
===================================================================
RCS file: /cvs/ports/databases/p5-sybperl/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- databases/p5-sybperl/Makefile 1 Aug 2009 14:11:45 -0000 1.24
+++ databases/p5-sybperl/Makefile 1 Sep 2010 09:46:19 -0000
@@ -1,24 +1,25 @@
# $OpenBSD: Makefile,v 1.24 2009/08/01 14:11:45 sthen Exp $
DISTNAME= sybperl-2.18
+PKGNAME= p5-${DISTNAME}
CATEGORIES= databases perl5
-# N.B. no p5- prefix
-PKGNAME= ${DISTNAME}p4
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= m
-SHARED_ONLY= Yes
+REVISION= 5
+WANTLIB += m sybdb.>=5 ct.>=3
+
+SHARED_ONLY= Yes
COMMENT= Sybase database access in Perl
HOMEPAGE= http://www.peppler.org/freeware/sybperl.html
MASTER_SITES= http://www.peppler.org/downloads/
MODULES= devel/gettext
-LIB_DEPENDS= sybdb.>=5,ct.>=3::databases/freetds
+LIB_DEPENDS= ::databases/freetds
CONFIGURE_STYLE= perl
CONFIGURE_ENV= SYBASE="${LOCALBASE}"
Index: databases/p5-sybperl/patches/patch-CTlib_Makefile_PL
===================================================================
RCS file: /cvs/ports/databases/p5-sybperl/patches/patch-CTlib_Makefile_PL,v
retrieving revision 1.3
diff -u -p -r1.3 patch-CTlib_Makefile_PL
--- databases/p5-sybperl/patches/patch-CTlib_Makefile_PL 16 Feb 2004
18:18:43 -0000 1.3
+++ databases/p5-sybperl/patches/patch-CTlib_Makefile_PL 1 Sep 2010
09:46:19 -0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-CTlib_Makefile_PL,v 1.3 2004/02/16 18:18:43 jcs Exp $
---- CTlib/Makefile.PL.orig Tue Oct 22 12:59:28 2002
-+++ CTlib/Makefile.PL Wed Oct 30 09:17:13 2002
-@@ -51,7 +51,7 @@
+--- CTlib/Makefile.PL.orig Fri Nov 19 10:38:21 2004
++++ CTlib/Makefile.PL Wed Sep 1 10:41:21 2010
+@@ -57,7 +57,7 @@ if($^O eq 'MSWin32') {
} else {
$inc_string = "-I$SYBASE/include";
$def_string = "-DCTLIBVS=$CTLIBVS -DSYBPLVER='\"\${VERSION}\"'
$$sattr{EXTRA_DEFS}";
- $lib_string = "-L$SYBASE/lib -lct -lcs -ltcl -lcomn -lintl -lblk";
+ $lib_string = "-L$SYBASE/lib -lct -ltds -liconv -lintl";
- # Linux uses libsybtcl instead of libtcl to avoid conflicts with tcl/tk
- if(-e "$SYBASE/lib/libsybtcl$Config{lib_ext}" ||
+ $lib_string =~ s/-l/-lsyb_/g if $^O eq 'VMS';
+ $lib_string .= " $$sattr{EXTRA_LIBS} -lm";
Index: databases/p5-sybperl/patches/patch-Makefile_PL
===================================================================
RCS file: /cvs/ports/databases/p5-sybperl/patches/patch-Makefile_PL,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile_PL
--- databases/p5-sybperl/patches/patch-Makefile_PL 31 Oct 2002 01:32:08
-0000 1.1
+++ databases/p5-sybperl/patches/patch-Makefile_PL 1 Sep 2010 09:46:19
-0000
@@ -1,12 +1,12 @@
$OpenBSD: patch-Makefile_PL,v 1.1 2002/10/31 01:32:08 jcs Exp $
---- Makefile.PL.orig Wed Oct 30 09:18:40 2002
-+++ Makefile.PL Wed Oct 30 09:18:41 2002
-@@ -8,7 +8,7 @@
-
- $sattr = &config;
+--- Makefile.PL.orig Fri Nov 19 10:35:37 2004
++++ Makefile.PL Wed Sep 1 10:41:21 2010
+@@ -11,7 +11,7 @@ require './util/config.pl';
+ my $sattr = &config();
+ my $written_pwd_file = 'PWD';
-configPwd();
+#configPwd();
- $linktype = defined($$sattr{LINKTYPE}) ? $$sattr{LINKTYPE} : 'dynamic';
+ my $linktype = defined($$sattr{LINKTYPE}) ? $$sattr{LINKTYPE} : 'dynamic';
Index: databases/p5-sybperl/pkg/PLIST
===================================================================
RCS file: /cvs/ports/databases/p5-sybperl/pkg/PLIST,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST
--- databases/p5-sybperl/pkg/PLIST 5 Sep 2005 13:12:47 -0000 1.10
+++ databases/p5-sybperl/pkg/PLIST 1 Sep 2010 09:46:19 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST,v 1.10 2005/09/05 13:12:47 espie Exp $
-...@conflict p5-syberl-*
+...@conflict sybperl-*
${P5ARCH}/
${P5ARCH}/Sybase/
${P5ARCH}/Sybase/BCP.pm
Index: devel/quirks/Makefile
===================================================================
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- devel/quirks/Makefile 2 Aug 2010 08:23:24 -0000 1.19
+++ devel/quirks/Makefile 1 Sep 2010 09:46:19 -0000
@@ -5,7 +5,7 @@ CATEGORIES = devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-1.17
+PKGNAME = quirks-1.18
PKG_ARCH = *
MAINTAINER = Marc Espie <[email protected]>
Index: devel/quirks/files/Quirks.pm
===================================================================
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.23
diff -u -p -r1.23 Quirks.pm
--- devel/quirks/files/Quirks.pm 2 Aug 2010 08:23:24 -0000 1.23
+++ devel/quirks/files/Quirks.pm 1 Sep 2010 09:46:19 -0000
@@ -146,6 +146,8 @@ my $stem_extensions = {
'hs-x11-extras' => 'hs-X11',
'pymsn' => 'papyon',
'wordpress-mu' => 'wordpress',
+# 4.9
+ 'sybperl' => 'p5-sybperl',
};
# ->is_base_system($handle, $state):