UPDATE: net/p5-Net-Ping-External

2005-12-08 Thread Jasper Lievisse Adriaanse
Hello,

here's an update for net/p5-Net-Ping-External, this diff does the 
following:
- updates the port to version 0.11 (which has been released back
  in 2003 !);
- removes the period at the end of the License line;
- adds the PKG_ARCH;
- makes me maintainer;
- removes REGRESS_IS_INTERACTIVE.

There have been quite some changes between 0.06 and 0.11, mainly
bugfixes, though.

Index: Makefile
===
RCS file: /cvs/ports/net/p5-Net-Ping-External/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile2005/10/09 13:13:25 1.6
+++ Makefile2005/12/08 08:16:39
@@ -1,13 +1,13 @@
 # $OpenBSD: Makefile,v 1.6 2005/10/09 13:13:25 mbalmer Exp $
 
 COMMENT=   alternative Perl interface to ping(1)
-
-DISTNAME=  Net-Ping-External-0.06
+DISTNAME=  Net-Ping-External-0.11
 PKGNAME=   p5-${DISTNAME}
-CATEGORIES=net
+CATEGORIES=net perl5
 
-# License: Artistic / GPL.
+MAINTAINER=Jasper Lievisse Adriaanse [EMAIL PROTECTED]
 
+# License: Artistic / GPL
 PERMIT_PACKAGE_CDROM=  Yes 
 PERMIT_PACKAGE_FTP=Yes 
 PERMIT_DISTFILES_CDROM= Yes 
@@ -17,6 +17,6 @@
 
 CONFIGURE_STYLE=   perl
 
-REGRESS_IS_INTERACTIVE=Yes
+PKG_ARCH= *
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/net/p5-Net-Ping-External/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo2005/01/05 17:14:54 1.2
+++ distinfo2005/12/08 08:16:39
@@ -1,4 +1,4 @@
-MD5 (Net-Ping-External-0.06.tar.gz) = 66aacebadd4a9f8cc01d783d82d5c411
-RMD160 (Net-Ping-External-0.06.tar.gz) = 
31c2de277f8870b9887d94b4892e7e27bf7674a6
-SHA1 (Net-Ping-External-0.06.tar.gz) = c9638fc01b8ee2aa809414437dde543b40277e61
-SIZE (Net-Ping-External-0.06.tar.gz) = 5269
+MD5 (Net-Ping-External-0.11.tar.gz) = de9fd436c6749e1a2330eae4aae856fb
+RMD160 (Net-Ping-External-0.11.tar.gz) = 
75e8016c0ec1fe93c26491d4c710f42d8de4e11b
+SHA1 (Net-Ping-External-0.11.tar.gz) = e1a689b2cc24b40319ce2165f64710da291f546c
+SIZE (Net-Ping-External-0.11.tar.gz) = 6377

Cheers,
Jasper

-- 
Security is decided by quality -- Theo de Raadt


pgpKBEGnIeW3R.pgp
Description: PGP signature


Re: glib2/gnome weirdness

2005-12-08 Thread Lars Hansson
maybe this can be of some help:
http://www.mail-archive.com/openpkg-cvs@openpkg.org/msg07951.html

---
Lars Hansson



qt3 designer issue

2005-12-08 Thread Edd Barrett
Hello,

I am having difficulty running qt designer (designer3) on openbsd:

$ designer3
designer3 in free(): error: chunk is already free
Abort trap (core dumped)

Is anyone aware of this? Google + archives dont unearth anything...

If a fix can be found could it be committed to stable?

My dmesg (GENERIC KERNEL  + RAID)

OpenBSD 3.8-stable (ESQUE) #0: Wed Nov  2 17:26:35 GMT 2005
[EMAIL PROTECTED]:/usr/src/sys/arch/i386/compile/ESQUE
cpu0: AMD Athlon(tm) XP 1800+ (AuthenticAMD 686-class, 256KB L2 cache)
1.50 GHz
cpu0:
FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,SEP,MTRR,PGE,MCA,CMOV,PAT,PSE36,MMX,FXSR,SSE
cpu0: AMD Powernow: FID
real mem  = 234463232 (228968K)
avail mem = 206643200 (201800K)
using 2887 buffers containing 11825152 bytes (11548K) of memory
mainbus0 (root)
bios0 at mainbus0: AT/286+(00) BIOS, date 08/07/03, BIOS32 rev. 0 @ 0xfdae0
apm0 at bios0: Power Management spec V1.2
apm0: AC on, no battery
apm0: flags 30102 dobusy 0 doidle 1
pcibios0 at bios0: rev 2.1 @ 0xf/0x1
pcibios0: PCI IRQ Routing Table rev 1.0 @ 0xf78f0/144 (7 entries)
pcibios0: PCI Interrupt Router at 000:02:0 (SIS 85C503 System rev 0x00)
pcibios0: PCI bus #1 is the last bus
bios0: ROM list: 0xc/0xc000 0xcc000/0x8000!
cpu0 at mainbus0
pci0 at mainbus0 bus 0: configuration mode 1 (no bios)
pchb0 at pci0 dev 0 function 0 SIS 740 PCI rev 0x01
ppb0 at pci0 dev 1 function 0 SIS 86C201 AGP rev 0x00
pci1 at ppb0 bus 1
vga1 at pci1 dev 0 function 0 SIS 650 VGA rev 0x00: aperture at
0xc000, size 0x40
wsdisplay0 at vga1 mux 1: console (80x25, vt100 emulation)
wsdisplay0: screen 1-5 added (80x25, vt100 emulation)
pcib0 at pci0 dev 2 function 0 SIS 85C503 System rev 0x25
pciide0 at pci0 dev 2 function 5 SIS 5513 EIDE rev 0x00: 740: DMA, channel
0 wired to compatibility, channel 1 wired to compatibility
wd0 at pciide0 channel 0 drive 0: Maxtor 2F040L0
wd0: 16-sector PIO, LBA, 39205MB, 80293248 sectors
wd0(pciide0:0:0): using PIO mode 4, Ultra-DMA mode 5
atapiscsi0 at pciide0 channel 1 drive 0
scsibus0 at atapiscsi0: 2 targets
cd0 at scsibus0 targ 0 lun 0: , COMBO-52X16C, 2.00 SCSI0 5/cdrom removable
cd0(pciide0:1:0): using PIO mode 4, Ultra-DMA mode 2
SIS 7013 Modem rev 0xa0 at pci0 dev 2 function 6 not configured
ohci0 at pci0 dev 3 function 0 SIS 5597/5598 USB rev 0x0f: irq 12, version
1.0, legacy support
usb0 at ohci0: USB revision 1.0
uhub0 at usb0
uhub0: SIS OHCI root hub, rev 1.00/1.00, addr 1
uhub0: 3 ports with 3 removable, self powered
ohci1 at pci0 dev 3 function 1 SIS 5597/5598 USB rev 0x0f: irq 5, version
1.0, legacy support
usb1 at ohci1: USB revision 1.0
uhub1 at usb1
uhub1: SIS OHCI root hub, rev 1.00/1.00, addr 1
uhub1: 3 ports with 3 removable, self powered
ehci0 at pci0 dev 3 function 3 SIS 7002 USB rev 0x00: irq 12
usb2 at ehci0: USB revision 2.0
uhub2 at usb2
uhub2: SIS EHCI root hub, rev 2.00/1.00, addr 1
uhub2: 6 ports with 6 removable, self powered
sis0 at pci0 dev 4 function 0 SIS 900 10/100BaseTX rev 0x90: irq 5,
address 00:0a:e6:de:6a:45
ukphy0 at sis0 phy 1: Generic IEEE 802.3u media interface
ukphy0: OUI 0x004063, model 0x0032, rev. 5
pciide1 at pci0 dev 9 function 0 Promise PDC20269 rev 0x02: DMA, channel 0
configured to native-PCI, channel 1 configured to native-PCI
pciide1: using irq 5 for native-PCI interrupt
cmpci0 at pci0 dev 11 function 0 C-Media Electronics CMI8738/C3DX Audio
rev 0x10: irq 11
audio0 at cmpci0
isa0 at pcib0
isadma0 at isa0
pckbc0 at isa0 port 0x60/5
pckbd0 at pckbc0 (kbd slot)
pckbc0: using irq 1 for kbd slot
wskbd0 at pckbd0: console keyboard, using wsdisplay0
pcppi0 at isa0 port 0x61
midi0 at pcppi0: PC speaker
spkr0 at pcppi0
sysbeep0 at pcppi0
lpt0 at isa0 port 0x378/4 irq 7
it0 at isa0 port 0x290/8: IT87
npx0 at isa0 port 0xf0/16: using exception 16
pccom0 at isa0 port 0x3f8/8 irq 4: ns16550a, 16 byte fifo
fdc0 at isa0 port 0x3f0/6 irq 6 drq 2
biomask f76d netmask f76d ttymask f7ef
pctr: user-level cycle counter enabled
mtrr: Pentium Pro MTRR support
Kernelized RAIDframe activated
cd0(atapiscsi0:0:0): Check Condition (error 0x70) on opcode 0x0
SENSE KEY: Not Ready
 ASC/ASCQ: Medium Not Present - Tray Closed
dkcsum: wd0 matches BIOS drive 0x80
root on wd0a
rootdev=0x0 rrootdev=0x300 rawdev=0x302
uhidev0 at uhub1 port 3 configuration 1 interface 0
uhidev0: Logitech USB Mouse, rev 1.10/4.10, addr 2, iclass 3/1
ums0 at uhidev0: 3 buttons and Z dir.
wsmouse0 at ums0 mux 0



Best Regards

Edd


Re: Makefile of emulators/redhat SUBDIRs libc5

2005-12-08 Thread steven mestdagh
On Tue, Dec 06, 2005 at 07:13:21PM +0200, ramrunner wrote:
 hi list.
 with ports tree cvsd @ 29/11/05 23:16.
 emulators/redhat Makefile SUBDIRS a dir libc5 wich is non-existant at the
 server.
 with the line commented out redhat_base works.

the libc5 directory does exist at the server. maybe a problem with your
local mirror?

-- 
steven

Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm



UPDATE: net/p5-Net-Traceroute

2005-12-08 Thread Jasper Lievisse Adriaanse
Hello,

here's an update for net/p5-Net-Traceroute, this diff does the following:
- Updates the port;
- Adds me as the maintainer;
- Fixes the CATEGORIES;
- Adds PKG_ARCH.

Index: Makefile
===
RCS file: /cvs/ports/net/p5-Net-Traceroute/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile2005/10/09 13:13:25 1.7
+++ Makefile2005/12/08 15:07:49
@@ -1,10 +1,11 @@
 # $OpenBSD: Makefile,v 1.7 2005/10/09 13:13:25 mbalmer Exp $
 
 COMMENT=   traceroute(1) functionality in perl
-
-DISTNAME=  Net-Traceroute-1.07
+DISTNAME=  Net-Traceroute-1.09
 PKGNAME=   p5-${DISTNAME}
-CATEGORIES=net
+CATEGORIES=net perl
+
+MAINTAINER=Jasper Lievisse Adriaanse [EMAIL PROTECTED]
 
 HOMEPAGE=  
http://www.linnaean.org/~hag/perl/traceroute/traceroute.html
 
@@ -17,5 +18,7 @@
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=Net/}
 
 CONFIGURE_STYLE=   perl
+
+PKG_ARCH=  *
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/net/p5-Net-Traceroute/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo2005/01/05 17:14:55 1.3
+++ distinfo2005/12/08 15:07:49
@@ -1,4 +1,4 @@
-MD5 (Net-Traceroute-1.07.tar.gz) = 6423aaa1798b60bc4c558710d5283581
-RMD160 (Net-Traceroute-1.07.tar.gz) = ead845a4ef942b42589e61008f70f3b28a1ff9d0
-SHA1 (Net-Traceroute-1.07.tar.gz) = ceb7b9052f2eba2ea5895ee64d4dcf728a52e7af
-SIZE (Net-Traceroute-1.07.tar.gz) = 10950
+MD5 (Net-Traceroute-1.09.tar.gz) = 2f9b4d17c352984a507665798f0d5d7a
+RMD160 (Net-Traceroute-1.09.tar.gz) = 64c04599bde2b10b7ee3ac1eca0c96bfcc8e4649
+SHA1 (Net-Traceroute-1.09.tar.gz) = 28bee1746bb752e3d1a570549fc2e5f56635bca6
+SIZE (Net-Traceroute-1.09.tar.gz) = 12560

Cheers,
Jasper

-- 
Security is decided by quality -- Theo de Raadt


pgpZVBpBrDf2v.pgp
Description: PGP signature


Re: UPDATE: mozilla-firefox-1.5

2005-12-08 Thread Kurt Miller
On Tuesday 06 December 2005 08:17 pm, Jolan Luff wrote:
 On Fri, Dec 02, 2005 at 09:20:09AM -0500, Kurt Miller wrote:
  On Friday 02 December 2005 08:39 am, Christian Weisgerber wrote:
   Peter Str?mberg [EMAIL PROTECTED] wrote:
We'll have to add --enable-official-branding to CONFIGURE_ARGS
to get the right brand.dtd file.
  
   Yes, with that I get Firefox.
 
  Unfortunately, we can't use  --enable-official-branding without
  permission from moz.org. They have started to enforce their
  trademarks. We can use Firefox Community Edition branding in the
  mean time. See:
 
  http://www.mozilla.org/foundation/trademarks/policy.html
  http://www.mozilla.org/foundation/trademarks/l10n-policy.html
 
  Bernd's latest patch includes the branding change and also remove
  some old freetype patches that are not needed anymore.

 It still says Deer Park prevented this site from opening a popup
 window.  Also, I believe patch-xpcom_io_nsNativeCharsetUtils_cpp
 might be unnecessary now.


  Please test Bernd's latest patch so we can get it in.

 Works fine on amd64 and i386 here.  It doesn't work via remote X11 on
 macppc though.

Yea, I'm seeing it fail on mappc too (not remote X). I debugged it a 
little and found that we are hitting this cairo bug:

https://bugs.freedesktop.org/show_bug.cgi?id=4505

Seems to be related to 8 bpp Depth.

-Kurt



Re: NEW: security/p5-Crypt-Blowfish_PP

2005-12-08 Thread Jasper Lievisse Adriaanse
Hello,

here's the updated port. The Makefile is ok now. This port is needed by the
regression tests of net/p5-Crypt-CBC.

Please test and comment.

DESCR:
The Crypt::Blowfish_PP module provides for users to use the Blowfish
encryption algorithm in perl. The implementation is entirely Object
Oriented, as there is quite a lot of context inherent in making blowfish
as fast as it is. The key is anywhere between 64 and 448 bits (8 and 56
bytes), and should be passed as a packed string. The transformation
itself is a 16-round Feistel Network, and operates on a 64 bit block.

Cheers,
Jasper

-- 
Security is decided by quality -- Theo de Raadt


p5-Crypt-Blowfish_PP.tgz
Description: Unix tar archive


pgpAxgsFaD7yd.pgp
Description: PGP signature


UPDATE: security/p5-IO-Socket-SSL

2005-12-08 Thread Jasper Lievisse Adriaanse
Hello,

here's an update for security/p5-IO-Socket-SSL. This diff does the
following:
- Updates the port;
- Adds me as maintainer;
- Adds the license;
- Updates the RUN_DEPENDS.

Index: Makefile
===
RCS file: /cvs/ports/security/p5-IO-Socket-SSL/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile2005/09/23 19:41:44 1.9
+++ Makefile2005/12/08 20:04:54
@@ -2,19 +2,22 @@
 
 COMMENT=   perl interface to SSL sockets
 
-VERSION=   0.96
+VERSION=   0.97
 DISTNAME=  IO-Socket-SSL-${VERSION}
 PKGNAME=   p5-${DISTNAME}
 CATEGORIES=security perl5
 
-MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=IO/}
+MAINTAINER=Jasper Lievisse Adriaanse [EMAIL PROTECTED]
 
+# Artistic/GPL
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
+
+MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=IO/}
 
-RUN_DEPENDS=   :p5-Net-SSLeay-=1.03:security/p5-Net_SSLeay
+RUN_DEPENDS=   :p5-Net-SSLeay-=1.21:security/p5-Net_SSLeay
 BUILD_DEPENDS= ${RUN_DEPENDS}
 
 CONFIGURE_STYLE= perl
Index: distinfo
===
RCS file: /cvs/ports/security/p5-IO-Socket-SSL/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo2005/01/27 03:28:05 1.5
+++ distinfo2005/12/08 20:04:54
@@ -1,4 +1,4 @@
-MD5 (IO-Socket-SSL-0.96.tar.gz) = 85f84c0810851eb4f540b118c9902b03
-RMD160 (IO-Socket-SSL-0.96.tar.gz) = 1ea1200ee9510d0a3a622800d47dfd721168140a
-SHA1 (IO-Socket-SSL-0.96.tar.gz) = 681b0fa2130fe2b4535669b2e2fe145707fbe92a
-SIZE (IO-Socket-SSL-0.96.tar.gz) = 31914
+MD5 (IO-Socket-SSL-0.97.tar.gz) = 34562e9475de132faa0f14ca2be053a5
+RMD160 (IO-Socket-SSL-0.97.tar.gz) = 36612fed17472cde9ac71f2229290fd2cad6fe6b
+SHA1 (IO-Socket-SSL-0.97.tar.gz) = 122b2dc0a5f44b4c843375b9e37159847c1d5127
+SIZE (IO-Socket-SSL-0.97.tar.gz) = 32741

Cheers,
Jasper

-- 
Security is decided by quality -- Theo de Raadt


pgphJYP5PiTuA.pgp
Description: PGP signature


Re: UPDATE: security/p5-IO-Socket-SSL

2005-12-08 Thread Jasper Lievisse Adriaanse
On Thu, 08 Dec 2005 21:00:07 +0100
Jasper Lievisse Adriaanse [EMAIL PROTECTED] wrote:

 Hello,
 
 here's an update for security/p5-IO-Socket-SSL. This diff does the
 following:
 - Updates the port;
 - Adds me as maintainer;
 - Adds the license;
 - Updates the RUN_DEPENDS.
 
[...]
 
Oops, forgot to add the PKG_ARCH line, here's the correct diff:

Index: Makefile
===
RCS file: /cvs/ports/security/p5-IO-Socket-SSL/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile2005/09/23 19:41:44 1.9
+++ Makefile2005/12/08 20:10:03
@@ -2,22 +2,27 @@
 
 COMMENT=   perl interface to SSL sockets
 
-VERSION=   0.96
+VERSION=   0.97
 DISTNAME=  IO-Socket-SSL-${VERSION}
 PKGNAME=   p5-${DISTNAME}
 CATEGORIES=security perl5
 
-MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=IO/}
+MAINTAINER=Jasper Lievisse Adriaanse [EMAIL PROTECTED]
 
+# Artistic/GPL
 PERMIT_PACKAGE_CDROM=  Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
+
+MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=IO/}
 
-RUN_DEPENDS=   :p5-Net-SSLeay-=1.03:security/p5-Net_SSLeay
+RUN_DEPENDS=   :p5-Net-SSLeay-=1.21:security/p5-Net_SSLeay
 BUILD_DEPENDS= ${RUN_DEPENDS}
 
 CONFIGURE_STYLE= perl
+
+PKG_ARCH=  *
 
 EXDIR= ${PREFIX}/share/examples/p5-IO-Socket-SSL/
 
Index: distinfo
===
RCS file: /cvs/ports/security/p5-IO-Socket-SSL/distinfo,v
retrieving revision 1.5
diff -u -r1.5 distinfo
--- distinfo2005/01/27 03:28:05 1.5
+++ distinfo2005/12/08 20:10:03
@@ -1,4 +1,4 @@
-MD5 (IO-Socket-SSL-0.96.tar.gz) = 85f84c0810851eb4f540b118c9902b03
-RMD160 (IO-Socket-SSL-0.96.tar.gz) = 1ea1200ee9510d0a3a622800d47dfd721168140a
-SHA1 (IO-Socket-SSL-0.96.tar.gz) = 681b0fa2130fe2b4535669b2e2fe145707fbe92a
-SIZE (IO-Socket-SSL-0.96.tar.gz) = 31914
+MD5 (IO-Socket-SSL-0.97.tar.gz) = 34562e9475de132faa0f14ca2be053a5
+RMD160 (IO-Socket-SSL-0.97.tar.gz) = 36612fed17472cde9ac71f2229290fd2cad6fe6b
+SHA1 (IO-Socket-SSL-0.97.tar.gz) = 122b2dc0a5f44b4c843375b9e37159847c1d5127
+SIZE (IO-Socket-SSL-0.97.tar.gz) = 32741


Cheers,
Jasper


-- 
Security is decided by quality -- Theo de Raadt



0001.mimetmp
Description: PGP signature


pgpC85pe5CdmE.pgp
Description: PGP signature


Re: get 'libtool --tag CXX' to work

2005-12-08 Thread Marc Espie

Here's the patch I intend to commit.
This includes the former --tag CXX fix, plus the part that makes
--tag=disable-static
--tag=disable-shared

independent from other tags by delaying their effect.

As far as I can tell, kde is fairly happy with this

Index: Makefile
===
RCS file: /cvs/ports/devel/libtool/Makefile,v
retrieving revision 1.44
diff -u -p -r1.44 Makefile
--- Makefile2 Nov 2005 02:47:09 -   1.44
+++ Makefile8 Dec 2005 23:12:49 -
@@ -6,7 +6,7 @@ COMMENT-ltdl=   GNU libtool system indepe
 
 VERSION=   1.5.20
 DISTNAME=  libtool-${VERSION}
-PKGNAME=   ${DISTNAME}p1
+PKGNAME=   ${DISTNAME}p2
 PKGNAME-ltdl=  libltdl-${VERSION}p1
 CATEGORIES=devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=libtool/}
Index: patches/patch-libltdl_ltmain_sh
===
RCS file: /cvs/ports/devel/libtool/patches/patch-libltdl_ltmain_sh,v
retrieving revision 1.13
diff -u -p -r1.13 patch-libltdl_ltmain_sh
--- patches/patch-libltdl_ltmain_sh 2 Nov 2005 02:47:09 -   1.13
+++ patches/patch-libltdl_ltmain_sh 8 Dec 2005 23:12:49 -
@@ -1,7 +1,18 @@
 $OpenBSD: patch-libltdl_ltmain_sh,v 1.13 2005/11/02 02:47:09 brad Exp $
 libltdl/ltmain.sh.orig Wed Aug 31 14:55:39 2005
-+++ libltdl/ltmain.sh  Tue Nov  1 15:15:22 2005
-@@ -1089,14 +1089,15 @@ EOF
+--- libltdl/ltmain.sh.orig Wed Aug 31 20:55:39 2005
 libltdl/ltmain.sh  Tue Dec  6 19:58:54 2005
+@@ -468,7 +468,9 @@ do
+ preserve_args=$preserve_args $arg
+ ;;
+ 
+-  --tag) prevopt=--tag prev=tag ;;
++  --tag) prevopt=--tag prev=tag
++preserve_args=$preserve_args --tag
++;;
+   --tag=*)
+ set tag $optarg ${1+$@}
+ shift
+@@ -1089,14 +1091,15 @@ EOF
  if test -n $link_static_flag; then
dlopen_self=$dlopen_self_static
  fi
@@ -18,7 +29,7 @@ $OpenBSD: patch-libltdl_ltmain_sh,v 1.13
break
;;
esac
-@@ -1984,6 +1985,17 @@ EOF
+@@ -1984,6 +1987,17 @@ EOF
;;
  esac
  for pass in $passes; do
@@ -36,7 +47,7 @@ $OpenBSD: patch-libltdl_ltmain_sh,v 1.13
if test $linkmode,$pass = lib,link ||
 test $linkmode,$pass = prog,scan; then
libs=$deplibs
-@@ -2245,20 +2257,20 @@ EOF
+@@ -2245,20 +2259,20 @@ EOF
# It is a libtool convenience library, so add in its objects.
convenience=$convenience $ladir/$objdir/$old_library
old_convenience=$old_convenience $ladir/$objdir/$old_library
@@ -67,7 +78,7 @@ $OpenBSD: patch-libltdl_ltmain_sh,v 1.13
  continue
fi # $pass = conv
  
-@@ -2445,8 +2457,12 @@ EOF
+@@ -2445,8 +2459,12 @@ EOF
fi
  
link_static=no # Whether the deplib will be linked statically
@@ -81,7 +92,7 @@ $OpenBSD: patch-libltdl_ltmain_sh,v 1.13
  if test $installed = no; then
notinst_deplibs=$notinst_deplibs $lib
need_relink=yes
-@@ -2644,7 +2660,7 @@ EOF
+@@ -2644,7 +2662,7 @@ EOF
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
@@ -90,7 +101,7 @@ $OpenBSD: patch-libltdl_ltmain_sh,v 1.13
  add=$libdir/$linklib
elif test $hardcode_minus_L = yes; then
  add_dir=-L$libdir
-@@ -5932,40 +5948,6 @@ relink_command=\$relink_command\
+@@ -5932,40 +5950,6 @@ relink_command=\$relink_command\
  # Exit here if they wanted silent mode.
  test $show = :  exit $EXIT_SUCCESS
  
Index: patches/patch-ltmain_in
===
RCS file: /cvs/ports/devel/libtool/patches/patch-ltmain_in,v
retrieving revision 1.13
diff -u -p -r1.13 patch-ltmain_in
--- patches/patch-ltmain_in 2 Nov 2005 02:47:09 -   1.13
+++ patches/patch-ltmain_in 8 Dec 2005 23:12:49 -
@@ -1,7 +1,46 @@
 $OpenBSD: patch-ltmain_in,v 1.13 2005/11/02 02:47:09 brad Exp $
 ltmain.in.orig Wed Aug 31 14:25:28 2005
-+++ ltmain.in  Tue Nov  1 15:13:43 2005
-@@ -1089,14 +1089,15 @@ EOF
+--- ltmain.in.orig Wed Aug 31 20:25:28 2005
 ltmain.in  Wed Dec  7 09:43:10 2005
+@@ -352,6 +352,8 @@ func_extract_archives ()
+ # Darwin sucks
+ eval std_shrext=\$shrext_cmds\
+ 
++disable_libs=no
++
+ # Parse our command line options once, thoroughly.
+ while test $# -gt 0
+ do
+@@ -468,7 +470,9 @@ do
+ preserve_args=$preserve_args $arg
+ ;;
+ 
+-  --tag) prevopt=--tag prev=tag ;;
++  --tag) prevopt=--tag prev=tag
++preserve_args=$preserve_args --tag
++;;
+   --tag=*)
+ set tag $optarg ${1+$@}
+ shift
+@@ -500,6 +504,18 @@ if test -n $prevopt; then
+   exit $EXIT_FAILURE
+ fi
+ 
++case $disable_libs in
++no) 
++  ;;
++shared)
++  build_libtool_libs=no
++  build_old_libs=yes
++  ;;
++static)
++  build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; 
esac`
++  ;;
++esac
++
+ # If this variable is set in any of the actions, the command in it
+ # will