Re: Gimp diff for SIMD instruction support
On October 19, 2007 10:03:36 pm Brad wrote:
> The following diff simplifies the SIMD instruction handling support
> for the Gimp port. I took a look at the code in question and noticed
> it has run-time detection of the CPU support so there shouldn't be
> a need for the AltiVec FLAVOR even for G3 systems. This also enables
> the SSE support.
>
> Please test this if you have a G3 system for macppc or if you have
> an older i386 system without SSE.
Here is an updated diff. Bernd pointed out that I needed to add
the @pkgpath marker.
Index: Makefile
===
RCS file: /cvs/ports/graphics/gimp/stable/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile1 Aug 2007 06:25:10 - 1.26
+++ Makefile30 Sep 2007 06:52:05 -
@@ -3,6 +3,7 @@
COMMENT= GNU Image Manipulation Program
DISTNAME= gimp-2.2.17
+PKGNAME= ${DISTNAME}p0
SHARED_LIBS= gimp-2.0200.17 \
gimpbase-2.0200.17 \
gimpcolor-2.0 200.17 \
@@ -54,23 +55,8 @@ AUTOCONF_VERSION= 2.61
CONFIGURE_STYLE= autoconf
CONFIGURE_ARGS=${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= --disable-print --without-gtkhtml2 --without-librsvg \
---disable-sse
+CONFIGURE_ARGS+= --disable-print --without-gtkhtml2 --without-librsvg
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include
-I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-
-FLAVORS= altivec
-FLAVOR?=
-
-.if ${FLAVOR:L} == "altivec"
-ONLY_FOR_ARCHS= powerpc
-CONFIGURE_ARGS+= --enable-altivec
-.else
-CONFIGURE_ARGS+= --disable-altivec
-.endif
-
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE} == "amd64"
-CONFIGURE_ARGS+= --enable-mmx
-.endif
.include
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/gimp/stable/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST 1 Jul 2007 15:42:17 - 1.11
+++ pkg/PLIST 21 Oct 2007 00:44:43 -
@@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST,v 1.11 2007/07/01 15:42:17 steven Exp $
[EMAIL PROTECTED] graphics/gimp,altivec
%%SHARED%%
bin/gimp
bin/gimp-2.2
Re: expat dependencies
On October 23, 2007 04:50:12 am Toni Mueller wrote: > > Hi, > > On Wed, 15.08.2007 at 01:20:49 +0200, Marc Espie <[EMAIL PROTECTED]> wrote: > > On Tue, Aug 14, 2007 at 06:15:44PM -0500, Emilio Perea wrote: > > > I understand that (at least) xbase is necessary to build packages, but > > > assume it is not required to install pre-built ones. (No big deal if it > > > is, but thought to ask just in case.) > > You have to install at least part of xbase, namely, the shared libraries. > > while I'm in a hurry and trying to generate my own 4.2, I found out > that this is not easily possible: > > Building X11 from source (FAQ#5) requires tcl and tk to be installed. > but tk requires X11 to be installed before it can be built. Not for 4.2.
Re: expat dependencies
On October 23, 2007 11:23:12 am you wrote: > On 10/23/07, Toni Mueller <[EMAIL PROTECTED]> wrote: > > > > Hi, > > > > On Wed, 15.08.2007 at 01:20:49 +0200, Marc Espie <[EMAIL PROTECTED]> wrote: > > > On Tue, Aug 14, 2007 at 06:15:44PM -0500, Emilio Perea wrote: > > > > I understand that (at least) xbase is necessary to build packages, but > > > > assume it is not required to install pre-built ones. (No big deal if it > > > > is, but thought to ask just in case.) > > > You have to install at least part of xbase, namely, the shared libraries. > > > > while I'm in a hurry and trying to generate my own 4.2, I found out > > that this is not easily possible: > > > > Building X11 from source (FAQ#5) requires tcl and tk to be installed. > > but tk requires X11 to be installed before it can be built. > > > > So, if I need expat (yes, for python-expat), I'm kind of stuck since > > the expat port is also disabled: > > > > # make install > > ===> expat-2.0.0p0 -- expat comes with OpenBSD as of release 4.2. > > > > IOW, I'll have to fiddle with it to get the expat port compile in order > > to subsequently avoid installing xbase which I can't compile. How do > > you guys actually bootstrap it? > > > > > > Best, > > --Toni++ > > > > > > Same here with the expat issue, I tried to build 4.2 as my firewall to > test (pf-related enhancements) as well as a network stack improvements > and i find it quite difficult. expat is now builtin to 4.2, and when i > try to build ports "gmake" against a 4.2 snapshot i get stopped by > some missing expat libs. i tried pulling out binaries from the > snapshot packages link and same result. > > I noticed that the 4.1 expat and 4.2 versions (2.0.0) are the same so > I tried to pull the expat on 4.1ports and install put it on the 4.2 > snapshot, it build cleanly but still i got stopped by a file > expat.6.0.. > > i guess we just need to wait it out till the official release comes in > and just pre-order the 4.2 CD. > > > regards, > -pf with 4.2 you have to install the xbase/xshare sets. with -current this has been corrected and expat is now in the base sets.
patch to allow libnids to work with kernel PPPoE
The following diff allows libnids to work with the kernel PPPoE link type
and thus allowing dsniff to work on kernel PPPoE interfaces.
Index: Makefile
===
RCS file: /cvs/ports/net/libnids/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile15 Sep 2007 22:36:55 - 1.27
+++ Makefile5 Nov 2007 09:21:07 -
@@ -3,6 +3,7 @@
COMMENT= network monitoring library with TCP/IP reassembly
DISTNAME= libnids-1.20
+PKGNAME= ${DISTNAME}p0
CATEGORIES=net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=libnids/}
Index: patches/patch-src_libnids_c
===
RCS file: /cvs/ports/net/libnids/patches/patch-src_libnids_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_libnids_c
--- patches/patch-src_libnids_c 29 Jan 2006 21:27:52 - 1.2
+++ patches/patch-src_libnids_c 5 Nov 2007 09:30:13 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_libnids_c,v 1.2 2006/01/29 21:27:52 brad Exp $
--- src/libnids.c.orig Sat Jan 29 05:03:24 2005
-+++ src/libnids.c Sun Jan 29 13:43:53 2006
-@@ -214,6 +214,7 @@ static void pcap_hand(u_char * par, stru
src/libnids.c Mon Nov 5 04:30:05 2007
+@@ -214,6 +214,7 @@ static void pcap_hand(u_char * par, struct pcap_pkthdr
#endif
#ifdef DLT_IEEE802_11
case DLT_IEEE802_11:
@@ -17,7 +17,7 @@ $OpenBSD: patch-src_libnids_c,v 1.2 2006
/* wireless, need to calculate offset per frame */
break;
#endif
-@@ -469,7 +471,12 @@ int nids_init()
+@@ -469,12 +471,20 @@ int nids_init()
case DLT_NULL:
linkoffset = 4;
break;
@@ -31,3 +31,11 @@ $OpenBSD: patch-src_libnids_c,v 1.2 2006
case DLT_EN10MB:
linkoffset = 14;
break;
+ case DLT_PPP:
+ linkoffset = 4;
++ break;
++case DLT_PPP_ETHER:
++ linkoffset = 8;
+ break;
+ /* Token Ring Support by [EMAIL PROTECTED], thanks dugsong! */
+ case DLT_IEEE802:
ktorrent patch to fix the display of upload/download speed
The following diff fixes the display of the upload/download speed.
ktorrent doesn't like the time going into the future which is possible
if running ntpd.
Index: Makefile
===
RCS file: /cvs/ports/net/ktorrent/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile15 Sep 2007 22:36:54 - 1.2
+++ Makefile5 Nov 2007 06:12:31 -
@@ -6,6 +6,7 @@ COMMENT=BitTorrent client for KDE
VERSION= 2.1.4
DISTNAME= ktorrent-${VERSION}
+PKGNAME= ${DISTNAME}p0
CATEGORIES=net x11 x11/kde
MASTER_SITES= ${HOMEPAGE}downloads/${VERSION}/
Index: patches/patch-libktorrent_net_speed_cpp
===
RCS file: patches/patch-libktorrent_net_speed_cpp
diff -N patches/patch-libktorrent_net_speed_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-libktorrent_net_speed_cpp 5 Nov 2007 23:13:44 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libktorrent/net/speed.cpp.orig Mon Nov 5 18:12:45 2007
libktorrent/net/speed.cpp Mon Nov 5 18:13:31 2007
+@@ -47,7 +47,7 @@ namespace net
+ while (i != dlrate.end())
+ {
+ QPair & p = *i;
+- if (now - p.second > SPEED_INTERVAL)
++ if (now - p.second > SPEED_INTERVAL || now < p.second)
+ {
+ if (bytes >= p.first) // make sure we don't
wrap around
+ bytes -= p.first; // subtract bytes
Re: UPDATE: graphics/gimp
On November 8, 2007 02:08:02 pm Giovanni Bechis wrote: > On Thu, Nov 08, 2007 at 06:26:19PM +0100, Eric Faurot wrote: > > On Wed, 7 Nov 2007 23:45:15 +0100 > > Matthias Kilian <[EMAIL PROTECTED]> wrote: > > > > > On Wed, Nov 07, 2007 at 08:11:59AM +0100, Antoine Jacoutot wrote: > > > > >I've no problem including that poppler stuff, but I'd appreciate some > > > > >more comments from real gimp users. > > > > > > > > Does it bring anymore dependency than poppler itself? > > > poppler depends on qt and gimp requires gtk, I think that this way > gimp itself will depend on many libraries. > Giovanni Poppler itself does not require Qt. The port does have optional Qt3 and Qt4 bindings which are sub-packages.
UPDATE: KTorrent 2.2.2
Here is an update to KTorrent 2.2.2.
Index: Makefile
===
RCS file: /cvs/ports/net/ktorrent/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile8 Nov 2007 21:13:10 - 1.3
+++ Makefile8 Nov 2007 23:32:11 -
@@ -4,9 +4,8 @@ SHARED_ONLY=Yes
COMMENT= BitTorrent client for KDE
-VERSION= 2.1.4
+VERSION= 2.2.2
DISTNAME= ktorrent-${VERSION}
-PKGNAME= ${DISTNAME}p0
CATEGORIES=net x11 x11/kde
MASTER_SITES= ${HOMEPAGE}downloads/${VERSION}/
@@ -20,9 +19,9 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= art_lgpl_2 jpeg ICE SM X11 Xau Xdmcp Xext Xrender c m
pcre \
- pcreposix png pthread stdc++ util z idn iconv fam rpcsvc
+ pcreposix png pthread stdc++ util z idn iconv intl fam
rpcsvc
-LIB_DEPENDS=
kdecore.>=6,DCOP,kdefx,kdeprint,kdesu,kparts,kdeui,khtml,kio,kjs,kmdi,kutils,kwalletclient::x11/kde/libs3
\
+LIB_DEPENDS=
kdecore.>=6,DCOP,kdefx,kdeprint,kdesu,kparts,kdeui,khtml,kio,kjs,kutils,kwalletclient::x11/kde/libs3
\
gmp.>=4.::devel/gmp
MODULES= x11/kde
Index: distinfo
===
RCS file: /cvs/ports/net/ktorrent/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo19 Jul 2007 02:59:44 - 1.1.1.1
+++ distinfo8 Nov 2007 23:32:11 -
@@ -1,5 +1,5 @@
-MD5 (ktorrent-2.1.4.tar.gz) = adPX32IAcQGBWU2hmrjCSA==
-RMD160 (ktorrent-2.1.4.tar.gz) = goYBLl+8C9gn1ctwx4leVGDyGgs=
-SHA1 (ktorrent-2.1.4.tar.gz) = RUmS7F8LT2fmJHTPhjotZtvXfyg=
-SHA256 (ktorrent-2.1.4.tar.gz) = 1JL3WAHBgCAumcqcnN/wtU4vXY5K4t3cy/GqwhgnbEg=
-SIZE (ktorrent-2.1.4.tar.gz) = 3631999
+MD5 (ktorrent-2.2.2.tar.gz) = 871M3LRc782FWZkHeBxuIQ==
+RMD160 (ktorrent-2.2.2.tar.gz) = r9wLP2LAP1WU/iHr+MNeGbi0m0g=
+SHA1 (ktorrent-2.2.2.tar.gz) = qfeAvKUp52KOWprrqNItz94KRuY=
+SHA256 (ktorrent-2.2.2.tar.gz) = G+FV1itFMzhtzLEt6Nw6KMECDAjHwlIj4dMYVti14Ws=
+SIZE (ktorrent-2.2.2.tar.gz) = 3820959
Index: patches/patch-libktorrent_net_address_cpp
===
RCS file: patches/patch-libktorrent_net_address_cpp
diff -N patches/patch-libktorrent_net_address_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-libktorrent_net_address_cpp 8 Nov 2007 23:32:11 -
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- libktorrent/net/address.cpp.orig Sat Sep 29 01:31:27 2007
libktorrent/net/address.cppSat Sep 29 01:31:39 2007
+@@ -17,6 +17,7 @@
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+ ***/
++#include
+ #include
+ #include
+ #include "address.h"
Index: patches/patch-libktorrent_net_socket_cpp
===
RCS file: /cvs/ports/net/ktorrent/patches/patch-libktorrent_net_socket_cpp,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-libktorrent_net_socket_cpp
--- patches/patch-libktorrent_net_socket_cpp19 Jul 2007 02:59:44 -
1.1.1.1
+++ patches/patch-libktorrent_net_socket_cpp8 Nov 2007 23:32:11 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-libktorrent_net_socket_cpp,v 1.1.1.1 2007/07/19 02:59:44
deanna Exp $
libktorrent/net/socket.cpp.origSun Apr 22 07:25:46 2007
-+++ libktorrent/net/socket.cpp Mon May 7 17:45:09 2007
+--- libktorrent/net/socket.cpp.origMon Aug 27 12:45:51 2007
libktorrent/net/socket.cpp Sat Sep 29 01:13:13 2007
@@ -38,7 +38,7 @@
#include
#endif
@@ -10,7 +10,7 @@ $OpenBSD: patch-libktorrent_net_socket_c
#define MSG_NOSIGNAL 0
#endif
-@@ -258,7 +258,7 @@ namespace net
+@@ -260,7 +260,7 @@ namespace net
bool Socket::setTOS(char type_of_service)
{
Index: patches/patch-libktorrent_util_fileops_cpp
===
RCS file: patches/patch-libktorrent_util_fileops_cpp
diff -N patches/patch-libktorrent_util_fileops_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-libktorrent_util_fileops_cpp 8 Nov 2007 23:32:11 -
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- libktorrent/util/fileops.cpp.orig Mon Aug 27 12:45:55 2007
libktorrent/util/fileops.cpp Sat Sep 29 02:31:07 2007
+@@ -62,7 +62,6 @@ typedef int64_t __s64;
+ #endif
+
+
+-#include
+
+
+ namespace bt
Index: patches/patch-plugins_stats_ChartDrawer_cc
===
RCS file: patches/patch-plugins_stats_ChartDrawer_cc
diff -N patches/patch-plugins_stats_ChartDrawer_cc
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-plugins_stats_ChartDrawer_cc 8 Nov 2007 23:32:11 -
@@
UPDATE: KTorrent 2.2.3
On November 11, 2007 07:23:15 pm Brad wrote:
> Here is an update to KTorrent 2.2.2.
Here is an update to KTorrent 2.2.3.
Index: Makefile
===
RCS file: /cvs/ports/net/ktorrent/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile8 Nov 2007 21:13:10 - 1.3
+++ Makefile16 Nov 2007 09:39:24 -
@@ -4,9 +4,8 @@ SHARED_ONLY=Yes
COMMENT= BitTorrent client for KDE
-VERSION= 2.1.4
+VERSION= 2.2.3
DISTNAME= ktorrent-${VERSION}
-PKGNAME= ${DISTNAME}p0
CATEGORIES=net x11 x11/kde
MASTER_SITES= ${HOMEPAGE}downloads/${VERSION}/
@@ -20,9 +19,9 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= art_lgpl_2 jpeg ICE SM X11 Xau Xdmcp Xext Xrender c m
pcre \
- pcreposix png pthread stdc++ util z idn iconv fam rpcsvc
+ pcreposix png pthread stdc++ util z idn iconv intl fam
rpcsvc
-LIB_DEPENDS=
kdecore.>=6,DCOP,kdefx,kdeprint,kdesu,kparts,kdeui,khtml,kio,kjs,kmdi,kutils,kwalletclient::x11/kde/libs3
\
+LIB_DEPENDS=
kdecore.>=6,DCOP,kdefx,kdeprint,kdesu,kparts,kdeui,khtml,kio,kjs,kutils,kwalletclient::x11/kde/libs3
\
gmp.>=4.::devel/gmp
MODULES= x11/kde
Index: distinfo
===
RCS file: /cvs/ports/net/ktorrent/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo19 Jul 2007 02:59:44 - 1.1.1.1
+++ distinfo16 Nov 2007 09:39:39 -
@@ -1,5 +1,5 @@
-MD5 (ktorrent-2.1.4.tar.gz) = adPX32IAcQGBWU2hmrjCSA==
-RMD160 (ktorrent-2.1.4.tar.gz) = goYBLl+8C9gn1ctwx4leVGDyGgs=
-SHA1 (ktorrent-2.1.4.tar.gz) = RUmS7F8LT2fmJHTPhjotZtvXfyg=
-SHA256 (ktorrent-2.1.4.tar.gz) = 1JL3WAHBgCAumcqcnN/wtU4vXY5K4t3cy/GqwhgnbEg=
-SIZE (ktorrent-2.1.4.tar.gz) = 3631999
+MD5 (ktorrent-2.2.3.tar.gz) = f/Rn7pRD+fpjdpzYpkCTLg==
+RMD160 (ktorrent-2.2.3.tar.gz) = zopuFv2NSCgZTvYNpF/sUh9Pma0=
+SHA1 (ktorrent-2.2.3.tar.gz) = N6p1TV30Cc6YfktwDTxptGF11Kg=
+SHA256 (ktorrent-2.2.3.tar.gz) = JBrM+glMRkBjzA8X4n880ry49vRt+S9MqOrF+QZOj8I=
+SIZE (ktorrent-2.2.3.tar.gz) = 3842249
Index: patches/patch-libktorrent_net_address_cpp
===
RCS file: patches/patch-libktorrent_net_address_cpp
diff -N patches/patch-libktorrent_net_address_cpp
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-libktorrent_net_address_cpp 8 Nov 2007 23:09:08 -
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- libktorrent/net/address.cpp.orig Sat Sep 29 01:31:27 2007
libktorrent/net/address.cppSat Sep 29 01:31:39 2007
+@@ -17,6 +17,7 @@
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
+ ***/
++#include
+ #include
+ #include
+ #include "address.h"
Index: patches/patch-libktorrent_net_socket_cpp
===
RCS file: /cvs/ports/net/ktorrent/patches/patch-libktorrent_net_socket_cpp,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-libktorrent_net_socket_cpp
--- patches/patch-libktorrent_net_socket_cpp19 Jul 2007 02:59:44 -
1.1.1.1
+++ patches/patch-libktorrent_net_socket_cpp16 Nov 2007 09:43:01 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-libktorrent_net_socket_cpp,v 1.1.1.1 2007/07/19 02:59:44
deanna Exp $
libktorrent/net/socket.cpp.origSun Apr 22 07:25:46 2007
-+++ libktorrent/net/socket.cpp Mon May 7 17:45:09 2007
+--- libktorrent/net/socket.cpp.origTue Nov 13 14:36:49 2007
libktorrent/net/socket.cpp Fri Nov 16 04:42:46 2007
@@ -38,7 +38,7 @@
#include
#endif
@@ -10,12 +10,12 @@ $OpenBSD: patch-libktorrent_net_socket_c
#define MSG_NOSIGNAL 0
#endif
-@@ -258,7 +258,7 @@ namespace net
+@@ -260,7 +260,7 @@ namespace net
- bool Socket::setTOS(char type_of_service)
+ bool Socket::setTOS(unsigned char type_of_service)
{
-#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) &&
__FreeBSD_version < 600020) || defined(Q_OS_NETBSD) || defined(Q_OS_BSD4)
+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) &&
__FreeBSD_version < 600020) || defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD) ||
defined(Q_OS_BSD4)
- int c = type_of_service;
+ unsigned int c = type_of_service;
#else
- char c = type_of_service;
+ unsigned char c = type_of_service;
Index: patches/patch-libktorrent_net_speed_cpp
===
RCS file: patches/patch-libktorrent_net_speed_cpp
diff -N patches/patch-libktorrent_net_speed_cpp
--- patches/patch-libktorrent_net_speed_
UPDATE: Pidgin 2.3.0
Here is an update to Pidgin 2.3.0. Index: Makefile === RCS file: /cvs/ports/net/pidgin/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- Makefile27 Oct 2007 16:57:20 - 1.12 +++ Makefile26 Nov 2007 21:27:19 - @@ -4,7 +4,7 @@ SHARED_ONLY=Yes COMMENT= multi-protocol instant messaging client -DISTNAME= pidgin-2.2.2 +DISTNAME= pidgin-2.3.0 SHARED_LIBS += jabber 0.0 # .0.0 SHARED_LIBS += oscar0.0 # .0.0 SHARED_LIBS += purple 1.0 # .1.0 Index: distinfo === RCS file: /cvs/ports/net/pidgin/distinfo,v retrieving revision 1.6 diff -u -p -r1.6 distinfo --- distinfo27 Oct 2007 16:57:20 - 1.6 +++ distinfo26 Nov 2007 20:41:46 - @@ -1,5 +1,5 @@ -MD5 (pidgin-2.2.2.tar.gz) = 17gUyvcWlVaZPY3Cs4G4UA== -RMD160 (pidgin-2.2.2.tar.gz) = 0t7MrDURwfUt9W53zG4d36qaTY0= -SHA1 (pidgin-2.2.2.tar.gz) = v97g/agJBd7YRGE7qlu7qk7fJW4= -SHA256 (pidgin-2.2.2.tar.gz) = HjLoXikIAtkbVQml1f14PH3I+3YAQF1awqVoBSAk0Pg= -SIZE (pidgin-2.2.2.tar.gz) = 12882496 +MD5 (pidgin-2.3.0.tar.gz) = 32N9WGcr43LBKnKGYvTtaA== +RMD160 (pidgin-2.3.0.tar.gz) = J1QQxNg3/JX82pqs84z+EA+Nc/E= +SHA1 (pidgin-2.3.0.tar.gz) = mKzCE8QG7hKtmKSGzFc6vH2MLjc= +SHA256 (pidgin-2.3.0.tar.gz) = x2EC21x/8Gn6TMAO+uJVuj08ydU83iwcCLRY6jAa3vk= +SIZE (pidgin-2.3.0.tar.gz) = 13255252 Index: patches/patch-config_h_in === RCS file: /cvs/ports/net/pidgin/patches/patch-config_h_in,v retrieving revision 1.5 diff -u -p -r1.5 patch-config_h_in --- patches/patch-config_h_in 1 Oct 2007 22:03:29 - 1.5 +++ patches/patch-config_h_in 26 Nov 2007 21:07:06 - @@ -1,7 +1,7 @@ $OpenBSD: patch-config_h_in,v 1.5 2007/10/01 22:03:29 merdely Exp $ config.h.in.orig Sun Jul 29 08:34:20 2007 -+++ config.h.inTue Jul 31 17:43:25 2007 -@@ -154,6 +154,12 @@ +--- config.h.in.orig Sat Nov 24 14:06:47 2007 config.h.inMon Nov 26 16:06:45 2007 +@@ -160,6 +160,12 @@ /* Define to 1 if you have the header file. */ #undef HAVE_NSS_H Index: patches/patch-configure_ac === RCS file: /cvs/ports/net/pidgin/patches/patch-configure_ac,v retrieving revision 1.6 diff -u -p -r1.6 patch-configure_ac --- patches/patch-configure_ac 27 Oct 2007 16:57:20 - 1.6 +++ patches/patch-configure_ac 26 Nov 2007 21:07:06 - @@ -1,7 +1,7 @@ $OpenBSD: patch-configure_ac,v 1.6 2007/10/27 16:57:20 steven Exp $ configure.ac.orig Tue Oct 23 16:55:47 2007 -+++ configure.ac Thu Oct 25 23:31:32 2007 -@@ -572,6 +572,7 @@ if test "x$enable_consoleui" = "xyes"; then +--- configure.ac.orig Sat Nov 24 14:05:48 2007 configure.ac Mon Nov 26 16:06:45 2007 +@@ -610,6 +610,7 @@ if test "x$enable_consoleui" = "xyes"; then # ncursesw was not found. Look for plain old ncurses enable_consoleui=yes AC_CHECK_LIB(ncurses, initscr, [GNT_LIBS="-lncurses"], [enable_consoleui=no]) @@ -9,7 +9,7 @@ $OpenBSD: patch-configure_ac,v 1.6 2007/ AC_CHECK_LIB(panel, update_panels, [GNT_LIBS="$GNT_LIBS -lpanel"], [enable_consoleui=no]) AC_DEFINE(NO_WIDECHAR, 1, [Define to 1 if you don't have wide-character support.]) if test x"$ac_ncurses_includes" != "x"; then -@@ -785,7 +786,7 @@ else +@@ -823,7 +824,7 @@ else if test "$ac_silc_libs" != "no"; then SILC_LIBS="-L$ac_silc_libs" fi @@ -18,7 +18,7 @@ $OpenBSD: patch-configure_ac,v 1.6 2007/ AC_CHECK_LIB(silcclient, silc_client_init, [silcclient=yes], , $SILC_LIBS) if test "x$silcincludes" = "xyes" -a "x$silcclient" = "xyes"; then -@@ -1458,8 +1459,13 @@ dnl ## +@@ -1510,8 +1511,13 @@ dnl ## dnl These two are inverses of each other <-- stolen from evolution! @@ -33,7 +33,7 @@ $OpenBSD: patch-configure_ac,v 1.6 2007/ [enable_gnutls="$enableval"], [enable_gnutls="yes"]) -@@ -1471,6 +1477,90 @@ AC_ARG_ENABLE(nss, +@@ -1523,6 +1529,90 @@ AC_ARG_ENABLE(nss, msg_ssl="None. MSN, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!" dnl # @@ -124,7 +124,7 @@ $OpenBSD: patch-configure_ac,v 1.6 2007/ dnl # Check for GnuTLS if it's specified. dnl # if test "x$enable_gnutls" != "xno"; then -@@ -1825,12 +1915,20 @@ fi +@@ -1877,12 +1967,20 @@ fi AM_CONDITIONAL(USE_NSS, test "x$enable_nss" = "xyes") Index: patches/patch-finch_libgnt_Makefile_in === RCS file: /cvs/ports/net/pidgin/patches/patch-finch_libgnt_Makefile_in,v retrieving revision 1.5 diff -u -p -r1.5 patch-finch_libgnt_
UPDATE: libmpeg2 0.4.1
Here is an update to libmpeg2 0.4.1.
Index: Makefile
===
RCS file: /cvs/ports/graphics/libmpeg2/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile13 Nov 2007 17:10:25 - 1.10
+++ Makefile30 Nov 2007 06:29:26 -
@@ -1,8 +1,10 @@
# $OpenBSD: Makefile,v 1.10 2007/11/13 17:10:25 steven Exp $
COMMENT= free MPEG-2 video stream decoder
-DISTNAME= mpeg2dec-0.4.0b
-PKGNAME= ${DISTNAME:S/mpeg2dec/libmpeg2/}p1
+
+VERSION= 0.4.1
+DISTNAME= mpeg2dec-${VERSION}
+PKGNAME= ${DISTNAME:S/mpeg2dec/libmpeg2/}
SHARED_LIBS= mpeg2 0.0 \
mpeg2convert0.0
CATEGORIES=graphics x11
@@ -23,7 +25,7 @@ WANTLIB= X11 Xau Xdmcp Xext Xv
USE_X11= Yes
USE_LIBTOOL= Yes
-WRKDIST=${WRKDIR}/mpeg2dec-0.4.0
+WRKDIST=${WRKDIR}/mpeg2dec-${VERSION}
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
Index: distinfo
===
RCS file: /cvs/ports/graphics/libmpeg2/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo5 Apr 2007 16:19:57 - 1.5
+++ distinfo30 Nov 2007 06:29:34 -
@@ -1,5 +1,5 @@
-MD5 (mpeg2dec-0.4.0b.tar.gz) = UtEOqAWV7IPYVXunrG3I5g==
-RMD160 (mpeg2dec-0.4.0b.tar.gz) = RN9sIeiNLDAp70GOpG4tZ5bJAAQ=
-SHA1 (mpeg2dec-0.4.0b.tar.gz) = etmagQgC8haJMCL6FPoHisSdZ9c=
-SHA256 (mpeg2dec-0.4.0b.tar.gz) = lBY3aVKBLltHl0XWeiv4dPvK0QE3UXMUzn3jert1bfg=
-SIZE (mpeg2dec-0.4.0b.tar.gz) = 473846
+MD5 (mpeg2dec-0.4.1.tar.gz) = djGwpLz90NeMC7AIMICw3A==
+RMD160 (mpeg2dec-0.4.1.tar.gz) = U3euRavdN/q86m09Cp105JO4RIM=
+SHA1 (mpeg2dec-0.4.1.tar.gz) = gL6LFt/0yqQlNHDRo7Vj/cAXf8s=
+SHA256 (mpeg2dec-0.4.1.tar.gz) = x0p2Bo+Ow21LtZoDvxFXvkQRjKAiUhgOizWLC14+3u4=
+SIZE (mpeg2dec-0.4.1.tar.gz) = 494539
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/graphics/libmpeg2/patches/patch-Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile_in
--- patches/patch-Makefile_in 18 Apr 2004 00:41:03 - 1.1
+++ patches/patch-Makefile_in 30 Nov 2007 06:40:17 -
@@ -1,12 +1,12 @@
$OpenBSD: patch-Makefile_in,v 1.1 2004/04/18 00:41:03 jolan Exp $
Makefile.in.orig 2003-12-23 06:07:29.0 -0600
-+++ Makefile.in2004-02-27 22:22:07.0 -0600
-@@ -150,7 +150,7 @@ sbindir = @sbindir@
+--- Makefile.in.orig Wed Feb 15 11:34:28 2006
Makefile.inFri Nov 30 01:37:47 2007
+@@ -188,7 +188,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = autotools include libmpeg2 libvo doc src vc++ test
+SUBDIRS = autotools include libmpeg2 libvo doc vc++ test
-
EXTRA_DIST = bootstrap CodingStyle
- subdir = .
+ all: all-recursive
+
Index: patches/patch-configure
===
RCS file: /cvs/ports/graphics/libmpeg2/patches/patch-configure,v
retrieving revision 1.4
diff -u -p -r1.4 patch-configure
--- patches/patch-configure 15 Apr 2005 04:15:57 - 1.4
+++ patches/patch-configure 30 Nov 2007 06:40:14 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.4 2005/04/15 04:15:57 jolan Exp $
configure.orig 2003-12-23 06:07:34.0 -0600
-+++ configure 2004-04-17 19:38:34.0 -0500
-@@ -3831,7 +3831,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+--- configure.orig Wed Feb 15 11:34:16 2006
configure Fri Nov 30 01:40:02 2007
+@@ -3866,7 +3866,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.4 2005/04/
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3893,7 +3893,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -3927,7 +3927,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.4 2005/04/
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -3964,7 +3964,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -3997,7 +3997,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.4 2005/04/
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-@@ -4024,7 +4024,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_c
+@@ -4056,7 +4056,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
@@ -37,7 +37,7 @@ $OpenBS
UPDATE: vlc 0.8.6d
Here is an update to VLC 0.8.6d
Index: Makefile
===
RCS file: /cvs/ports/x11/vlc/Makefile,v
retrieving revision 1.61
diff -u -p -r1.61 Makefile
--- Makefile17 Nov 2007 20:53:34 - 1.61
+++ Makefile2 Dec 2007 04:45:54 -
@@ -4,9 +4,9 @@ SHARED_ONLY=Yes
COMMENT-main= videolan client; multimedia player
-V= 0.8.6c
+V= 0.8.6d
DISTNAME= vlc-${V}
-PKGNAME-main= ${DISTNAME}p6
+PKGNAME-main= ${DISTNAME}
CATEGORIES=x11
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${V}/
@@ -191,7 +191,7 @@ CONFIGURE_ARGS+=--enable-arts
LIB_DEPENDS-arts=${LIB_DEPENDS} artsc.>=1::x11/kde/arts3
# any FLAVOR of vlc will do
RUN_DEPENDS-arts=::x11/vlc
-WANTLIB-arts= glib-2.0 gmodule-2.0 gthread-2.0 stdc++ pthread
+WANTLIB-arts= glib-2.0 gmodule-2.0 gthread-2.0 stdc++ pcre pthread
.else
CONFIGURE_ARGS+=--disable-arts
.endif
Index: distinfo
===
RCS file: /cvs/ports/x11/vlc/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo18 Jun 2007 23:14:20 - 1.14
+++ distinfo2 Dec 2007 01:12:49 -
@@ -1,5 +1,5 @@
-MD5 (vlc-0.8.6c.tar.gz) = Pl89eXOHSjZVT7DIx3/GPg==
-RMD160 (vlc-0.8.6c.tar.gz) = +DlMIMwkH4RfOAebsqrJdXmETX4=
-SHA1 (vlc-0.8.6c.tar.gz) = pbflmIHPdXiQJn7kTBLmTAcqCRg=
-SHA256 (vlc-0.8.6c.tar.gz) = taM7pe2uO2BVOLjmjZXWqxRM+U62piWF9cZbVpMb7Uc=
-SIZE (vlc-0.8.6c.tar.gz) = 16234243
+MD5 (vlc-0.8.6d.tar.gz) = Qk60levWTV209l+8yJTgvA==
+RMD160 (vlc-0.8.6d.tar.gz) = AiiDaIyKJxaDPsOB2otGQDhQGuw=
+SHA1 (vlc-0.8.6d.tar.gz) = pMHg+ijNfhPuFtkOSpOS0eU+WkE=
+SHA256 (vlc-0.8.6d.tar.gz) = wg5UeCr5yKrPewNo2zvXpzwG3vAn5BpmRfyjxcl/TxI=
+SIZE (vlc-0.8.6d.tar.gz) = 16286700
Index: patches/patch-aclocal_m4
===
RCS file: patches/patch-aclocal_m4
diff -N patches/patch-aclocal_m4
--- patches/patch-aclocal_m45 Jun 2007 01:53:04 - 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,45 +0,0 @@
-$OpenBSD: patch-aclocal_m4,v 1.6 2007/06/05 01:53:04 jolan Exp $
aclocal.m4.origTue Apr 17 17:46:03 2007
-+++ aclocal.m4 Fri May 11 23:51:38 2007
-@@ -1041,7 +1041,7 @@ AC_DEFUN([VLC_LIBRARY_SUFFIX], [
- darwin*)
- LIBEXT=".dylib"
- ;;
--*mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
-+*mingw32* | *cygwin* | *wince* | *mingwce*)
- LIBEXT=".dll"
- ;;
- hpux*)
-@@ -1059,7 +1059,7 @@ AC_DEFUN([VLC_SYMBOL_PREFIX], [
- AC_MSG_CHECKING(for prefix to exported symbols)
- SYMPREF=""
- case "${target_os}" in
--darwin* | *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
-+darwin* | *mingw32* | *cygwin* | *wince* | *mingwce*)
- SYMPREF="_"
- ;;
- esac
-@@ -8755,9 +8755,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
- found_so=
- found_a=
- if test $use_additional = yes; then
--if test -n "$shlibext" && test -f
"$additional_libdir/lib$name.$shlibext"; then
-+ if test -n "$shlibext" && test "`echo
$additional_libdir/lib$name.$shlibext*`" !=
"$additional_libdir/lib$name.$shlibext*"; then
- found_dir="$additional_libdir"
-- found_so="$additional_libdir/lib$name.$shlibext"
-+ found_so="-l$name"
- if test -f "$additional_libdir/lib$name.la"; then
- found_la="$additional_libdir/lib$name.la"
- fi
-@@ -8777,9 +8777,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
- case "$x" in
- -L*)
- dir=`echo "X$x" | sed -e 's/^X-L//'`
-- if test -n "$shlibext" && test -f
"$dir/lib$name.$shlibext"; then
-+if test -n "$shlibext" && test "`echo
$dir/lib$name.$shlibext*`" != "$dir/lib$name.$shlibext*"; then
- found_dir="$dir"
--found_so="$dir/lib$name.$shlibext"
-+found_so="-l$name"
- if test -f "$dir/lib$name.la"; then
- found_la="$dir/lib$name.la"
- fi
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/x11/vlc/patches/patch-configure_ac,v
retrieving revision 1.9
diff -u -p -r1.9 patch-configure_ac
--- patches/patch-configure_ac 18 Jun 2007 23:14:20 - 1.9
+++ patches/patch-configure_ac 2 Dec 2007 04:27:52 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.9 2007/06/18 23:14:20 ajacoutot Exp $
configure.ac.orig Sat Jun 16 10:25:19 2007
-+++ configure.ac Mon Jun 18 17:34:39 2007
-@@ -210,7 +210,7 @@ case "${target_os}" in
+--- configure.ac.orig Tue Nov 27 08:11:35 2007
configure.ac Sat Dec 1 22:31:03 2007
+@@ -198,7 +198,7 @@ case "${target_os}" in
VLC_ADD_CFLAGS([libvlc],[-x objective-c])
VLC_ADD_CFLAGS([vlc],[-x objective-c])
;;
@@ -10,7 +10,7 @@ $Open
Re: UPDATE: vlc 0.8.6d
On Saturday 01 December 2007 23:52:17 Brad wrote:
> Here is an update to VLC 0.8.6d
My ports tree wasn't quite up to date when I made the first diff.
Index: Makefile
===
RCS file: /cvs/ports/x11/vlc/Makefile,v
retrieving revision 1.62
diff -u -p -r1.62 Makefile
--- Makefile25 Nov 2007 14:21:57 - 1.62
+++ Makefile2 Dec 2007 15:14:07 -
@@ -4,9 +4,9 @@ SHARED_ONLY=Yes
COMMENT-main= videolan client; multimedia player
-V= 0.8.6c
+V= 0.8.6d
DISTNAME= vlc-${V}
-PKGNAME-main= ${DISTNAME}p7
+PKGNAME-main= ${DISTNAME}
CATEGORIES=x11
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${V}/
@@ -191,7 +191,7 @@ CONFIGURE_ARGS+=--enable-arts
LIB_DEPENDS-arts=${LIB_DEPENDS} artsc.>=1::x11/kde/arts3
# any FLAVOR of vlc will do
RUN_DEPENDS-arts=::x11/vlc
-WANTLIB-arts= glib-2.0 gmodule-2.0 gthread-2.0 stdc++ pthread
+WANTLIB-arts= glib-2.0 gmodule-2.0 gthread-2.0 stdc++ pcre pthread
.else
CONFIGURE_ARGS+=--disable-arts
.endif
Index: distinfo
===
RCS file: /cvs/ports/x11/vlc/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo18 Jun 2007 23:14:20 - 1.14
+++ distinfo2 Dec 2007 01:12:49 -
@@ -1,5 +1,5 @@
-MD5 (vlc-0.8.6c.tar.gz) = Pl89eXOHSjZVT7DIx3/GPg==
-RMD160 (vlc-0.8.6c.tar.gz) = +DlMIMwkH4RfOAebsqrJdXmETX4=
-SHA1 (vlc-0.8.6c.tar.gz) = pbflmIHPdXiQJn7kTBLmTAcqCRg=
-SHA256 (vlc-0.8.6c.tar.gz) = taM7pe2uO2BVOLjmjZXWqxRM+U62piWF9cZbVpMb7Uc=
-SIZE (vlc-0.8.6c.tar.gz) = 16234243
+MD5 (vlc-0.8.6d.tar.gz) = Qk60levWTV209l+8yJTgvA==
+RMD160 (vlc-0.8.6d.tar.gz) = AiiDaIyKJxaDPsOB2otGQDhQGuw=
+SHA1 (vlc-0.8.6d.tar.gz) = pMHg+ijNfhPuFtkOSpOS0eU+WkE=
+SHA256 (vlc-0.8.6d.tar.gz) = wg5UeCr5yKrPewNo2zvXpzwG3vAn5BpmRfyjxcl/TxI=
+SIZE (vlc-0.8.6d.tar.gz) = 16286700
Index: patches/patch-aclocal_m4
===
RCS file: patches/patch-aclocal_m4
diff -N patches/patch-aclocal_m4
--- patches/patch-aclocal_m45 Jun 2007 01:53:04 - 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,45 +0,0 @@
-$OpenBSD: patch-aclocal_m4,v 1.6 2007/06/05 01:53:04 jolan Exp $
aclocal.m4.origTue Apr 17 17:46:03 2007
-+++ aclocal.m4 Fri May 11 23:51:38 2007
-@@ -1041,7 +1041,7 @@ AC_DEFUN([VLC_LIBRARY_SUFFIX], [
- darwin*)
- LIBEXT=".dylib"
- ;;
--*mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
-+*mingw32* | *cygwin* | *wince* | *mingwce*)
- LIBEXT=".dll"
- ;;
- hpux*)
-@@ -1059,7 +1059,7 @@ AC_DEFUN([VLC_SYMBOL_PREFIX], [
- AC_MSG_CHECKING(for prefix to exported symbols)
- SYMPREF=""
- case "${target_os}" in
--darwin* | *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
-+darwin* | *mingw32* | *cygwin* | *wince* | *mingwce*)
- SYMPREF="_"
- ;;
- esac
-@@ -8755,9 +8755,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
- found_so=
- found_a=
- if test $use_additional = yes; then
--if test -n "$shlibext" && test -f
"$additional_libdir/lib$name.$shlibext"; then
-+ if test -n "$shlibext" && test "`echo
$additional_libdir/lib$name.$shlibext*`" !=
"$additional_libdir/lib$name.$shlibext*"; then
- found_dir="$additional_libdir"
-- found_so="$additional_libdir/lib$name.$shlibext"
-+ found_so="-l$name"
- if test -f "$additional_libdir/lib$name.la"; then
- found_la="$additional_libdir/lib$name.la"
- fi
-@@ -8777,9 +8777,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
- case "$x" in
- -L*)
- dir=`echo "X$x" | sed -e 's/^X-L//'`
-- if test -n "$shlibext" && test -f
"$dir/lib$name.$shlibext"; then
-+if test -n "$shlibext" && test "`echo
$dir/lib$name.$shlibext*`" != "$dir/lib$name.$shlibext*"; then
- found_dir="$dir"
--found_so="$dir/lib$name.$shlibext"
-+found_so="-l$name"
- if test -f "$dir/lib$name.la"; then
- found_la="$dir/lib$name.la"
- fi
Index: patches/patch-configure_ac
===
RCS file: /cvs/ports/x11/vlc/patches/patch-configure_ac,v
retrieving revision 1.9
diff -u -p -r1.9 patch-configure_ac
--- patches/patch-configure_ac 18 Jun 2007 23:14:20 - 1.9
+++ patches/patch-configure_ac 2 Dec 2007 04:27:52 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v
UPDATE: MySQL 5.0.51
Here is an update to MySQL 5.0.51.
Index: Makefile
===
RCS file: /cvs/ports/databases/mysql/Makefile,v
retrieving revision 1.135
diff -u -p -r1.135 Makefile
--- Makefile1 Nov 2007 23:54:54 - 1.135
+++ Makefile6 Dec 2007 23:18:18 -
@@ -1,18 +1,14 @@
# $OpenBSD: Makefile,v 1.135 2007/11/01 23:54:54 merdely Exp $
-.if ${MACHINE_ARCH} == "m88k"
-BROKEN=gen_lex_hash hangs
-.endif
-
COMMENT-main= multithreaded SQL database (client)
COMMENT-server=multithreaded SQL database (server)
COMMENT-tests= multithreaded SQL database (regression test suite)
-VERSION= 5.0.45
+VERSION= 5.0.51
DISTNAME= mysql-${VERSION}
-PKGNAME-main= mysql-client-${VERSION}p0
-PKGNAME-server=mysql-server-${VERSION}p0
-PKGNAME-tests= mysql-tests-${VERSION}p0
+PKGNAME-main= mysql-client-${VERSION}
+PKGNAME-server=mysql-server-${VERSION}
+PKGNAME-tests= mysql-tests-${VERSION}
CATEGORIES=databases
V= MySQL-5.0
SHARED_LIBS += mysqlclient_r18.0 # .15.0
Index: distinfo
===
RCS file: /cvs/ports/databases/mysql/distinfo,v
retrieving revision 1.31
diff -u -p -r1.31 distinfo
--- distinfo8 Aug 2007 21:33:51 - 1.31
+++ distinfo6 Dec 2007 22:49:53 -
@@ -1,5 +1,5 @@
-MD5 (mysql-5.0.45.tar.gz) = oqHFqCuyK0Wrdqjsq5ThDQ==
-RMD160 (mysql-5.0.45.tar.gz) = 7mcXxl3Hu2tbWWuQ72xHx/3r9fs=
-SHA1 (mysql-5.0.45.tar.gz) = pfuo4ASsxDrBpXbXKPECFfVOviA=
-SHA256 (mysql-5.0.45.tar.gz) = 5EQ9jchZ7VO9nzvvFDzjDH9d7magJ0jpoAMTa+JeAGA=
-SIZE (mysql-5.0.45.tar.gz) = 24433261
+MD5 (mysql-5.0.51.tar.gz) = iMOcjLd4EP67g7fuYlNk1w==
+RMD160 (mysql-5.0.51.tar.gz) = 4UuqHEDLOF+mT8cjVducpYpr4vk=
+SHA1 (mysql-5.0.51.tar.gz) = qaJT6oQulz329HXATax3Ui3g3qc=
+SHA256 (mysql-5.0.51.tar.gz) = tYQHToAyii5lUV7z35R6gSmeMUCnuop+n43PTpLVc2s=
+SIZE (mysql-5.0.51.tar.gz) = 27045586
Index: patches/patch-mysql-test_Makefile_in
===
RCS file: /cvs/ports/databases/mysql/patches/patch-mysql-test_Makefile_in,v
retrieving revision 1.15
diff -u -p -r1.15 patch-mysql-test_Makefile_in
--- patches/patch-mysql-test_Makefile_in8 Aug 2007 21:33:51 -
1.15
+++ patches/patch-mysql-test_Makefile_in6 Dec 2007 23:15:50 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-mysql-test_Makefile_in,v 1.15 2007/08/08 21:33:51 robert Exp $
mysql-test/Makefile.in.origWed Jul 4 09:09:38 2007
-+++ mysql-test/Makefile.in Sat Jul 14 16:19:38 2007
-@@ -375,7 +375,7 @@ zlib_dir = @zlib_dir@
+--- mysql-test/Makefile.in.origThu Nov 15 09:08:22 2007
mysql-test/Makefile.in Thu Dec 6 17:55:13 2007
+@@ -366,7 +366,7 @@ zlib_dir = @zlib_dir@
@[EMAIL PROTECTED] = ndb
@[EMAIL PROTECTED] = \"\"
@[EMAIL PROTECTED] = \"--ndbcluster\"
Index: patches/patch-scripts_mysql_install_db_sh
===
RCS file: /cvs/ports/databases/mysql/patches/patch-scripts_mysql_install_db_sh,v
retrieving revision 1.8
diff -u -p -r1.8 patch-scripts_mysql_install_db_sh
--- patches/patch-scripts_mysql_install_db_sh 8 Aug 2007 21:33:51 -
1.8
+++ patches/patch-scripts_mysql_install_db_sh 6 Dec 2007 23:16:02 -
@@ -1,54 +1,39 @@
$OpenBSD: patch-scripts_mysql_install_db_sh,v 1.8 2007/08/08 21:33:51 robert
Exp $
scripts/mysql_install_db.sh.orig Wed Jul 4 09:06:09 2007
-+++ scripts/mysql_install_db.shSat Jul 14 16:19:38 2007
-@@ -21,7 +21,8 @@
- in_rpm=0
- windows=0
+--- scripts/mysql_install_db.sh.orig Thu Nov 15 09:06:33 2007
scripts/mysql_install_db.shThu Dec 6 18:15:43 2007
+@@ -25,7 +25,8 @@ srcdir=""
+ args=""
defaults=""
+ mysqld_opt=""
-user=""
+user=_mysql
+group=_mysql
- case "$1" in
- --no-defaults|--defaults-file=*|--defaults-extra-file=*)
-@@ -59,6 +60,7 @@ parse_arguments() {
+ force=0
+ in_rpm=0
+@@ -102,6 +103,8 @@ parse_arguments()
# as 'user' (crucial e.g. if log-bin=/some_other_path/
# where a chown of datadir won't help)
-user=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
-+ --group=*) group=`echo "$arg" | sed -e 's/^[^=]*=//'` ;;
+user=`parse_arg "$arg"` ;;
++ --group=*)
++ group=`parse_arg "$arg"` ;;
--skip-name-resolve) ip_only=1 ;;
--verbose) verbose=1 ;; # Obsolete
--rpm) in_rpm=1 ;;
-@@ -252,20 +254,18 @@ fi
-
- # Create database directories mysql & test
- if test ! -d $ldata; then
-- mkdir $ldata;
-+ mkdir -p $ldata;
- chmod 700 $ldata ;
- fi
- if test ! -d $ldata/mysql; then
-- mkdir $ldata/mysql;
-+ mkdir -p $ldata/mysql;
- chmod 700 $ldata/mysql ;
- fi
- if test ! -d $ldata/test; then
-- mkdir $ldata/test;
-+ mkdir -p $ldata/test;
- chmod 700 $ldata/test ;
- fi
--if test -w / -a ! -z "$user"; then
-- chown $user $ldata $ldata/mysql $ldata/test;
--f
Re: [new] ffmpegthumbnailer and thunar-thumbnailers
On Tuesday 25 December 2007 17:43:46 Landry Breuil wrote: > On Sun, Dec 16, 2007 at 06:03:58PM +0100, Landry Breuil wrote: > > Hi ports@, > > > > this time two new ports, first ffmpegthumbnailer which creates > > thumbnails for various video formats supported by ffmpeg. Those > > thumbnails can be then used by file managers, hence the second one, > > thunar-thumbnailers. > > The latter add thumbnails support to Thunar (xfce file manager) for the > > following formats : > > - EPS > > - Postscript > > - DVI > > - PDF > > - Fig (.fig) > > - OpenDocument Format > > - SVGZ (Compressed SVG) > > - Video files > > > > It may be used for latex, raw digital camera images and grace files too, > > but currently they're not enabled in the port. > > > > Homepage : > > http://goodies.xfce.org/projects/thunar-plugins/thunar-thumbnailers > > > > Ports : > > http://gcu.info/~gaston/ports/ffmpegthumbnailer-1.1.3.tar.gz > > http://gcu.info/~gaston/ports/thunar-thumbnailers-0.3.0.tar.gz > > > > Feedback and comments welcome. > > Thanks, > > Landry > > Noone tested these two new ports ? Iirc, this has been asked by someone > offlist... > > Ok's welcomed too. > > Landry I didn't notice this. I'll see about testing this out as I was the one who asked for this. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
UPDATE: Xine-lib 1.1.9
Here is an update to Xine-lib 1.1.9.
Index: Makefile
===
RCS file: /cvs/ports/multimedia/xine-lib/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile25 Nov 2007 14:22:36 - 1.22
+++ Makefile9 Jan 2008 07:21:12 -
@@ -4,13 +4,14 @@ COMMENT-main= multimedia decoding libra
COMMENT-esd= esound audio output module for xine-lib
COMMENT-arts= artsd audio output muodule for xine-lib
-V= 1.1.8
+V= 1.1.9
DISTNAME= xine-lib-${V}
-PKGNAME-main= xine-lib-${V}p1
+PKGNAME-main= xine-lib-${V}
PKGNAME-esd= xine-lib-esd-${V}
PKGNAME-arts= xine-lib-arts-${V}
+EXTRACT_SUFX= .tar.bz2
CATEGORIES=multimedia
-SHARED_LIBS= xine19.0
+SHARED_LIBS= xine20.0
HOMEPAGE= http://xinehq.de/
@@ -28,7 +29,8 @@ WANTLIB= expat fontconfig freetype m z
WANTLIB-main= ${WANTLIB} X11 Xau Xdmcp Xext Xinerama Xrandr \
Xrender Xv faac jpeg lcms mp3lame usbhid x264
WANTLIB-esd= ${WANTLIB}
-WANTLIB-arts= ${WANTLIB} stdc++ glib-2.0 gmodule-2.0 gthread-2.0
+WANTLIB-arts= ${WANTLIB} pcre pthread stdc++ glib-2.0 \
+ gmodule-2.0 gthread-2.0
.if ${MACHINE_ARCH} == "i386"
PKG_ARGS+= -Di386=1
Index: distinfo
===
RCS file: /cvs/ports/multimedia/xine-lib/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo31 Oct 2007 10:55:37 - 1.5
+++ distinfo9 Jan 2008 06:49:29 -
@@ -1,5 +1,5 @@
-MD5 (xine-lib-1.1.8.tar.gz) = 7yNcyecFdoCqNcMVpt14/Q==
-RMD160 (xine-lib-1.1.8.tar.gz) = tCB+DQNzto2NPD+2akZ5U8ACRzI=
-SHA1 (xine-lib-1.1.8.tar.gz) = hpkFkIqDGpWa48aWLW0yBNxT05s=
-SHA256 (xine-lib-1.1.8.tar.gz) = 0WTISoQtvj1UjTV04uSJy7GdUueZf5NI6Ij2vXTNsHk=
-SIZE (xine-lib-1.1.8.tar.gz) = 8872132
+MD5 (xine-lib-1.1.9.tar.bz2) = ZdGPjFDkvIbZBQl84jTRrA==
+RMD160 (xine-lib-1.1.9.tar.bz2) = F53GbRP18dzfE0rILtcbkFxzMug=
+SHA1 (xine-lib-1.1.9.tar.bz2) = +eNrbMafdv7TuV3oop7yJVdwqjM=
+SHA256 (xine-lib-1.1.9.tar.bz2) = WRlNx1ydpLGG7VO/0MOdkHC+BiA01bEi1XisAKsjaBg=
+SIZE (xine-lib-1.1.9.tar.bz2) = 7391259
Index: patches/patch-configure
===
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-configure,v
retrieving revision 1.10
diff -u -p -r1.10 patch-configure
--- patches/patch-configure 31 Oct 2007 10:55:37 - 1.10
+++ patches/patch-configure 9 Jan 2008 07:05:09 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.10 2007/10/31 10:55:37 jakemsr Exp $
configure.orig Mon Aug 27 14:28:18 2007
-+++ configure Wed Oct 17 20:29:23 2007
-@@ -24480,6 +24480,9 @@ _ACEOF
+--- configure.orig Sun Jan 6 10:58:02 2008
configure Wed Jan 9 01:50:21 2008
+@@ -24483,6 +24483,9 @@ _ACEOF
fi
done
@@ -11,7 +11,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-@@ -30589,13 +30592,13 @@ t q
+@@ -30592,13 +30595,13 @@ t q
b
:q
q"
@@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
cat >>confdefs.h <<_ACEOF
#define LIBXV_SO "${x_lib_location:-libXv.so}"
-@@ -37484,7 +37487,7 @@ fi
+@@ -37487,7 +37490,7 @@ fi
LIBFLAC_LIBS="-L$prefix/$XINE_LIBNAME"
fi
@@ -36,7 +36,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
if test "x$libFLAC_includes" != "x" ; then
LIBFLAC_CFLAGS="-I$libFLAC_includes"
-@@ -37735,7 +37738,7 @@ elif test "x$external_a52dec" = "xyes"; then
+@@ -37738,7 +37741,7 @@ elif test "x$external_a52dec" = "xyes"; then
have_a52="yes"
@@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-@@ -37874,7 +37877,7 @@ if test $ac_cv_lib_a52_a52_init = yes; then
+@@ -37877,7 +37880,7 @@ if test $ac_cv_lib_a52_a52_init = yes; then
#define HAVE_LIBA52 1
_ACEOF
@@ -54,7 +54,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
else
have_a52="no"
-@@ -38452,7 +38455,7 @@ if test "${ac_cv_lib_mng_mng_initialize+set}" = set; t
+@@ -38455,7 +38458,7 @@ if test "${ac_cv_lib_mng_mng_initialize+set}" = set; t
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -63,7 +63,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38635,7 +38638,7 @@ echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; }
+@@ -38638,7 +38641,7 @@ echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; }
fi
if test $ac_cv_header_libmng_h = yes; then
have_libmng=yes
@@ -72,7 +72,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
else
{ echo "$as_me:$LINENO: result: *** All libmng dependent parts will
Re: LDFLAGS is missing from bsd.port.mk
On Friday 11 January 2008 19:36:30 Mikko Tolmunen wrote:
> use of LDFLAGS is mentioned in Makefile.template
Makefile.template is wrong and this is wrong as well.
> Index: mk/bsd.port.mk
> ===
> RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
> retrieving revision 1.922
> diff -u -r1.922 bsd.port.mk
> --- mk/bsd.port.mk4 Jan 2008 18:38:51 - 1.922
> +++ mk/bsd.port.mk12 Jan 2008 00:24:43 -
> @@ -543,6 +543,7 @@
> MAKE_ENV += PATH='${PORTPATH}' PREFIX='${PREFIX}' \
> LOCALBASE='${LOCALBASE}' DEPBASE='${DEPBASE}' X11BASE='${X11BASE}' \
> MOTIFLIB='${MOTIFLIB}' CFLAGS='${CFLAGS:C/ *$//}' \
> + LDFLAGS='${LDFLAGS:C/ *$//}' \
> TRUEPREFIX='${PREFIX}' ${DESTDIRNAME}='' \
> HOME='${PORTHOME}'
>
> @@ -1233,6 +1234,7 @@
> MODSIMPLE_configure = \
> cd ${WRKCONF} && ${_SYSTRACE_CMD} ${SETENV} \
> CC="${CC}" ac_cv_path_CC="${CC}" CFLAGS="${CFLAGS:C/ *$//}" \
> + LDFLAGS="${LDFLAGS:C/ *$//}" \
> CXX="${CXX}" ac_cv_path_CXX="${CXX}" CXXFLAGS="${CXXFLAGS:C/
> *$//}" \
> INSTALL="/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}" \
> ac_given_INSTALL="/usr/bin/install -c -o ${BINOWN} -g
> ${BINGRP}" \
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: LDFLAGS is missing from bsd.port.mk
On Friday 11 January 2008 20:43:09 Mikko Tolmunen wrote:
> > Makefile.template is wrong and this is wrong as well.
> well in that case let's patch the Makefile.template then, and if you ever get
> couple of minutes of free time to waste please explain what was wrong with
> the patch.
Your patch was wrong because Makefile.template should not list LDFLAGS
as it currently does. The patch below is correct.
> Index: Makefile.template
> ===
> RCS file: /cvs/ports/infrastructure/templates/Makefile.template,v
> retrieving revision 1.53
> diff -u -r1.53 Makefile.template
> --- Makefile.template 17 Sep 2007 09:44:42 - 1.53
> +++ Makefile.template 12 Jan 2008 01:39:14 -
> @@ -158,7 +158,6 @@
> # Overrides for default values
> #
> #CFLAGS= ???
> -#LDFLAGS=???
> #MAKE_FILE= ???
> #PKG_ARCH= ???
> #WRKDIST=??? if other than ${WRKDIR}/$DISTNAME
>
>
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
UPDATE: Xine-lib 1.1.9.1
Here is an update to Xine-lib 1.1.9.1.
There is a security fix in this release for a heap buffer overflow
with RTSP.
I also added a fix for the WMV decoding which was commited just
after the 1.1.9.1 release.
Index: Makefile
===
RCS file: /cvs/ports/multimedia/xine-lib/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile25 Nov 2007 14:22:36 - 1.22
+++ Makefile13 Jan 2008 02:00:21 -
@@ -4,13 +4,14 @@ COMMENT-main= multimedia decoding libra
COMMENT-esd= esound audio output module for xine-lib
COMMENT-arts= artsd audio output muodule for xine-lib
-V= 1.1.8
+V= 1.1.9.1
DISTNAME= xine-lib-${V}
-PKGNAME-main= xine-lib-${V}p1
+PKGNAME-main= xine-lib-${V}
PKGNAME-esd= xine-lib-esd-${V}
PKGNAME-arts= xine-lib-arts-${V}
+EXTRACT_SUFX= .tar.bz2
CATEGORIES=multimedia
-SHARED_LIBS= xine19.0
+SHARED_LIBS= xine20.0
HOMEPAGE= http://xinehq.de/
@@ -28,7 +29,8 @@ WANTLIB= expat fontconfig freetype m z
WANTLIB-main= ${WANTLIB} X11 Xau Xdmcp Xext Xinerama Xrandr \
Xrender Xv faac jpeg lcms mp3lame usbhid x264
WANTLIB-esd= ${WANTLIB}
-WANTLIB-arts= ${WANTLIB} stdc++ glib-2.0 gmodule-2.0 gthread-2.0
+WANTLIB-arts= ${WANTLIB} pcre pthread stdc++ glib-2.0 \
+ gmodule-2.0 gthread-2.0
.if ${MACHINE_ARCH} == "i386"
PKG_ARGS+= -Di386=1
Index: distinfo
===
RCS file: /cvs/ports/multimedia/xine-lib/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo31 Oct 2007 10:55:37 - 1.5
+++ distinfo13 Jan 2008 02:00:46 -
@@ -1,5 +1,5 @@
-MD5 (xine-lib-1.1.8.tar.gz) = 7yNcyecFdoCqNcMVpt14/Q==
-RMD160 (xine-lib-1.1.8.tar.gz) = tCB+DQNzto2NPD+2akZ5U8ACRzI=
-SHA1 (xine-lib-1.1.8.tar.gz) = hpkFkIqDGpWa48aWLW0yBNxT05s=
-SHA256 (xine-lib-1.1.8.tar.gz) = 0WTISoQtvj1UjTV04uSJy7GdUueZf5NI6Ij2vXTNsHk=
-SIZE (xine-lib-1.1.8.tar.gz) = 8872132
+MD5 (xine-lib-1.1.9.1.tar.bz2) = PKHkM4bAEpPdw66vi1+ATw==
+RMD160 (xine-lib-1.1.9.1.tar.bz2) = k+LocALrA4uLagFQRR1a43GSxZ0=
+SHA1 (xine-lib-1.1.9.1.tar.bz2) = nOsytytuqo5qsD2wbDqkoUpuaMM=
+SHA256 (xine-lib-1.1.9.1.tar.bz2) =
AkmG339a2XPL7RjFCiq7MMqIIgs8trKwnsLbm5SY5Oc=
+SIZE (xine-lib-1.1.9.1.tar.bz2) = 7392199
Index: patches/patch-configure
===
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-configure,v
retrieving revision 1.10
diff -u -p -r1.10 patch-configure
--- patches/patch-configure 31 Oct 2007 10:55:37 - 1.10
+++ patches/patch-configure 13 Jan 2008 02:02:05 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.10 2007/10/31 10:55:37 jakemsr Exp $
configure.orig Mon Aug 27 14:28:18 2007
-+++ configure Wed Oct 17 20:29:23 2007
-@@ -24480,6 +24480,9 @@ _ACEOF
+--- configure.orig Fri Jan 11 10:12:24 2008
configure Sat Jan 12 21:01:52 2008
+@@ -24490,6 +24490,9 @@ _ACEOF
fi
done
@@ -11,7 +11,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-@@ -30589,13 +30592,13 @@ t q
+@@ -30599,13 +30602,13 @@ t q
b
:q
q"
@@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
cat >>confdefs.h <<_ACEOF
#define LIBXV_SO "${x_lib_location:-libXv.so}"
-@@ -37484,7 +37487,7 @@ fi
+@@ -37494,7 +37497,7 @@ fi
LIBFLAC_LIBS="-L$prefix/$XINE_LIBNAME"
fi
@@ -36,7 +36,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
if test "x$libFLAC_includes" != "x" ; then
LIBFLAC_CFLAGS="-I$libFLAC_includes"
-@@ -37735,7 +37738,7 @@ elif test "x$external_a52dec" = "xyes"; then
+@@ -37745,7 +37748,7 @@ elif test "x$external_a52dec" = "xyes"; then
have_a52="yes"
@@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-@@ -37874,7 +37877,7 @@ if test $ac_cv_lib_a52_a52_init = yes; then
+@@ -37884,7 +37887,7 @@ if test $ac_cv_lib_a52_a52_init = yes; then
#define HAVE_LIBA52 1
_ACEOF
@@ -54,7 +54,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
else
have_a52="no"
-@@ -38452,7 +38455,7 @@ if test "${ac_cv_lib_mng_mng_initialize+set}" = set; t
+@@ -38462,7 +38465,7 @@ if test "${ac_cv_lib_mng_mng_initialize+set}" = set; t
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -63,7 +63,7 @@ $OpenBSD: patch-configure,v 1.10 2007/10
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38635,7 +38638,7 @@ echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; }
+@@ -38645,7 +38648,7 @@ echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; }
fi
if test $ac_c
Re: LDFLAGS is missing from bsd.port.mk
On Saturday 12 January 2008 08:38:39 Marc Espie wrote: > On Sat, Jan 12, 2008 at 09:16:19AM -0300, Andrés wrote: > > On Jan 12, 2008 12:57 AM, Brad <[EMAIL PROTECTED]> wrote: > > > Your patch was wrong because Makefile.template should not list LDFLAGS > > > as it currently does. The patch below is correct. > > > > Just to know if we can help to make Makefile.template match reality: > > is there more stuff that shouldn't go there? > > Not really. > > Per-use existing ports. I'm not even convinced Makefile.template is > a good idea. People seem to like it, I never use it. I feel the same way. bsd.port.mk(5) and examples in the tree are more than good enough. Some people take the template way too seriously, to the point of even putting variables in the same order as the template and other silliness. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
UPDATE: Squid 2.6 STABLE18
Here is an update to Squid 2.6 STABLE18.
Index: Makefile
===
RCS file: /cvs/ports/www/squid/Makefile,v
retrieving revision 1.91
diff -u -p -r1.91 Makefile
--- Makefile4 Dec 2007 01:27:13 - 1.91
+++ Makefile13 Jan 2008 04:22:51 -
@@ -2,7 +2,7 @@
COMMENT= WWW and FTP proxy cache and accelerator
-DISTNAME= squid-2.6.STABLE17
+DISTNAME= squid-2.6.STABLE18
CATEGORIES=www
MASTER_SITES= ${HOMEPAGE}Versions/v2/2.6/
DIST_SUBDIR= squid
Index: distinfo
===
RCS file: /cvs/ports/www/squid/distinfo,v
retrieving revision 1.46
diff -u -p -r1.46 distinfo
--- distinfo4 Dec 2007 01:27:13 - 1.46
+++ distinfo13 Jan 2008 04:23:15 -
@@ -1,5 +1,5 @@
-MD5 (squid/squid-2.6.STABLE17.tar.gz) = 8+XHch2fjY8l7LM39viLcw==
-RMD160 (squid/squid-2.6.STABLE17.tar.gz) = j63PanjA+M4gQm7Zp4g34ZoKmvY=
-SHA1 (squid/squid-2.6.STABLE17.tar.gz) = 5QIqkxjmVH1MJAnFn0V/kt5iBAE=
-SHA256 (squid/squid-2.6.STABLE17.tar.gz) =
ASMffrCij6/0Hz8nm5SfMmAq5PzkHSb2GQ6YEv4qNgw=
-SIZE (squid/squid-2.6.STABLE17.tar.gz) = 1724676
+MD5 (squid/squid-2.6.STABLE18.tar.gz) = 1/9197dbp7wo6kU/5LlENA==
+RMD160 (squid/squid-2.6.STABLE18.tar.gz) = YlQsYHsqs2MM6Ch5sXUJtBIClHk=
+SHA1 (squid/squid-2.6.STABLE18.tar.gz) = uBnpNPB/9CGmM8J0MtfiifrTVo8=
+SHA256 (squid/squid-2.6.STABLE18.tar.gz) =
UahfLa5Qp5Oh7TgZFnbL+asuzcBZME+/beBB02aS1jQ=
+SIZE (squid/squid-2.6.STABLE18.tar.gz) = 1725660
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: UPDATE: Add no_x11 flavor to textproc/xpdf
On Tuesday 15 January 2008 15:17:29 Matthias Kilian wrote: > A patch just to shutup the update-plist warnings? If you want to > do this, you can just rm the offending file (xpdfrc) in post-install. > > Ciao, > Kili I don't agree with doing stuff like this. They're just that, warnings not errors. This was one of the advantages of having FAKE over installing directly into the PREFIX. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: Add no_x11 flavor to textproc/xpdf
On Wednesday 16 January 2008 03:47:37 Marc Balmer wrote: > Landry Breuil wrote: > > On Tue, Jan 15, 2008 at 03:10:26PM +0100, Marc Balmer wrote: > >> Landry Breuil wrote: > >>> On Mon, Jan 14, 2008 at 03:32:52PM -0800, Jeremy Evans wrote: > On 11/14 08:56, Landry Breuil wrote: > > On Tue, Nov 13, 2007 at 02:38:38PM -0800, Jeremy Evans wrote: > >> This diff adds a no_x11 flavor to textproc/xpdf. This is necessary if > >> you want to use the pdftotext program without X being installed. This > >> patch is the same is one sent last week, update to -current for the > >> recent security patch to xpdf. > >> > >> Tested on i386. Please test and commit. > > We (bernd and i) had a look at your previous patch, and it seems to make > > more sense to have a multi-packages with xpdf-main and xpdf-utils, the > > latter > > containing what corresponds to your no_x11 flavor. > > An updated diff should appear soon, there is only a little issue about > > upgrading from xpdf to xpdf-main+xpdf-utils which leads to conflicts. > I agree, multi-packages make more sense. I'm not sure if you had time > to work on a diff, so I prepared one. It is attached. Hopefully we can > work out the upgrade conflicts. > >>> Ah, yes, bernd@ sent me a diff a while ago about this one, with a > >>> @pkgpath marker to solve the update/conflicts. It also moves pdftops to > >>> -main package, i'm not sure if it's needed.. and -main doesn't > >>> run_depends on -utils. > >>> > >>> xpdf users, what do you think about it ? Is it worth making this > >>> MULTI_PACKAGES ? Attached diff needs comments and feedback. > >> I'd prefer a single package. i.e. users must have X11 installed. > > > > That was the main idea, needing X only for xpdf binary, and being also able > > to install xpdf-utils on systems without X sets.. i can think of a > > webapp that converts pdfs to ps/txt installed on a webserver without X sets. > > And yes, users still complains and don't understand why they haveto install > > X sets on their headless servers, even if it's explained in the faq. > > > > But as bernd said, i dunno if it's worth the effort adding complicated cruft > > to this port. > > we stated many times that for some ports you just need X installed. So > it is no problem. Yes, some ports. Some ports there is no option at all. In this case there is an option. So either the port uses multi packages or it uses a no_x11 FLAVOR. The no_x11 FLAVOR is the better choice. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
UPDATE: qinx 1.4
Here is an update to QINX 1.4.
This also fixes the incorrect PERMIT_DISTFILES_ values that I used when
I imported the port.
Index: Makefile
===
RCS file: /cvs/ports/x11/qinx/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile15 Sep 2007 20:04:23 - 1.10
+++ Makefile12 Dec 2007 02:16:26 -
@@ -4,18 +4,18 @@ SHARED_ONLY= Yes
COMMENT= QNX Photon inspired theme for KDE
-DISTNAME= qinx-1.0
-PKGNAME= ${DISTNAME}p1
+DISTNAME= qinx-1.4
CATEGORIES=x11 x11/kde
MASTER_SITES= http://www.usermode.org/code/
+EXTRACT_SUFX= .tar.bz2
HOMEPAGE= http://www.usermode.org/code.html
# BSD
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
-PERMIT_DISTFILES_CDROM=No
-PERMIT_DISTFILES_FTP= No
+PERMIT_DISTFILES_CDROM=Yes
+PERMIT_DISTFILES_FTP= Yes
WANTLIB= ICE SM X11 Xext Xrender jpeg m png pthread util z \
iconv idn
@@ -23,9 +23,8 @@ LIB_DEPENDS= art_lgpl_2::graphics/libart
kdecore.>=6,DCOP,kdefx,kdeui::x11/kde/libs3 \
kdecorations::x11/kde/base3
-AUTOCONF_VERSION= 2.57
-MODKDE_VERSION= 3.2
MODULES= x11/kde
+MODKDE_VERSION= 3.4
PORTHOME= ${WRKDIR}
@@ -35,7 +34,9 @@ MAKE_FLAGS= ${MODKDE_MAKE_FLAGS}
USE_X11= Yes
USE_GMAKE= Yes
USE_LIBTOOL= Yes
+LIBTOOL_FLAGS= --tag=disable-static
CONFIGURE_STYLE= autoconf
+AUTOCONF_VERSION= 2.59
MODGNU_CONFIG_GUESS_DIRS= ${MODKDE_CONFIG_GUESS_DIRS}
CONFIGURE_ARGS=${MODKDE_CONFIGURE_ARGS}
CONFIGURE_ENV= ${MODKDE_CONFIGURE_ENV}
Index: distinfo
===
RCS file: /cvs/ports/x11/qinx/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo5 Apr 2007 17:36:24 - 1.4
+++ distinfo12 Dec 2007 02:04:49 -
@@ -1,5 +1,5 @@
-MD5 (qinx-1.0.tar.gz) = vQr9wuw9HlM9ZatEn5FNLA==
-RMD160 (qinx-1.0.tar.gz) = vJHnYkJ60rf0XOM2YL2CTxinvcU=
-SHA1 (qinx-1.0.tar.gz) = Ls5xcWaHnwn4JPnmH2TOnVq6bGs=
-SHA256 (qinx-1.0.tar.gz) = 4/jUH3VzVfND7rDbBjrDLWtmDCklZGdUYkUlopHKymE=
-SIZE (qinx-1.0.tar.gz) = 602643
+MD5 (qinx-1.4.tar.bz2) = MWlW3gBn41YOiawCp+hjuA==
+RMD160 (qinx-1.4.tar.bz2) = WqwgezJuFeFyiWO+FdyH4V4XTuY=
+SHA1 (qinx-1.4.tar.bz2) = +WJMdhcbPSmQ22WwOvT03DQs2yM=
+SHA256 (qinx-1.4.tar.bz2) = 5LX9B7RQSGLd0oVhZGhhU7uspTjIiwvUFO46i3GdYQU=
+SIZE (qinx-1.4.tar.bz2) = 383043
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/qinx/pkg/PLIST,v
retrieving revision 1.4
diff -u -p -r1.4 PLIST
--- pkg/PLIST 12 Jun 2006 15:45:51 - 1.4
+++ pkg/PLIST 12 Dec 2007 02:18:45 -
@@ -1,22 +1,13 @@
@comment $OpenBSD: PLIST,v 1.4 2006/06/12 15:45:51 espie Exp $
-${KDE}/
${KDE}/kstyle_qinx_config.la
${KDE}/kstyle_qinx_config.so
${KDE}/kwin3_qinx.la
${KDE}/kwin3_qinx.so
${KDE}/kwin_qinx_config.la
${KDE}/kwin_qinx_config.so
-${KDE}/plugins/
-${KDE}/plugins/styles/
${KDE}/plugins/styles/qinx.la
${KDE}/plugins/styles/qinx.so
-share/apps/
-share/apps/kdisplay/
-share/apps/kdisplay/color-schemes/
share/apps/kdisplay/color-schemes/qinx.kcsrc
share/apps/kdisplay/color-schemes/qinxmodern.kcsrc
-share/apps/kstyle/
-share/apps/kstyle/themes/
share/apps/kstyle/themes/qinx.themerc
-share/apps/kwin/
share/apps/kwin/qinx.desktop
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
UPDATE: Kaffeine 0.8.6
Here is an update to Kaffeine 0.8.6.
Index: Makefile
===
RCS file: /cvs/ports/multimedia/kaffeine/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile10 Sep 2007 23:22:29 - 1.11
+++ Makefile21 Jan 2008 09:02:32 -
@@ -5,7 +5,7 @@ COMMENT=video player for KDE
HOMEPAGE= http://kaffeine.sourceforge.net/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kaffeine/}
-DISTNAME= kaffeine-0.8.5
+DISTNAME= kaffeine-0.8.6
EXTRACT_SUFX= .tar.bz2
SHARED_LIBS += kaffeinepart 0.0 # .0.1
@@ -14,7 +14,7 @@ SHARED_LIBS +=kaffeineaudioencoder 0.0
MODULES= x11/kde
MODKDE_VERSION=3.5.7
CONFIGURE_STYLE= autoconf
-AUTOCONF_VERSION= 2.60
+AUTOCONF_VERSION= 2.61
CONFIGURE_ARGS+= ${MODKDE_CONFIGURE_ARGS}
CONFIGURE_ARGS+= --disable-libsuffix \
--without-gstreamer \
@@ -30,7 +30,7 @@ SEPARATE_BUILD= simple
LIB_DEPENDS=
kdecore.>=7,DCOP,kdesu,kio,kdefx,kparts,kutils,kdeprint,kdeui,kwalletclient,khtml,kjs::x11/kde/libs3
\
vorbis,vorbisenc::audio/libvorbis \
cdda_interface,cdda_paranoia::audio/cdparanoia \
- xine::multimedia/xine-lib
+ xine.>=20::multimedia/xine-lib
WANTLIB= X11 ICE Xrender SM Xext freetype Xinerama \
util m pthread z c stdc++ expat fontconfig \
Index: distinfo
===
RCS file: /cvs/ports/multimedia/kaffeine/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo10 Sep 2007 23:22:29 - 1.6
+++ distinfo21 Jan 2008 08:56:52 -
@@ -1,5 +1,5 @@
-MD5 (kaffeine-0.8.5.tar.bz2) = 71814e7612f1f7e1b6cd954d352e4201
-RMD160 (kaffeine-0.8.5.tar.bz2) = f32004e87b790bdd137c455234cbf3c2776fd3f3
-SHA1 (kaffeine-0.8.5.tar.bz2) = 2a993555cf1b4295230a69fd74d68ed06c3e5ae8
-SHA256 (kaffeine-0.8.5.tar.bz2) =
653090c84c11eaea20a4b7b9a863972d16fea7d8db148be12b26291c162b0f97
-SIZE (kaffeine-0.8.5.tar.bz2) = 2887566
+MD5 (kaffeine-0.8.6.tar.bz2) = ECzO1qaG9f//7pRlLKKgkw==
+RMD160 (kaffeine-0.8.6.tar.bz2) = Jg2j8ynXb9XjcjluUvMtwXUgYxM=
+SHA1 (kaffeine-0.8.6.tar.bz2) = UIl39ZH9MUdFSN+5LhBztlbPZfo=
+SHA256 (kaffeine-0.8.6.tar.bz2) = d0hWNrGiee1ONDGUfu2glvQehKzkgf+wuf1w0JZ2wLc=
+SIZE (kaffeine-0.8.6.tar.bz2) = 2923224
Index: patches/patch-kaffeine_src_input_disc_disc_cpp
===
RCS file:
/cvs/ports/multimedia/kaffeine/patches/patch-kaffeine_src_input_disc_disc_cpp,v
retrieving revision 1.1
diff -u -p -r1.1 patch-kaffeine_src_input_disc_disc_cpp
--- patches/patch-kaffeine_src_input_disc_disc_cpp 18 Jun 2007 23:24:06
- 1.1
+++ patches/patch-kaffeine_src_input_disc_disc_cpp 21 Jan 2008 08:58:02
-
@@ -1,7 +1,7 @@
$OpenBSD: patch-kaffeine_src_input_disc_disc_cpp,v 1.1 2007/06/18 23:24:06
jakemsr Exp $
kaffeine/src/input/disc/disc.cpp.orig Sun May 27 01:31:44 2007
-+++ kaffeine/src/input/disc/disc.cpp Sun May 27 01:32:39 2007
-@@ -426,13 +426,13 @@ void Disc::startCD( const QString &device, bool rip )
+--- kaffeine/src/input/disc/disc.cpp.orig Sun Jan 20 12:50:46 2008
kaffeine/src/input/disc/disc.cpp Mon Jan 21 03:57:33 2008
+@@ -429,13 +429,13 @@ void Disc::startCD( const QString &device, bool rip )
else if ( devList.count()==1 )
s.append( devList[0] );
else {
Index: pkg/PLIST
===
RCS file: /cvs/ports/multimedia/kaffeine/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 10 Sep 2007 23:22:29 - 1.6
+++ pkg/PLIST 21 Jan 2008 09:11:59 -
@@ -21,6 +21,7 @@ share/apps/kaffeine/kaffeinedisc.rc
share/apps/kaffeine/kaffeineplaylist.rc
share/apps/kaffeine/kaffeineui.rc
share/apps/kaffeine/logo
+share/apps/kaffeine/logo.avi
share/apps/kaffeine/logo.mpg
share/apps/kaffeine/mms.protocol
share/apps/kaffeine/nocover.png
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: UPDATE: Kaffeine 0.8.6
On Monday 21 January 2008 04:26:58 Antoine Jacoutot wrote: > On Mon, 21 Jan 2008, Brad wrote: > > Here is an update to Kaffeine 0.8.6. > > It misses the update-desktop-database and gtk-update-icon-cache goos. > (not related to your update as they were missing before). Then it can be added after. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: Kaffeine 0.8.6
On Monday 21 January 2008 04:34:51 Antoine Jacoutot wrote: > On Mon, 21 Jan 2008, Brad wrote: > > Then it can be added after. > > Why? > Can't you include them in your update? Maybe if you show me what needs to be done. I have no idea what this stuff is. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: PATCH: devel/sdl
On Friday 25 January 2008 00:21:38 Antti Harri wrote:
>
> Anyone?
ok brad@
Though something really needs to be done about fixing this properly.
IMO this is ridiculous to have a hardcoded shared library name in the
resulting binary.
> On Fri, 18 Jan 2008, Antti Harri wrote:
> >
> > Hi,
> >
> > I found out the reason why some SDL apps were segfaulting.
> >
> > http://users.openbsd.fi/iku/files/sdl.diff
> >
> > ? w-sdl-1.2.13
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/devel/sdl/Makefile,v
> > retrieving revision 1.60
> > diff -u -r1.60 Makefile
> > --- Makefile3 Jan 2008 17:39:40 - 1.60
> > +++ Makefile18 Jan 2008 19:02:23 -
> > @@ -4,7 +4,7 @@
> >
> > VERSION=1.2.13
> > DISTNAME= SDL-${VERSION}
> > -PKGNAME= ${DISTNAME:L}
> > +PKGNAME= ${DISTNAME:L}p0
> > CATEGORIES= devel
> >
> > HOMEPAGE= http://www.libsdl.org/
> > Index: patches/patch-src_video_x11_SDL_x11gl_c
> > ===
> > RCS file: /cvs/ports/devel/sdl/patches/patch-src_video_x11_SDL_x11gl_c,v
> > retrieving revision 1.12
> > diff -u -r1.12 patch-src_video_x11_SDL_x11gl_c
> > --- patches/patch-src_video_x11_SDL_x11gl_c 22 Sep 2007 01:12:38 -
> > 1.12
> > +++ patches/patch-src_video_x11_SDL_x11gl_c 18 Jan 2008 19:02:23 -
> > @@ -6,7 +6,7 @@
> > #define DEFAULT_OPENGL "libGL.so.3"
> > #elif defined(__OpenBSD__)
> > -#define DEFAULT_OPENGL "libGL.so.4.0"
> > -+#define DEFAULT_OPENGL"libGL.so.5.1"
> > ++#define DEFAULT_OPENGL"libGL.so.6.0"
> > #else
> > #define DEFAULT_OPENGL "libGL.so.1"
> > #endif
> >
> >
> >
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: www/konqueror-embedded ?
On Sunday 27 January 2008 02:32:35 Antti Harri wrote: > > Anyone working on updating konq-e? According > to http://www.konqueror.org/embedded/ new snapshots > can be found from http://www.basyskom.de/index.pl/konqe . > The version there seems to be 20070531 and currently > the in-tree version is 20060121. I'm surprised and happy to see newer snapshots. I am not and I doubt Espie is as he is pretty busy with KDE 4 and other things. Go ahead and send it to the list if you come up with anything usable. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: gstreamer-plugins-base
On Sunday 27 January 2008 13:09:40 [EMAIL PROTECTED] wrote: > A while back after a snapshot update I noted that gcompris would make > horrid squealing noises upon launch and thus be unusable if run with > sound enabled. > > As of gcompris 8.4 it uses gstreamer for sound. If I launch > /usr/local/bin/gst-visualise-0.10 (part of gstreamer-plugins-base) > with no arguments, the machine begins its squealing in the exact same > manner. > > The gcompris website ( http://gcompris.net/-News- ) says the issue is > fixed in gstreamer-plugins-base 0.10.15 and higher (their workaround > didn't work for me). -current has 0.10.12. > > Is it acceptable for me to post an update to just gstreamer-plugins-base > or should all of gstreamer be updated, or should I just try to backport > that specific fix? > > Thanks. A full update of gstreamer would be very useful. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
UPDATE: KTorrent 2.2.5
Here is an update to KTorrent 2.2.5.
Index: Makefile
===
RCS file: /cvs/ports/net/ktorrent/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile27 Dec 2007 10:24:51 - 1.6
+++ Makefile28 Jan 2008 19:21:46 -
@@ -4,9 +4,10 @@ SHARED_ONLY= Yes
COMMENT= BitTorrent client for KDE
-VERSION= 2.2.4
+VERSION= 2.2.5
DISTNAME= ktorrent-${VERSION}
CATEGORIES=net x11 x11/kde
+EXTRACT_SUFX= .tar.bz2
MASTER_SITES= ${HOMEPAGE}downloads/${VERSION}/
@@ -25,6 +26,8 @@ WANTLIB= art_lgpl_2 jpeg ICE SM X11 Xau
RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils
LIB_DEPENDS=
kdecore.>=6,DCOP,kdefx,kdeprint,kdesu,kparts,kdeui,khtml,kio,kjs,kutils,kwalletclient::x11/kde/libs3
\
gmp.>=4.::devel/gmp
+
+SUBST_VARS+= VERSION
MODULES= x11/kde devel/gettext
Index: distinfo
===
RCS file: /cvs/ports/net/ktorrent/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo27 Dec 2007 10:24:51 - 1.2
+++ distinfo28 Jan 2008 14:17:23 -
@@ -1,5 +1,5 @@
-MD5 (ktorrent-2.2.4.tar.gz) = UbqprYRikK6a1JK2pmRwmg==
-RMD160 (ktorrent-2.2.4.tar.gz) = X15kVsGU8yfUx/zzyxGr7Bl/Wms=
-SHA1 (ktorrent-2.2.4.tar.gz) = 8EUZhNLpycdvhM42DmQn7OzClTE=
-SHA256 (ktorrent-2.2.4.tar.gz) = WnWplVEktfAsOHMYc3oOhyATLZOZgFVxSMJoaRQ1Tp4=
-SIZE (ktorrent-2.2.4.tar.gz) = 3843873
+MD5 (ktorrent-2.2.5.tar.bz2) = Bw6EESuN0UbBrUA8VAPwdg==
+RMD160 (ktorrent-2.2.5.tar.bz2) = L7B3CARbrKNAV0hJyzFRNsu3w4o=
+SHA1 (ktorrent-2.2.5.tar.bz2) = xHvm/eScS2C6dJq8yvaGNF5ZPiA=
+SHA256 (ktorrent-2.2.5.tar.bz2) = fU4FsDrGtY/ny6RSJ2w+A45StBWCjlhGIk978q6ja+Y=
+SIZE (ktorrent-2.2.5.tar.bz2) = 2593138
Index: patches/patch-libktorrent_net_socket_cpp
===
RCS file: /cvs/ports/net/ktorrent/patches/patch-libktorrent_net_socket_cpp,v
retrieving revision 1.2
diff -u -p -r1.2 patch-libktorrent_net_socket_cpp
--- patches/patch-libktorrent_net_socket_cpp27 Dec 2007 10:24:51 -
1.2
+++ patches/patch-libktorrent_net_socket_cpp28 Jan 2008 17:21:17 -
@@ -1,16 +1,7 @@
$OpenBSD: patch-libktorrent_net_socket_cpp,v 1.2 2007/12/27 10:24:51 sthen Exp
$
libktorrent/net/socket.cpp.origTue Nov 13 14:36:49 2007
-+++ libktorrent/net/socket.cpp Fri Nov 16 04:42:46 2007
-@@ -38,7 +38,7 @@
- #include
- #endif
-
--#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) &&
__FreeBSD_version < 600020) || defined (Q_OS_SOLARIS) || defined(Q_OS_NETBSD)
-+#if defined(Q_OS_MACX) || defined(Q_OS_DARWIN) || (defined(Q_OS_FREEBSD) &&
__FreeBSD_version < 600020) || defined (Q_OS_SOLARIS) || defined(Q_OS_NETBSD)
|| defined(Q_OS_OPENBSD)
- #define MSG_NOSIGNAL 0
- #endif
-
-@@ -260,7 +260,7 @@ namespace net
+--- libktorrent/net/socket.cpp.origSun Jan 27 07:05:46 2008
libktorrent/net/socket.cpp Mon Jan 28 12:19:27 2008
+@@ -264,7 +264,7 @@ namespace net
bool Socket::setTOS(unsigned char type_of_service)
{
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/ktorrent/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 27 Dec 2007 10:24:51 - 1.3
+++ pkg/PLIST 28 Jan 2008 19:22:04 -
@@ -26,7 +26,7 @@ ${KDE}/ktupnpplugin.la
${KDE}/ktupnpplugin.so
${KDE}/ktwebinterfaceplugin.la
${KDE}/ktwebinterfaceplugin.so
-lib/libktorrent-2.2.4.so
+lib/libktorrent-${VERSION}.so
lib/libktorrent.la
lib/libktorrent.so
share/applications/kde/ktorrent.desktop
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
UPDATE: Xine-lib 1.1.10
Here is an update to xine-lib 1.1.10.
This fixes a security issue.
- Buffer overflow which allows a remote attacker to execute arbitrary
code or crash the client program via a crafted ASF header.
(Related to CVE-2006-1664)
Index: Makefile
===
RCS file: /cvs/ports/multimedia/xine-lib/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile15 Jan 2008 00:36:46 - 1.23
+++ Makefile29 Jan 2008 17:11:27 -
@@ -4,7 +4,7 @@ COMMENT-main= multimedia decoding libra
COMMENT-esd= esound audio output module for xine-lib
COMMENT-arts= artsd audio output muodule for xine-lib
-V= 1.1.9.1
+V= 1.1.10
DISTNAME= xine-lib-${V}
PKGNAME-main= xine-lib-${V}
PKGNAME-esd= xine-lib-esd-${V}
@@ -29,7 +29,7 @@ WANTLIB= expat fontconfig freetype m z
WANTLIB-main= ${WANTLIB} X11 Xau Xdmcp Xext Xinerama Xrandr \
Xrender Xv faac jpeg lcms mp3lame usbhid x264
WANTLIB-esd= ${WANTLIB}
-WANTLIB-arts= ${WANTLIB} pcre stdc++ glib-2.0 \
+WANTLIB-arts= ${WANTLIB} pcre pthread stdc++ glib-2.0 \
gmodule-2.0 gthread-2.0
.if ${MACHINE_ARCH} == "i386"
Index: distinfo
===
RCS file: /cvs/ports/multimedia/xine-lib/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo15 Jan 2008 00:36:46 - 1.6
+++ distinfo29 Jan 2008 16:39:23 -
@@ -1,5 +1,5 @@
-MD5 (xine-lib-1.1.9.1.tar.bz2) = PKHkM4bAEpPdw66vi1+ATw==
-RMD160 (xine-lib-1.1.9.1.tar.bz2) = k+LocALrA4uLagFQRR1a43GSxZ0=
-SHA1 (xine-lib-1.1.9.1.tar.bz2) = nOsytytuqo5qsD2wbDqkoUpuaMM=
-SHA256 (xine-lib-1.1.9.1.tar.bz2) =
AkmG339a2XPL7RjFCiq7MMqIIgs8trKwnsLbm5SY5Oc=
-SIZE (xine-lib-1.1.9.1.tar.bz2) = 7392199
+MD5 (xine-lib-1.1.10.tar.bz2) = VefSsfSpBS24RyRFcqTstQ==
+RMD160 (xine-lib-1.1.10.tar.bz2) = TqWNvdEDNkYUr9RdghXlN3L+YlE=
+SHA1 (xine-lib-1.1.10.tar.bz2) = obPJ0apwf0NUQDQBkCppZ8u96NE=
+SHA256 (xine-lib-1.1.10.tar.bz2) = +qM3gAQ2opwc8r6CajARPXHaLGqqwbP6VKIh93+jO7o=
+SIZE (xine-lib-1.1.10.tar.bz2) = 7392937
Index: patches/patch-configure
===
RCS file: /cvs/ports/multimedia/xine-lib/patches/patch-configure,v
retrieving revision 1.11
diff -u -p -r1.11 patch-configure
--- patches/patch-configure 15 Jan 2008 00:36:46 - 1.11
+++ patches/patch-configure 29 Jan 2008 16:48:44 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.11 2008/01/15 00:36:46 jakemsr Exp $
configure.orig Fri Jan 11 10:12:24 2008
-+++ configure Sat Jan 12 21:01:52 2008
-@@ -24490,6 +24490,9 @@ _ACEOF
+--- configure.orig Sat Jan 26 16:05:16 2008
configure Tue Jan 29 11:48:36 2008
+@@ -24494,6 +24494,9 @@ _ACEOF
fi
done
@@ -11,7 +11,7 @@ $OpenBSD: patch-configure,v 1.11 2008/01
{ echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5
-@@ -30599,13 +30602,13 @@ t q
+@@ -30603,13 +30606,13 @@ t q
b
:q
q"
@@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.11 2008/01
cat >>confdefs.h <<_ACEOF
#define LIBXV_SO "${x_lib_location:-libXv.so}"
-@@ -37494,7 +37497,7 @@ fi
+@@ -37498,7 +37501,7 @@ fi
LIBFLAC_LIBS="-L$prefix/$XINE_LIBNAME"
fi
@@ -36,7 +36,7 @@ $OpenBSD: patch-configure,v 1.11 2008/01
if test "x$libFLAC_includes" != "x" ; then
LIBFLAC_CFLAGS="-I$libFLAC_includes"
-@@ -37745,7 +37748,7 @@ elif test "x$external_a52dec" = "xyes"; then
+@@ -37749,7 +37752,7 @@ elif test "x$external_a52dec" = "xyes"; then
have_a52="yes"
@@ -45,7 +45,7 @@ $OpenBSD: patch-configure,v 1.11 2008/01
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_header" >&5
-@@ -37884,7 +37887,7 @@ if test $ac_cv_lib_a52_a52_init = yes; then
+@@ -37888,7 +37891,7 @@ if test $ac_cv_lib_a52_a52_init = yes; then
#define HAVE_LIBA52 1
_ACEOF
@@ -54,7 +54,7 @@ $OpenBSD: patch-configure,v 1.11 2008/01
else
have_a52="no"
-@@ -38462,7 +38465,7 @@ if test "${ac_cv_lib_mng_mng_initialize+set}" = set; t
+@@ -38466,7 +38469,7 @@ if test "${ac_cv_lib_mng_mng_initialize+set}" = set; t
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -63,7 +63,7 @@ $OpenBSD: patch-configure,v 1.11 2008/01
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -38645,7 +38648,7 @@ echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; }
+@@ -38649,7 +38652,7 @@ echo "${ECHO_T}$ac_cv_header_libmng_h" >&6; }
fi
if test $ac_cv_header_libmng_h = yes; then
have_libmng=yes
@@ -72,7 +72,7 @@ $OpenBSD: patch-configure,v 1.11 2008/01
else
{ echo "$as_me:$LINENO: result: *** All libmng dependent parts will be
disabled ***" >&5
echo "${ECHO_T}*** All libmng dependent parts will be disabled ***" >&6;
Re: UPDATE: KTorrent 2.2.5
On Tuesday 29 January 2008 16:29:12 Stuart Henderson wrote: > On 2008/01/28 20:20, Brad wrote: > > Here is an update to KTorrent 2.2.5. > > this version adds some statfs() alternatives to the statvfs() > in libktorrent/util/fileops.cpp to fix the free space display. Ok with me. > transfer speeds are still rather incomprehensible (running > with apm -c probably doesn't help me there) but it works ok. I don't have this problem but even before I applied the previous "fix" I didn't have the strange download/upload speeds all the time. > good call on the SUBST_VARS. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
UPDATE: MySQL 5.0.51a - security update
Here is an update to MySQL 5.0.51a which fixes two security issues.
Index: Makefile
===
RCS file: /cvs/ports/databases/mysql/Makefile,v
retrieving revision 1.138
diff -u -p -r1.138 Makefile
--- Makefile18 Jan 2008 20:34:14 - 1.138
+++ Makefile10 Feb 2008 02:59:55 -
@@ -4,7 +4,7 @@ COMMENT-main= multithreaded SQL database
COMMENT-server=multithreaded SQL database (server)
COMMENT-tests= multithreaded SQL database (regression test suite)
-VERSION= 5.0.51
+VERSION= 5.0.51a
DISTNAME= mysql-${VERSION}
PKGNAME-main= mysql-client-${VERSION}
PKGNAME-server=mysql-server-${VERSION}
Index: distinfo
===
RCS file: /cvs/ports/databases/mysql/distinfo,v
retrieving revision 1.32
diff -u -p -r1.32 distinfo
--- distinfo18 Jan 2008 20:34:14 - 1.32
+++ distinfo10 Feb 2008 03:00:58 -
@@ -1,5 +1,5 @@
-MD5 (mysql-5.0.51.tar.gz) = iMOcjLd4EP67g7fuYlNk1w==
-RMD160 (mysql-5.0.51.tar.gz) = 4UuqHEDLOF+mT8cjVducpYpr4vk=
-SHA1 (mysql-5.0.51.tar.gz) = qaJT6oQulz329HXATax3Ui3g3qc=
-SHA256 (mysql-5.0.51.tar.gz) = tYQHToAyii5lUV7z35R6gSmeMUCnuop+n43PTpLVc2s=
-SIZE (mysql-5.0.51.tar.gz) = 27045586
+MD5 (mysql-5.0.51a.tar.gz) = qD29u5Emfa9z0il6nCg90Q==
+RMD160 (mysql-5.0.51a.tar.gz) = hpdUFQ6kLy+6029365oOe7bjiSs=
+SHA1 (mysql-5.0.51a.tar.gz) = rcg7yubQT8zWNg3DqjfGSqpHmj0=
+SHA256 (mysql-5.0.51a.tar.gz) = WbBvapSEMMclR2DgvxbxRH7hTQFCBz9Y/S5owyczC2g=
+SIZE (mysql-5.0.51a.tar.gz) = 27588558
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: new: k3b
On Monday 18 February 2008 23:43:04 Antti Harri wrote: > On Mon, 4 Feb 2008, Jacob Meuser wrote: > > > anyway, new version with 'Load' changes attached, ok? seems people > > want this. > > I noticed the port is missing LIB_DEPENDS for FLAC++ lib. > > A diff against your tarball: > > --- Makefile.orig Tue Feb 19 06:39:18 2008 > +++ Makefile Tue Feb 19 06:36:43 2008 > @@ -46,6 +46,7 @@ > avcodec,avformat::graphics/ffmpeg \ > sndfile::audio/libsndfile \ > FLAC::audio/flac \ > + FLAC++::audio/flac \ > tag::audio/taglib \ > artsc::x11/kde/arts3 \ > > DCOP,kdecore,kdefx,kdesu,kdeui,kio,kparts,kwalletclient::x11/kde/libs3 FLAC++ should be added to the line above that. i.e. FLAC,FLAC++::audio/flac -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: SECURITY UPDATE: lighttpd
On Friday 29 February 2008 11:09:31 Jeffrey 'jf' Lim wrote: > On Fri, Feb 29, 2008 at 10:51 PM, Jasper Lievisse Adriaanse > <[EMAIL PROTECTED]> wrote: > > hi, > > > > here's the vendors patch to fix CVE-2008-0983 > > http://secunia.com/cve_reference/CVE-2008-0983/ > > > > ok to commit? > > > > sorry, but is there something wrong with this patch? I don't see how > all these extra lines should be there. This is 1.4.18, with only 1 > patch in ports, 'patch-doc_lighttpd_conf' right? huh? this comment makes no sense at all. > > > > Index: patches/patch-src_fdevent_solaris_devpoll_c > > === > > RCS file: patches/patch-src_fdevent_solaris_devpoll_c > > diff -N patches/patch-src_fdevent_solaris_devpoll_c > > --- /dev/null 1 Jan 1970 00:00:00 - > > +++ patches/patch-src_fdevent_solaris_devpoll_c 29 Feb 2008 14:49:12 - > > @@ -0,0 +1,12 @@ > > +$OpenBSD$ > > +--- src/fdevent_solaris_devpoll.c.orig Fri Feb 29 15:46:03 2008 > > src/fdevent_solaris_devpoll.c Fri Feb 29 15:46:25 2008 > > +@@ -67,7 +67,7 @@ static int fdevent_solaris_devpoll_poll(fdevents *ev, > > + int ret; > > + > > + dopoll.dp_timeout = timeout_ms; > > +- dopoll.dp_nfds = ev->maxfds; > > ++ dopoll.dp_nfds = ev->maxfds - 1; > > + dopoll.dp_fds = ev->devpollfds; > > + > > + ret = ioctl(ev->devpoll_fd, DP_POLL, &dopoll); > > > > As far as I know only 1 line changes in src/fdevent_solaris_devpoll.c > (and 3 lines are removed from src/server.c). Contrast this with > http://trac.lighttpd.net/trac/attachment/ticket/1562/Fix-372-and-1562.patch, > and the 1.4.18 source. > > -jf The patch provided by Jasper is exactly the same. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: diff for dovecot1.0.2->10.0.13
On Sunday 09 March 2008 13:51:36 Johnny Vestergaard wrote: > See attached file, updates 4.2 port of dovecot 1.0.2 to 10.0.13. A > security issue was fixed today in Dovecot stable: > http://www.dovecot.org/list/dovecot-news/2008-March/65.html I'm already very much aware of this. 4.2 ports are not maintained. Updates will be going into -current and 4.3 at the appropriate time. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: esound 2.38 revisited
On Tuesday 11 March 2008 16:57:20 Jacob Meuser wrote:
> On Tue, Mar 11, 2008 at 02:47:04PM +0100, Simon Bertrang wrote:
> > On Tue, Mar 11, 2008 at 11:57:52AM +, Mikolaj Kucharski wrote:
> > > On Tue, Mar 11, 2008 at 12:05:13AM +, Jacob Meuser wrote:
> > > > On Tue, Mar 11, 2008 at 02:22:52AM +0300, Vadim Jukov wrote:
> > > >
> > > > > Wow! But... What port version did you made diff from?
> > > >
> > > > oops. try this instead.
> > > ...
> > > > -PKGNAME= ${DISTNAME}p1v0
> > > ...
> > > > +PKGNAME= ${DISTNAME}
> > >
> > > Can we remove the ``v'' suffix when it was once added?
> > >
> >
> > No, otherwise the version would actually go backwards.
> >
> > If a package needs to go back to an older version than available, ``v''
> > takes precedene over version and patchlevel. It can never go back.
> >
> > For instance, the p5-DBD-SQLite package went from 1.12 -> 1.13 -> 1.12v0
> > and the following update to 1.14 had to be 1.14v0.
>
> so, for the rest of the life of these ports, we will always have to tack
> on v0?
>
> seems (much) less than ideal.
That makes no sense at all. It should be 1.12 -> 1.13 -> 1.12v0 -> 1.14.
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: esound 2.38 revisited
On Tuesday 11 March 2008 17:53:50 Jacob Meuser wrote: > On Tue, Mar 11, 2008 at 10:23:55PM +0100, Marc Espie wrote: > > On Tue, Mar 11, 2008 at 05:11:04PM -0400, Brad wrote: > > > On Tuesday 11 March 2008 16:57:20 Jacob Meuser wrote: > > > > > > so, for the rest of the life of these ports, we will always have to tack > > > > on v0? > > > > > > > > seems (much) less than ideal. > > > > > > That makes no sense at all. It should be 1.12 -> 1.13 -> 1.12v0 -> 1.14. > > > > There is no way around it. > > > > You cannot have sensible rules that will work that way. > > > > Instead of suggesting version numbers, try figuring out a scheme that works, > > and lets you order softare sensibly. There is no other way. > > > > v* is for when you have a break in the numbering. You cannot go back, ever. > > > > It's simple, and it's not such a big deal. > > so is p, but I _hate_ it when I change a port locally and up the p level, > and then pkg_add -u downgrades that package. > > there's gotta be room for improvement. ugh. that drives me crazy as well. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: OT: Asterisk Port chuckle
On Thursday 20 March 2008 14:49:02 Dave Mangot wrote: > I was reading a comparison on the SipX website of Asterisk (which > is in ports) vs. SipX. > > I thought OpenBSD users would get a good laugh as to one of the > reasons SipX says it's better. > > From: > http://sipx-wiki.calivia.com/index.php/Comparing_sipX_with_Asterisk > > Size of the Code Base: In spite of its younger age, the sipX code base > is about twice the number of lines of code as compared to Asterisk > (890,000 vs. 488,000). > > > All OpenBSD users know that having twice as many lines of code > automatically makes a better piece of software. ;) > > -Dave It does not take much to be better than a pile of shit like Asterisk. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: net/pidgin
On Monday 24 March 2008 15:10:08 [EMAIL PROTECTED] wrote: > On 22 March 2008 at 11:15, Mike Erdely <[EMAIL PROTECTED]> wrote: > > > On Sat, Mar 22, 2008 at 12:26:09PM +0100, Steven Mestdagh wrote: > > > please give this a try. seems to work ok on amd64 here. > > > > I tested it pretty thoroughly on i386 (msn, yahoo, jabber, gtalk, aim, > > irc, silc, icb) and a couple file transfers. > > > > It also builds on my macppc, alpha and sparc64. > > > > It's ok by me. > > I realize it has already gone in, but I noticed it will segfault for me > on i386 if I try to uncheck an account in the "manage accounts" window > while it's still connecting. Then file a PR with the project. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: mysql update error
On Thu, May 11, 2006 at 09:56:29PM +0200, Tomasz Pajor wrote: > I'm trying to upgrade my MySQL install and I'm getting this error: > > bash-3.1# env SUBPACKAGE="-server" make update > ===> Updating for mysql-server-5.0.21 > Upgrading from mysql-server-5.0.19 > New package mysql-server-5.0.21 contains potentially unsafe operations > +INSTALL script > Can't safely update to mysql-server-5.0.21 (use -F update to force it) > /usr/sbin/pkg_add: > /usr/ports/packages/i386/all/mysql-server-5.0.21.tgz:Fatal error > *** Error code 1 > > Stop in /usr/ports/databases/mysql (line 2045 of > /usr/ports/infrastructure/mk/bsd.port.mk). > > Can anyone help, thanks. > > -- > Tomasz Pajor > WebSolutions As it says... use the -F update option for pkg_add. This is necessary for any package which has an INSTALL script no matter what the script does. I believe in most cases the INSTALL scripts are fine, but we play it on the safe side for now.
Re: OpenBSD 3.9 MySQL 5.0.18 ports compile issues
On Thu, May 11, 2006 at 09:34:09AM -0700, Kevin wrote: > On 5/2/06, Jolan Luff <[EMAIL PROTECTED]> wrote: > >On Tue, May 02, 2006 at 03:17:15PM -0700, Kevin wrote: > >> Hello all, > >> > >> Just reloaded two of our Alpha servers to upgrade them to 3.9, and I'm > >> having issues with MySQL not compiling from ports. > >> > >> Before I go filing bug reports and such I did the requisite searching > >> to no avail. Am I the only one seeing the following behavior? > >> > >> as root: > >> # cd /usr/ports/databases/mysql > >> # make install > >> > >> It chugs along for a bit like normal then bails with an apparent gmake > >> error. > > > >Actually, it's an ICE: > > > >sql_table.cc:2507: Internal compiler error in `gen_reload_inhi', at > >insn-emit.c:5550 > > > >gcc2 on alpha is known to have problems. You can try building with > >different optimization levels like so: > > > >env CFLAGS="-Os" make install > > > >and then try -O1, -O0, etc. If that doesn't work then someone will have > >to make the mysql port use gcc3 from ports on alpha and see if that > >fixes it. > > > > Hi Jolan et al, > > Thanks for the reply--sorry for the delay. I was out of town for a few > days and wanted to give this its due effort. > > So I've tried a variety of the above combinations to no avail. :-( > > Same story. > > FWIW: I just glanced at the ftp mirrors, and there are only two > pre-compiled php5 packages for Alpha on 3.9 (core and pear), so this > seems to be affecting more than just mysql (i.e. no php5-pgsql, > php5-curl, etc...) > > If it's of any use, I can make one of my alpha machines available > remotely to any OBSD dev. > > > Anyone have any other thoughts? > > > Thanks much, > Kevin I have a somewhat decent alpha now, so I'll take a look into this issue.
Re: pfstat 2.0
On Sun, May 14, 2006 at 04:27:31PM +0200, Matthias Kilian wrote:
> On Sun, May 14, 2006 at 12:37:15PM +0200, Daniel Hartmeier wrote:
> > If someone with ports-foo has any suggestions about how to split pfstatd
> > into a separate package (so a package containing only pfstatd could be
> > installed on firewalls without any dependancies), please speak up ;)
>
> Patch against your patch:
>
> diff -rNu ../pfstat.daniel/Makefile ./Makefile
> --- ../pfstat.daniel/Makefile Sun May 14 16:06:44 2006
> +++ ./MakefileSun May 14 16:21:34 2006
> @@ -1,9 +1,12 @@
> # $OpenBSD: Makefile,v 1.11 2005/10/24 05:09:59 fgsch Exp $
>
> COMMENT= "packet filter statistics visualization"
> +COMMENT-daemon= "pfstat daemon"
>
> -DISTNAME=pfstat-2.0
> -PKGNAME= ${DISTNAME}
> +V= 2.0
> +DISTNAME=pfstat-${V}
> +PKGNAME= pfstat-${V}
> +PKGNAME-daemon= pfstat-daemon-${V}
How about making the PKGNAME for the daemon be pfstatd-${V}
Otherwise the rest looks fine to me.
> CATEGORIES= net
> MASTER_SITES=http://www.benzedrine.cx/
>
> @@ -15,11 +18,21 @@
> PERMIT_PACKAGE_FTP= Yes
> PERMIT_DISTFILES_CDROM= Yes
> PERMIT_DISTFILES_FTP=Yes
> -WANTLIB= c jpeg m png z
>
> +MULTI_PACKAGES= -daemon
> +SUBPACKAGE?=
> +
> +WANTLIB= c
> +
> +.if defined(PACKAGING)
> +. if ${SUBPACKAGE} != "-daemon"
> +WANTLIB+=jpeg m png z
> +
> MODULES= converters/libiconv
>
> LIB_DEPENDS= gd.18::graphics/gd
> +. endif
> +.endif
>
> do-install:
> ${INSTALL_PROGRAM} ${WRKSRC}/pfstat ${PREFIX}/bin
> diff -rNu ../pfstat.daniel/pkg/DESCR-daemon ./pkg/DESCR-daemon
> --- ../pfstat.daniel/pkg/DESCR-daemon Thu Jan 1 01:00:00 1970
> +++ ./pkg/DESCR-daemonSun May 14 16:16:57 2006
> @@ -0,0 +1 @@
> +pfstatd is a daemon for remote access to pf statistics using pfstat.
> diff -rNu ../pfstat.daniel/pkg/PLIST ./pkg/PLIST
> --- ../pfstat.daniel/pkg/PLISTSun May 14 16:06:44 2006
> +++ ./pkg/PLIST Sun May 14 16:15:57 2006
> @@ -1,5 +1,3 @@
> @comment $OpenBSD: PLIST,v 1.2 2004/09/15 18:17:44 espie Exp $
> bin/pfstat
> -bin/pfstatd
> @man man/man8/pfstat.8
> [EMAIL PROTECTED] man/man8/pfstatd.8
> diff -rNu ../pfstat.daniel/pkg/PLIST-daemon ./pkg/PLIST-daemon
> --- ../pfstat.daniel/pkg/PLIST-daemon Thu Jan 1 01:00:00 1970
> +++ ./pkg/PLIST-daemonSun May 14 16:16:14 2006
> @@ -0,0 +1,3 @@
> [EMAIL PROTECTED] $OpenBSD$
> +bin/pfstatd
> [EMAIL PROTECTED] man/man8/pfstatd.8
>
UPDATE: glib2, pango and gtk+2
Here are updates for the glib2, pango and gtk+2 ports. glib2 2.8.4 -> 2.10.2 pango 1.10.2 -> 1.12.1 gtk+2 2.6.10 -> 2.8.17 http://comstyle.com/gtk+2/ I have a good number of Gtk+2 apps running here without any issues so far. Please try out these updated libraries and provide me with any feedback, whether it is good or bad.
Re: UPDATE: glib2, pango and gtk+2
On Thu, May 18, 2006 at 12:49:52PM +0200, Bernd Ahlers wrote: > Brad [Sun, May 14, 2006 at 03:07:38PM -0400] wrote: > >Here are updates for the glib2, pango and gtk+2 ports. > > > >glib2 2.8.4 -> 2.10.2 > >pango 1.10.2 -> 1.12.1 > >gtk+2 2.6.10 -> 2.8.17 > > > >http://comstyle.com/gtk+2/ > > > >I have a good number of Gtk+2 apps running here without any issues > >so far. Please try out these updated libraries and provide me with > >any feedback, whether it is good or bad. > > > Are all the 8bpp and PseudoColor problems fixed with the latest > version of cairo? > > This update will cause *a lot* of WANTLIB changes in other ports, so we > have to be sure that the issues are gone. Otherwise it's just a waste > of time and motivation. (Ask steven@ and wilfried@, they did most of > the WANTLIB changes after the gtk+2 backout...) > > Bernd If I was sure, then I would have just commited it. So, again, please test the update.
Gaim 2.0.0beta3
To anyone wanting to try out Gaim 2.0.0beta3, here is a updated patch to update the -current port. This is derived from the initial patch provided by Aleksander Piotrowski but with a few small changes and the addition of non-blocking SSL support to the OpenBSD OpenSSL plug-in. This fixes gaim's SSL support, allowing MSN and Jabber with SSL to function. http://comstyle.com/gaim.diff
Re: More info on MySQL 5.0 on OpenBSD 3.9 Alpha
Actually that was me trying to get it working with gcc 2.95, that patch was necessary to allow MySQL 5.0.18 to at least compile but as you had noticed it did not actually run properly. I updated to MySQL 5.0.21 which was commited to the 3.9 -stable branch and noticed that the patch no longer seems to be required to allow it to compile, though ending with the same result of MySQL not working. I was also playing around with gcc 3.3.6 on your system, but nothing I did resulted in a working binary. :( On Tue, May 23, 2006 at 11:22:49AM -0700, Kevin wrote: > Hello all, > > With a patch (see below) kindly provided by brad@ we were able to > get MySQL 5.x to build from ports on an Alphaserver and not bail with > internal gcc compiler errors; however, when a: > > # pkg_add mysql-server-5.0.xx.tgz > > is run MySQL reliably core dumps every time as it's nearing completion > of the package installation with this error: > > ### > mysql-server-5.0.18: complete > pid 16934 (mysqld): unaligned access: va=0x1205602a7 pc=0x120367bb4 > ra=0x120367d0c op=ldl > Bus error (core dumped) > ### > > > At this point, it's checkmate, as creating the stock tables manually > (and/or starting MySQL manually) doesn't work and results in the same > core dump. > > Anyone else have any thoughts? > > > Here's Brad's patch: > ### > gcc-patch-sql-Makefile_in > ### > $OpenBSD$ > --- sql/Makefile.in.origFri May 12 16:00:08 2006 > +++ sql/Makefile.in Fri May 12 16:00:46 2006 > @@ -1261,6 +1261,9 @@ lex_hash.h: gen_lex_hash$(EXEEXT) > udf_example.so:udf_example.cc >$(CXXCOMPILE) -shared -o $@ $< > > +sql_table.o: sql_table.cc > + $(CXXCOMPILE) -O0 -c -o $@ $< > + > # Don't update the files from bitkeeper > %::SCCS/s.% > # Tell versions [3.59,3.63) of GNU make to not export all variables. > > > As always: thanks, especially to Brad for spending some time trying to > get things going for me. > Kevin > > > > > -- > http://www.ebiinc.com : > Background Screening from EBI > National & International Background Checks
Re: More info on MySQL 5.0 on OpenBSD 3.9 Alpha
I don't believe this is a OpenBSD issue at all. This seems like an issue with MySQL. Rolling back to 3.8 might work because you are also rolling back to MySQL 4. I believe the issue is with MySQL 5. I would attempt to roll back to MySQL 4.0.27 from 3.8, run that on 3.9, see how that fares in comparison to version 5. On Tue, May 23, 2006 at 08:33:35PM -0700, Kevin wrote: > Yeah--we tried much of the same stuff, too... different gcc > versions... going to 5.0.21 on MySQL... different compiler flags... > everything within our area of knowledge for sure. :-( > > At this point, it seems the best option is likely to roll things back > to 3.8 and (perhaps) an older version of MySQL unless anyone has any > other ideas or what-have-you. > > In case it would be useful for any OBSD devs, I can make two machines > (including an Alpha 833) available for anyone to use for > development/testing, etc. for trying to get this fixed. It seems this > affects other ports from being built (like certain php ones for > instance), so it may be a more widespread fix than just MySQL. > > There's *nothing* else on the machines right now, so there's nothing > whatsoever to be damaged. > > Thanks all, > Kevin > > > > On 5/23/06, Brad <[EMAIL PROTECTED]> wrote: > >Actually that was me trying to get it working with gcc 2.95, that patch > >was necessary to allow MySQL 5.0.18 to at least compile but as you had > >noticed it did not actually run properly. I updated to MySQL 5.0.21 which > >was commited to the 3.9 -stable branch and noticed that the patch no > >longer seems to be required to allow it to compile, though ending with > >the same result of MySQL not working. I was also playing around with > >gcc 3.3.6 on your system, but nothing I did resulted in a working > >binary. :( > > > > > >On Tue, May 23, 2006 at 11:22:49AM -0700, Kevin wrote: > >> Hello all, > >> > >> With a patch (see below) kindly provided by brad@ we were able to > >> get MySQL 5.x to build from ports on an Alphaserver and not bail with > >> internal gcc compiler errors; however, when a: > >> > >> # pkg_add mysql-server-5.0.xx.tgz > >> > >> is run MySQL reliably core dumps every time as it's nearing completion > >> of the package installation with this error: > >> > >> ### > >> mysql-server-5.0.18: complete > >> pid 16934 (mysqld): unaligned access: va=0x1205602a7 pc=0x120367bb4 > >> ra=0x120367d0c op=ldl > >> Bus error (core dumped) > >> ### > >> > >> > >> At this point, it's checkmate, as creating the stock tables manually > >> (and/or starting MySQL manually) doesn't work and results in the same > >> core dump. > >> > >> Anyone else have any thoughts? > >> > >> > >> Here's Brad's patch: > >> ### > >> gcc-patch-sql-Makefile_in > >> ### > >> $OpenBSD$ > >> --- sql/Makefile.in.origFri May 12 16:00:08 2006 > >> +++ sql/Makefile.in Fri May 12 16:00:46 2006 > >> @@ -1261,6 +1261,9 @@ lex_hash.h: gen_lex_hash$(EXEEXT) > >> udf_example.so:udf_example.cc > >>$(CXXCOMPILE) -shared -o $@ $< > >> > >> +sql_table.o: sql_table.cc > >> + $(CXXCOMPILE) -O0 -c -o $@ $< > >> + > >> # Don't update the files from bitkeeper > >> %::SCCS/s.% > >> # Tell versions [3.59,3.63) of GNU make to not export all variables. > >> > >> > >> As always: thanks, especially to Brad for spending some time trying to > >> get things going for me. > >> Kevin > >> > >> > >> > >> > >> -- > >> http://www.ebiinc.com : > >> Background Screening from EBI > >> National & International Background Checks
UPDATE: glib2 and gtk+2
Here are minor bug fix updates to the glib2 and gtk+2 ports. Please take
these updated ports for a spin and let me know how it goes. Here are the
release notes if you would like to know what has changed with the
new versions.
glib2
http://mail.gnome.org/archives/gtk-devel-list/2006-May/msg00277.html
gtk+2
http://mail.gnome.org/archives/gtk-devel-list/2006-May/msg00278.html
Index: Makefile
===
RCS file: /cvs/ports/devel/glib2/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile22 May 2006 01:39:36 - 1.25
+++ Makefile29 May 2006 16:46:07 -
@@ -3,7 +3,7 @@
COMMENT= "general-purpose utility library"
COMMENT-docs= "glib2 documentation"
-VERSION= 2.10.2
+VERSION= 2.10.3
DISTNAME= glib-${VERSION}
PKGNAME= glib2-${VERSION}
PKGNAME-docs= glib2-docs-${VERSION}
@@ -11,10 +11,10 @@ CATEGORIES= devel
HOMEPAGE= http://www.gtk.org
-SHARED_LIBS= glib-2.01000.2 \
- gmodule-2.0 1000.2 \
- gobject-2.0 1000.2 \
- gthread-2.0 1000.2
+SHARED_LIBS= glib-2.01000.3 \
+ gmodule-2.0 1000.3 \
+ gobject-2.0 1000.3 \
+ gthread-2.0 1000.3
# LGPL
PERMIT_PACKAGE_CDROM= Yes
Index: distinfo
===
RCS file: /cvs/ports/devel/glib2/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo22 May 2006 01:39:36 - 1.16
+++ distinfo29 May 2006 16:46:07 -
@@ -1,4 +1,4 @@
-MD5 (glib-2.10.2.tar.bz2) = 718961161ee1692c216a2d542196a04a
-RMD160 (glib-2.10.2.tar.bz2) = bf2586343e2ad08052f8eba3541104dfd97a725e
-SHA1 (glib-2.10.2.tar.bz2) = 14d055725a4fa347bc4c11d6f52ec5268da2454f
-SIZE (glib-2.10.2.tar.bz2) = 2784594
+MD5 (glib-2.10.3.tar.bz2) = 87206e721c12d185d17dd9ecd7e30369
+RMD160 (glib-2.10.3.tar.bz2) = da56e238f4f6e9c6e7c08d4e53f75128b5178047
+SHA1 (glib-2.10.3.tar.bz2) = bba1dea73c4426f6a130c82e0b7a07b78dfc73ce
+SIZE (glib-2.10.3.tar.bz2) = 2774011
Index: Makefile
===
RCS file: /cvs/ports/x11/gtk+2/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- Makefile22 May 2006 02:16:40 - 1.36
+++ Makefile29 May 2006 17:04:53 -
@@ -5,18 +5,18 @@ NOT_FOR_ARCHS=${NO_SHARED_ARCHS}
COMMENT= "multi-platform graphical toolkit"
COMMENT-docs= "gtk+-2 documentation"
-VERSION= 2.8.17
+VERSION= 2.8.18
DISTNAME= gtk+-${VERSION}
-PKGNAME= gtk+2-${VERSION}p1
+PKGNAME= gtk+2-${VERSION}
PKGNAME-docs= gtk+2-docs-${VERSION}
CATEGORIES=x11 devel
HOMEPAGE= http://www.gtk.org
-SHARED_LIBS= gdk-x11-2.0 802.0 \
- gdk_pixbuf-2.0 802.0 \
- gdk_pixbuf_xlib-2.0 802.0 \
- gtk-x11-2.0 802.0
+SHARED_LIBS= gdk-x11-2.0 802.1 \
+ gdk_pixbuf-2.0 802.1 \
+ gdk_pixbuf_xlib-2.0 802.1 \
+ gtk-x11-2.0 802.1
# LGPL
PERMIT_PACKAGE_CDROM= Yes
Index: distinfo
===
RCS file: /cvs/ports/x11/gtk+2/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo22 May 2006 01:49:07 - 1.22
+++ distinfo29 May 2006 17:04:53 -
@@ -1,4 +1,4 @@
-MD5 (gtk+-2.8.17.tar.bz2) = 6d2deb63a5444808d2aeb7dcfffaa2f4
-RMD160 (gtk+-2.8.17.tar.bz2) = ff4d34eef948cd98c81d852a111d716b9cead94f
-SHA1 (gtk+-2.8.17.tar.bz2) = a6c62ec016bc076a9938ba962f0dd4bcc1e74e16
-SIZE (gtk+-2.8.17.tar.bz2) = 12261085
+MD5 (gtk+-2.8.18.tar.bz2) = 0d27a026428732337676d47d22e5e23c
+RMD160 (gtk+-2.8.18.tar.bz2) = f9b41fc90e16158ccc87872f07dc4eb269903e84
+SHA1 (gtk+-2.8.18.tar.bz2) = e4f0231b943418d8bb17b3bf9d79aa902ab3eb13
+SIZE (gtk+-2.8.18.tar.bz2) = 12258449
UPDATE: pango, was Re: SECURITY UPDATE: mozilla-firefox-1.5.0.4
On Fri, Jun 02, 2006 at 01:33:34PM +0200, Sigfred H?versen wrote: > Bernd Ahlers wrote: > >Hey, > > > >attached is a security update to mozilla-firefox-1.5.0.4. > > When starting, I get multiple of the following in console: > > (firefox-bin:11397): Pango-WARNING **: File not found > Failed to load Pango module for id: 'BasicScriptEngineFc' > > Firefox exits when trying to download a file from a ftp site. The > exit happens when you press the OK button for saving the file. There > is no core file. > > Other browsing seems to work. This on amd64 current. > > /Sigfred Here is a update to pango 1.12.3.. The only thing interesting from the release notes is this.. * Increased robustness against broken pango.modules So please try this out if you happen to see similar problems as mentioned above. I'd like to know if this helps at all, atleast with the upgrade case. Ultimately the real problem is that pango.modules/pangox.aliases in /etc/pango need to be updated with copies from /usr/local/share/examples/pango. These files are not the ports typical @sample files and need to be handled a little differently. Any comments on how I should go about handling this with the port? Index: Makefile === RCS file: /cvs/ports/devel/pango/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- Makefile2006/05/22 01:41:52 1.17 +++ Makefile2006/06/01 12:43:27 @@ -2,12 +2,12 @@ COMMENT= "library for layout and rendering of text" -DISTNAME= pango-1.12.1 -SHARED_LIBS= pango-1.0 1200.1 \ - pangocairo-1.0 1200.1 \ - pangoft2-1.01200.1 \ - pangox-1.0 1200.1 \ - pangoxft-1.01200.1 +DISTNAME= pango-1.12.3 +SHARED_LIBS= pango-1.0 1200.3 \ + pangocairo-1.0 1200.3 \ + pangoft2-1.01200.3 \ + pangox-1.0 1200.3 \ + pangoxft-1.01200.3 CATEGORIES=devel x11 Index: distinfo === RCS file: /cvs/ports/devel/pango/distinfo,v retrieving revision 1.14 diff -u -p -r1.14 distinfo --- distinfo2006/05/22 01:41:52 1.14 +++ distinfo2006/06/01 12:43:27 @@ -1,4 +1,4 @@ -MD5 (pango-1.12.1.tar.bz2) = 10ddfbc43cf895639b77788ca637409c -RMD160 (pango-1.12.1.tar.bz2) = 9dc4da7e9ace4391e907602e55321443b144278b -SHA1 (pango-1.12.1.tar.bz2) = 26f3268eabeea8aa45b1286dc7af3149c8d544a1 -SIZE (pango-1.12.1.tar.bz2) = 1208619 +MD5 (pango-1.12.3.tar.bz2) = c8178e11a895166d86990bb2c38d831b +RMD160 (pango-1.12.3.tar.bz2) = 7692828276e9b5a54b0b8c32fa07d7db6ac45bed +SHA1 (pango-1.12.3.tar.bz2) = ad493c4560c0ffd9dcdb8a1724d5bff058ef112c +SIZE (pango-1.12.3.tar.bz2) = 1226579 Index: patches/patch-configure === RCS file: /cvs/ports/devel/pango/patches/patch-configure,v retrieving revision 1.10 diff -u -p -r1.10 patch-configure --- patches/patch-configure 2006/05/22 01:41:52 1.10 +++ patches/patch-configure 2006/06/01 12:43:27 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure,v 1.10 2006/05/22 01:41:52 brad Exp $ configure.orig Fri Apr 7 00:33:32 2006 -+++ configure Wed May 10 18:01:16 2006 -@@ -24033,7 +24033,7 @@ fi +--- configure.orig Fri May 26 16:43:16 2006 configure Thu Jun 1 06:39:08 2006 +@@ -23008,7 +23008,7 @@ fi if test "$pango_os_win32" != yes; then # libtool option to control which symbols are exported # right now, symbols starting with _ are not exported Index: pkg/PLIST === RCS file: /cvs/ports/devel/pango/pkg/PLIST,v retrieving revision 1.13 diff -u -p -r1.13 PLIST --- pkg/PLIST 2006/05/22 01:41:52 1.13 +++ pkg/PLIST 2006/06/01 12:43:27 @@ -113,6 +113,7 @@ share/gtk-doc/html/pango/pango-X-Fonts-a share/gtk-doc/html/pango/pango-Xft-Fonts-and-Rendering.html share/gtk-doc/html/pango/pango-querymodules.html share/gtk-doc/html/pango/pango.devhelp +share/gtk-doc/html/pango/pango.devhelp2 share/gtk-doc/html/pango/pango.html share/gtk-doc/html/pango/rendering.html share/gtk-doc/html/pango/right.png
Re: Question on -stable
On Sat, Jun 10, 2006 at 04:21:26AM +0400, Rakhesh Sasidharan wrote: > >http://www.openbsd.org/pkg-stable.html > > I assume that that list is not limited to just binary packages? Even > those available *only* in the ports are included? Since a package is built from a port then by looking at that list you can find out what ports have been updated.
Re: Question on -stable
On Sat, Jun 10, 2006 at 04:35:16AM +0400, Rakhesh Sasidharan wrote: > >> >http://www.openbsd.org/pkg-stable.html > >> > >> I assume that that list is not limited to just binary packages? Even > >> those available *only* in the ports are included? > > > >Since a package is built from a port then by looking at that list you > >can find out what ports have been updated. > > Except that some ports are not built into packages (an example I came > upon recently being win32-codecs) and so I wonder if those too are > mentioned in the pkg-stable.html list. There are *very few* ports that cannot be made into packages even for the FTP site, win32-codecs is one of those exceptions.
Re: FIX: graphics/cairo
On Sat, Jun 10, 2006 at 11:39:41AM +0200, Matthieu Herrb wrote: > Eric Faurot wrote: > >On 6/10/06, steven mestdagh <[EMAIL PROTECTED]> wrote: > > > >>well, we have tested this situation and the crash also happens with > >>gtk 2.6, so i think this is not related to cairo. > > > >I noticed a similar crash with emacs and ssh -X when trying to select > >a region with the mouse. > > > > Hi, > > I'm sorry not to be able to participate more in analysing/solving these > issues. But at least, does 'ssh -Y' vs 'ssh -X' make a difference ? > > I assume you all know about the trusted vs. untrusted clients problem: > most (if not all) Gtk+ applications are unable to run as untrusted > clients (from the XSecurity extension pov) and they don't even capture > the X error nicely to provide useful feedback to the user. > > What you're describing here just seems to be yet another instance of this. > -- > Matthieu I noticed this from the Gtk+ 2.9.2 release notes.. * Make GTK+ work as an untrused X client
[UPDATE] abiword
Here is a update to abiword 2.4.5. This is a maintenance
release with a lot of bug fixes. Please try this out.
http://www.abiword.com/changelogs/2.4.5.phtml
Index: Makefile
===
RCS file: /cvs/ports/editors/abiword/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- Makefile13 Jun 2006 13:22:36 - 1.54
+++ Makefile11 Jul 2006 07:24:07 -
@@ -2,10 +2,9 @@
COMMENT= "free cross-platform WYSIWYG word processor"
-VERSION= 2.4.4
+VERSION= 2.4.5
MAJORVER= ${VERSION:C/..$//}
DISTNAME= abiword-${VERSION}
-PKGNAME= ${DISTNAME}p0
CATEGORIES=editors
HOMEPAGE= http://www.abisource.com/
Index: distinfo
===
RCS file: /cvs/ports/editors/abiword/distinfo,v
retrieving revision 1.15
diff -u -p -r1.15 distinfo
--- distinfo19 Apr 2006 13:36:50 - 1.15
+++ distinfo11 Jul 2006 07:24:07 -
@@ -1,4 +1,4 @@
-MD5 (abiword-2.4.4.tar.gz) = 5a2710c2ed89608f30fa8dbed001719c
-RMD160 (abiword-2.4.4.tar.gz) = 122fb06bc19a209e05249c5bb6188ea55cfbea83
-SHA1 (abiword-2.4.4.tar.gz) = 37e66143d889adb9937137a243f7e29b9b643fab
-SIZE (abiword-2.4.4.tar.gz) = 30215680
+MD5 (abiword-2.4.5.tar.gz) = e05f15936535c4b737deaa721adf8d09
+RMD160 (abiword-2.4.5.tar.gz) = a64dec6f13de03ca34d4a41842d0a58e3c77d823
+SHA1 (abiword-2.4.5.tar.gz) = 958a7e1778b1379ebb0c4eebd14898ef591a8a16
+SIZE (abiword-2.4.5.tar.gz) = 30465183
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/abiword/pkg/PLIST,v
retrieving revision 1.17
diff -u -p -r1.17 PLIST
--- pkg/PLIST 19 Oct 2005 22:24:12 - 1.17
+++ pkg/PLIST 11 Jul 2006 07:24:07 -
@@ -75,6 +75,7 @@ share/AbiSuite-${MAJORVER}/AbiWord/strin
share/AbiSuite-${MAJORVER}/AbiWord/strings/ga-IE.strings
share/AbiSuite-${MAJORVER}/AbiWord/strings/gl-ES.strings
share/AbiSuite-${MAJORVER}/AbiWord/strings/he-IL.strings
+share/AbiSuite-${MAJORVER}/AbiWord/strings/hr-HR.strings
share/AbiSuite-${MAJORVER}/AbiWord/strings/hu-HU.strings
share/AbiSuite-${MAJORVER}/AbiWord/strings/id-ID.strings
share/AbiSuite-${MAJORVER}/AbiWord/strings/it-IT.strings
@@ -88,6 +89,7 @@ share/AbiSuite-${MAJORVER}/AbiWord/strin
share/AbiSuite-${MAJORVER}/AbiWord/strings/mk-MK.strings
share/AbiSuite-${MAJORVER}/AbiWord/strings/ms-MY.strings
share/AbiSuite-${MAJORVER}/AbiWord/strings/nb-NO.strings
+share/AbiSuite-${MAJORVER}/AbiWord/strings/ne-NP.strings
share/AbiSuite-${MAJORVER}/AbiWord/strings/nl-NL.strings
share/AbiSuite-${MAJORVER}/AbiWord/strings/nn-NO.strings
share/AbiSuite-${MAJORVER}/AbiWord/strings/pl-PL.strings
Re: [UPDATE] abiword
On Wed, Jul 12, 2006 at 10:35:25AM -0600, Chris Kuethe wrote: > On 7/12/06, steven mestdagh <[EMAIL PROTECTED]> wrote: > >I'm still seeing the error "Could not load the dictionary for the > >English (US) [en-US] language" soon after I start typing. > > > >when selecting edit/preferences, the following warning appears > >(abiword:28186): libglade-WARNING **: Could not load support for > >`gnome': File not found > > > >I did some light testing on amd64, it seems to be working reasonably ok. > > quoth ktrace: > 5859 AbiWord-2.4 NAMI "/home/ckuethe/.AbiSuite/dictionary/american.hash" > 5859 AbiWord-2.4 NAMI > "/usr/local/share/AbiSuite-2.4/dictionary/american.hash" > > A few symlinks did the trick. > # mkdir -p ~/.AbiSuite/dictionary > # rm -f ~/.AbiSuite/dictionary/*hash > # ln -s /usr/local/lib/ispell/*hash ~/.AbiSuite/dictionary/ To me that just seems so wrong. Abiword should be able to find the dictionaries in the default location, without any end-user interaction, unless of course the end-user wanted to override the default dictionaries.
Re: Anybody working on xine-lib?
On Sat, Jul 15, 2006 at 12:22:10PM -0400, Weldon Goree wrote: > Is there anything in the works for a port of xine-lib? I finally got the > thing to build and run (though VCD doesn't work and the runtime > CPU-detection is questionable, and frankly my solution for that was > pretty embarrassing). I don't know if there's a central porting effort I > should be talking to. If anybody is interested, the diff against 1.1.1 is at > http://asymptote.org/software/patches/xine-lib-1.1.1-obsd-2.patch > > Thanks, > Weldon Goree xine-lib has been in the -current ports tree for 3 months now.
[UPDATE] KOffice 1.5.2
Here is a update to KOffice 1.5.2. This is a maintenance
release with a lot of bug fixes. Please try this out.
http://www.koffice.org/announcements/changelog-1.5.2.php
Index: Makefile
===
RCS file: /cvs/ports/x11/kde/office3/Makefile,v
retrieving revision 1.34
diff -u -p -r1.34 Makefile
--- Makefile15 Jun 2006 09:13:45 - 1.34
+++ Makefile14 Jul 2006 17:48:17 -
@@ -4,17 +4,10 @@ COMMENT= "office suite for KDE"
CATEGORIES=x11 x11/kde productivity
VMEM_WARNING= Yes
-MASTER_SITES?= ${MASTER_SITE_KDE:[EMAIL
PROTECTED]@stable/koffice-1.5.1/src/@}
+MASTER_SITES?= ${MASTER_SITE_KDE:[EMAIL
PROTECTED]@stable/koffice-1.5.2/src/@}
-DISTNAME= koffice-1.5.1
-PATCHFILES=koffice-1.5.1-kexi-checkbox-data-saving.patch \
- koffice-1.5.1-kexi-form-plugins.patch
+DISTNAME= koffice-1.5.2
-do-distpatch:
- cd ${WRKDIST} && ${PATCH} ${PATCH_DIST_ARGS}
<${FULLDISTDIR}/koffice-1.5.1-kexi-checkbox-data-saving.patch
- cd ${WRKDIST}/kexi && ${PATCH} -z .bak.orig --forward --quiet -E -p0
<${FULLDISTDIR}/koffice-1.5.1-kexi-form-plugins.patch
-
-PKGNAME= koffice-1.5.1p2
#SHARED_LIBS= karbonbase 3.0 \
# kexipropertyeditor 1.0 \
# koscript3.0 \
@@ -94,7 +87,6 @@ LIB_DEPENDS= kdecore.4,DCOP,artskde,kdef
mysqlclient::databases/mysql \
ruby::lang/ruby
-
WANTLIB= ICE SM X11 Xext Xrender artsflow artsflow_idl audiofile bz2 c \
esd freetype glib-2.0.0.0 gmodule-2.0.0.0 gobject-2.0.0.0 \
gsf-1 gthread-2.0.0.0 iconv intl jasper jpeg kmedia2_idl lcms \
@@ -103,12 +95,11 @@ WANTLIB= ICE SM X11 Xext Xrender artsflo
xml2 xslt z Xt termcap Xi fontconfig crypto readline ssl \
IlmImf Half Imath Iex idn GL GLU
-
CONFIGURE_ARGS+= --with-pgsqlincdir=${LOCALBASE}/include/postgresql
LIB_DEPENDS+= pqxx::databases/libpqxx \
pq::databases/postgresql
-
USE_LIBTOOL=Yes
LIBTOOL_FLAGS=--tag=disable-static
+
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/kde/office3/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo4 Jun 2006 23:10:21 - 1.16
+++ distinfo14 Jul 2006 18:04:16 -
@@ -1,12 +1,4 @@
-MD5 (kde/koffice-1.5.1-kexi-checkbox-data-saving.patch) =
4a60d6e8b86c1b332def656aff1542dc
-MD5 (kde/koffice-1.5.1-kexi-form-plugins.patch) =
b536d822d58781f7acb653fb3d695f2e
-MD5 (kde/koffice-1.5.1.tar.bz2) = 50897bd5dfd4eba8a0d78a02003a6ec9
-RMD160 (kde/koffice-1.5.1-kexi-checkbox-data-saving.patch) =
24664c62122b9cf9a7ba302da5274ea9f192c697
-RMD160 (kde/koffice-1.5.1-kexi-form-plugins.patch) =
caa095960ba75335af6d0eace93cf38f04284f9c
-RMD160 (kde/koffice-1.5.1.tar.bz2) = 3fb67d50554c081104080d3230ba10f022f4a990
-SHA1 (kde/koffice-1.5.1-kexi-checkbox-data-saving.patch) =
1ab6985f4abc97d1346d927a3da404ea2421228d
-SHA1 (kde/koffice-1.5.1-kexi-form-plugins.patch) =
b4ec8c3251ff79a6ada7b70482a17ef0fd843a7d
-SHA1 (kde/koffice-1.5.1.tar.bz2) = d97c4f8eae3e22b7c119454f763a6ce88713edff
-SIZE (kde/koffice-1.5.1-kexi-checkbox-data-saving.patch) = 2488
-SIZE (kde/koffice-1.5.1-kexi-form-plugins.patch) = 2991
-SIZE (kde/koffice-1.5.1.tar.bz2) = 36010120
+MD5 (kde/koffice-1.5.2.tar.bz2) = cbe9deeb7c811a6bb5a954989b25c1f2
+RMD160 (kde/koffice-1.5.2.tar.bz2) = eb33d9e74adec0fc3409d38c2bfe84b5dfdd5546
+SHA1 (kde/koffice-1.5.2.tar.bz2) = e35bd08adfb3bf6acf195dd176147de1d6cf215a
+SIZE (kde/koffice-1.5.2.tar.bz2) = 35878218
Index: patches/patch-configure_in
===
RCS file: /cvs/ports/x11/kde/office3/patches/patch-configure_in,v
retrieving revision 1.8
diff -u -p -r1.8 patch-configure_in
--- patches/patch-configure_in 4 Jun 2006 23:10:21 - 1.8
+++ patches/patch-configure_in 14 Jul 2006 18:33:38 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-configure_in,v 1.8 2006/06/04 23:10:21 brad Exp $
configure.in.orig Wed May 17 06:01:02 2006
-+++ configure.in Sun Jun 4 13:22:58 2006
+--- configure.in.orig Sat Jul 8 22:30:54 2006
configure.in Fri Jul 14 14:29:53 2006
@@ -935,8 +935,8 @@ dnl *** Check that the paths given to co
AC_MSG_CHECKING([for PostgreSQL C API libraries])
@@ -32,7 +32,7 @@ $OpenBSD: patch-configure_in,v 1.8 2006/
ac_knewstuff_libraries="$knewstuff_libdir"
if test "$ac_knewstuff_includes" = NO || test "$ac_knewstuff_libraries" = NO;
then
-@@ -1220,6 +1220,8 @@ AC_SUBST(LCMS_LIBS)
+@@ -1221,6 +1221,8 @@ AC_SUBST(LCMS_LIBS)
# Check if the 1.14 version of lcms is detected
if test ! "$LCMS_LIBS" = ""
then
@@ -41,7 +41,7 @@ $OpenBSD: patch-configure_in,v 1.8 2006/
AC_LANG_SAVE
AC_L
Re: audio/akode is gone?
On Sun, Jul 16, 2006 at 11:36:39PM +, Louis Bertrand wrote: > audio/Makefile contains SUBDIR += akode but there is no > corresponding audio/akode. Oversight? I just cvs updated > but the mirror might not be quite up to date. > > Thanks > --Louis http://www.openbsd.org/cgi-bin/cvsweb/ports/audio/akode/ akode has been in the tree for 4 months now. double check the mirror. which mirror were you using?
Re: Request for updating the net/xorp entry
On Wed, Aug 02, 2006 at 07:59:27PM -0700, Pavlin Radoslavov wrote: > The net/xorp entry is way out of date. It is for XORP-1.1 and is 15 > months old. > Few months ago XORP-1.2 was released, but my email to the maintainer > suggesting that the entry should be updated (with my help if > necessary) was unanswered. > > XORP-1.3 was just released, so I'd like to ask if someone is willing > to update the entry. The code should compile out-of-the-box on > OpenBSD, with the notable exception that CFLAGS and CXXFLAGS should > be set to "-fno-stack-protector" before compilation. Why are you disabling ProPolice? > I don't have OpenBSD commit access, but I can help with generating > the appropriate files (or answering any XORP-related questions). > > Thanks, > Pavlin > > P.S. Please CC to me in your replies, because I am not on the ML. >
Re: Request for updating the net/xorp entry
On Thu, Aug 03, 2006 at 12:29:48PM -0700, Pavlin Radoslavov wrote: > Brad <[EMAIL PROTECTED]> wrote: > > > On Wed, Aug 02, 2006 at 07:59:27PM -0700, Pavlin Radoslavov wrote: > > > The net/xorp entry is way out of date. It is for XORP-1.1 and is 15 > > > months old. > > > Few months ago XORP-1.2 was released, but my email to the maintainer > > > suggesting that the entry should be updated (with my help if > > > necessary) was unanswered. > > > > > > XORP-1.3 was just released, so I'd like to ask if someone is willing > > > to update the entry. The code should compile out-of-the-box on > > > OpenBSD, with the notable exception that CFLAGS and CXXFLAGS should > > > be set to "-fno-stack-protector" before compilation. > > > > Why are you disabling ProPolice? > > The compiler has some propolice-related bug. See the following > thread for details: > http://www.monkey.org/openbsd/archive2/tech/200503/msg00011.html > > Last time I checked (OpenBSD-3.9), the bug was still there. > > Regards, > Pavlin Ok, I just wanted to make sure there was a legitimate reason for doing so.
Re: Fix error for Mplayer
On Tue, Aug 08, 2006 at 10:14:23PM +0200, Vizeli Pascal wrote:
> --- Chris Kuethe <[EMAIL PROTECTED]> schrieb:
>
> > stop sending updates and new ports. the ports tree
> > is locked. you
> > should be testing the packages, not changing them.
This isn't an update. There is a bug in the port that
needs to be fixed.
> I understand that.
> But:
>
> First I install faac und second I install
> mplayer. That give an error on mplayer port.
>
> This patch fix that.
> That isn't a update, it is a bugfix...
>
> greet,
> pascal
Since the AAC encoder is not built if FAAC is not installed,
then the better approach for now would be to disable the AAC
encoder. This will eliminate the possibility of the hidden
dependency and thus a broken package.
Index: Makefile
===
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.100
diff -u -p -r1.100 Makefile
--- Makefile2 Aug 2006 08:24:34 - 1.100
+++ Makefile9 Aug 2006 02:11:54 -
@@ -7,7 +7,7 @@ COMMENT="Movie player supporting MPEG,
DISTNAME= MPlayer-1.0pre8
DIST_SUBDIR= mplayer
-PKGNAME= ${DISTNAME:L}p0
+PKGNAME= ${DISTNAME:L}p1
CATEGORIES=x11
EXTRACT_SUFX= .tar.bz2
@@ -66,6 +66,7 @@ CONFIGURE_ARGS+=--disable-alsa \
--disable-smb \
--disable-external-tremor \
--disable-internal-tremor \
+ --disable-faac \
--enable-theora \
--enable-select \
--enable-vorbis \
Re: Bind 9 port?
On Wed, Aug 16, 2006 at 01:32:09PM -0600, W S wrote: > Greetings, > > I'm wondering if there is anyone working on a port of Bind 9.x? > > Thanks, > Will BIND 9 comes with OpenBSD, a port is unnecessary.
Re: Why was the Openoffice-port dropped?!
On Thu, Sep 07, 2006 at 07:06:00PM -0400, STeve Andre' wrote: > On Thursday 07 September 2006 18:50, Sebastian Rother wrote: > > Hi everybody, > > > > I`ve installed OpenBSD 4.0 (snapshot) and searched in my Ports to find > > the Openoffice Port but I wasn`t able to find it even I`ve seen some > > commits some weks ago and even undeadly reported about it. > > > > Why was the port dropped?! > > > > Kind regards, > > Sebastian > > It isn't in, officially. I mean, its a GIGANTIC port, which takes me > nearly 13 hours to compile, and it went into the tree at a very > late date. You can compile it yourself right now and test it out > but it isn't going to be in the 4.0 release, at least not now. It's > better to test all the other packages first to make sure those > are ready for 4.0... > > I daresay that only java and KDE are as complex as OO. > > --STeve Andre' You forgot GNOME which is just behind OO.
UPDATE: xine-lib 1.1.2
Here is a minor update to xine-lib 1.1.2. 2 security fixes and a few small improvements. * Security fixes: - CVE-2006-2802: possible buffer overflow in the HTTP plugin. - possible buffer overflow via bad indexes in specially-crafted AVI files * Fix a potential crash with fixed-size lacing in the Matroska demuxer * Enable AMD64 mmx/sse support in some plugins (tvtime, libmpeg2, goom...) * Fix xxmc subpictures (broken since 1.1.1) * Add support for RealPlayer 10 codecs This has been tested a fair ammount with Kaffeine/xine-ui and kdemultimedia. http://comstyle.com/ports/xine-lib.diff
UPDATE: imlib2 1.2.2
Here is a update to imlib2 1.2.2. There doesn't appear to be any real change log in the tarball. This has been tested a bit with digikam and fluxbox. http://comstyle.com/ports/imlib2.diff
Re: UPDATE: imlib2 1.2.2
On Sun, Oct 08, 2006 at 01:42:59AM -0400, Brad wrote: > Here is a update to imlib2 1.2.2. > > There doesn't appear to be any real change log > in the tarball. > > This has been tested a bit with digikam and fluxbox. > > http://comstyle.com/ports/imlib2.diff Any comments? Is anyone looking at or testing the imlib2 update?
Re: cyrus-imapd: proposed change
On Tue, Oct 24, 2006 at 08:34:37PM +0200, Marc Balmer wrote: > * Bernd Ahlers wrote: > > Nikolay Sturm [Tue, Oct 24, 2006 at 07:49:25PM +0200] wrote: > > >I don't like this. pkg_delete -c should remove as much of a package as > > >possible. If we know those directories exist, they should be deleted. > > > > > >The same goes for mysql and postgresql. If they know where the databases > > >are, they should delete those directories with "@extraunexec rm -fr $dir". > > > > > But the pkg_delete(1) manpage currently says: > > > > -c Delete extra configuration file, mentioned as > >@extra file > > in the packing-list. > > > > Database data isn't the same as configuration files. (At least for > > me...) So if we really want the behaviour you're speaking of, the > > manpage needs an update. > > deleting databases whith pkg_delete -c is something I am strongly > against. The -c is flag is for configuration files. I really do not > want this behaviour to change, leave it like it is. Although the man page does not say so, I have always considered the -c flag as a package removal "cleaning" flag and that it should remove all files, not just config files installed into SYSCONFDIR.
Re: pkg_delete -D, remove any data created by using a port
On Tue, Oct 24, 2006 at 08:39:22PM +0200, Marc Balmer wrote: > following the discussion about pkg_delete -c removing any data > associated with the use of a specific port, I propose the following for > discussion: > > add a new flag, -D, to remove any data that was created by using a > certain port. like whole database clusters. Could be indicated in a > PLIST like > > @rmdata rm -r /var/the_data_of_the_port > > I am strongly against pkg_delete -c to delete any user data. > > - Marc Whatever the new flag is it should mimic the old behavior of -c and remove everything.
Re: pkg_delete -D, remove any data created by using a port
On Wed, Oct 25, 2006 at 10:51:04AM +0200, Bernd Ahlers wrote: > Brad [Tue, Oct 24, 2006 at 06:53:40PM -0400] wrote: > >Whatever the new flag is it should mimic the old behavior of -c and > >remove everything. > > > There is no 'old behavior' of -c. It always said: > > -c Delete extra configuration file, mentioned as >@extra file > in the packing-list. > > The behavior of -c hasn't changed. There are just some ports which are > using this option in the wrong way. > > Bernd I do not care how you want to describe the situation. There was functionality there that I relied upon and was there intentionally and it has been removed with no functional equivalent, that is unacceptable. I'm fine with the fact that -c only removes configuration files now. But another flag has to be added that will ensure that ALL traces of the package are deleted when I remove said package.
Re: pkg_delete -D, remove any data created by using a port
On Wed, Oct 25, 2006 at 09:19:58PM +0200, Marc Balmer wrote: > > I do not care how you want to describe the situation. There was > > functionality > > there that I relied upon and was there intentionally and it has been removed > > with no functional equivalent, that is unacceptable. I'm fine with the fact > > that -c only removes configuration files now. But another flag has to be > > added that will ensure that ALL traces of the package are deleted when I > > remove said package. > > you relied on something that was never there. If it was never there then you wouldn't be making changes to ports to remove functionality.
Re: OpenOffice source - Humppa.hu not avaiable
On Thu, Oct 26, 2006 at 11:12:38PM +0200, [EMAIL PROTECTED] wrote: > So who`s ignorant here? You. > It could have been done better... It was not hooked up to the build for a reason. It does build and work, I built a package from the port at the time and it did "work". > EOF Shut the hell up. You sound like a total retard.
Re: How much space is needed for bulk build on i386?
On Fri, Dec 22, 2006 at 10:29:54AM -0500, Steve Shockley wrote: > Frank Denis wrote: > >$ du -sh packages > >5.2Gpackages > > So, that would mean that a bulk build would need ~10G in /usr/ports? > That's useful to know. That would not include the additional space also necessary when building the packages and that would be a lot more. I believe the number is in the 30G range.
Re: UPDATE: graphics/ffmpeg
On Mon, Dec 11, 2006 at 03:53:23PM +0200, Nikns Siankin wrote:
> Added regression tests.
> Added back external decoders.
>
> relevant portion of the official ChangeLog:
>
> - DV50 AKA DVCPRO50 encoder, decoder, muxer and demuxer
> - TechSmith Camtasia (TSCC) video decoder
> - IBM Ultimotion (ULTI) video decoder
> - Sierra Online audio file demuxer and decoder
> - Apple QuickDraw (qdrw) video decoder
> - Creative ADPCM audio decoder (16 bits as well as 8 bits schemes)
> - Electronic Arts Multimedia (WVE/UV2/etc.) file demuxer
> - Miro VideoXL (VIXL) video decoder
> - H.261 video encoder
> - QPEG video decoder
> - Nullsoft Video (NSV) file demuxer
> - Shorten audio decoder
> - LOCO video decoder
> - Apple Lossless Audio Codec (ALAC) decoder
> - Winnov WNV1 video decoder
> - Autodesk Animator Studio Codec (AASC) decoder
> - Indeo 2 video decoder
>
> http://secure.lv/~nikns/stuff/ports/ffmpeg-20061211.diff
Hi Nikns,
Add the following diff to the port update and send it back out.
This will unbreak support for the WMA audio format, which is also
used in WMV video. With the port as is WMV files and WMA files
cannot be played on a i386 system with SSE support, the result
being 100% reproducible crash every time.
Bug fix for crashes when SSE is used on unaligned arrays.
No measureable change in speed. This gave random crashes on Win32
and BeOS. The cause for this bug is that gcc doesn't align the
stackframe. Linux and glibc always ensure this to be true thus
this never affected Linux.
$OpenBSD$
--- libavcodec/wmadec.c.origTue Dec 26 17:11:00 2006
+++ libavcodec/wmadec.c Tue Dec 26 17:13:58 2006
@@ -115,6 +115,8 @@ typedef struct WMADecodeContext {
float max_exponent[MAX_CHANNELS];
int16_t coefs1[MAX_CHANNELS][BLOCK_MAX_SIZE];
DECLARE_ALIGNED_16(float, coefs[MAX_CHANNELS][BLOCK_MAX_SIZE]);
+DECLARE_ALIGNED_16(FFTSample, output[BLOCK_MAX_SIZE * 2]);
+DECLARE_ALIGNED_16(float, window[BLOCK_MAX_SIZE * 2]);
MDCTContext mdct_ctx[BLOCK_NB_SIZES];
float *windows[BLOCK_NB_SIZES];
DECLARE_ALIGNED_16(FFTSample, mdct_tmp[BLOCK_MAX_SIZE]); /* temporary
storage for imdct */
@@ -717,7 +719,6 @@ static int wma_decode_block(WMADecodeCon
{
int n, v, a, ch, code, bsize;
int coef_nb_bits, total_gain, parse_exponents;
-DECLARE_ALIGNED_16(float, window[BLOCK_MAX_SIZE * 2]);
int nb_coefs[MAX_CHANNELS];
float mdct_norm;
@@ -1072,7 +1073,7 @@ static int wma_decode_block(WMADecodeCon
next_block_len = 1 << s->next_block_len_bits;
/* right part */
-wptr = window + block_len;
+wptr = s->window + block_len;
if (block_len <= next_block_len) {
for(i=0;iwindows[bsize][i];
@@ -1088,7 +1089,7 @@ static int wma_decode_block(WMADecodeCon
}
/* left part */
-wptr = window + block_len;
+wptr = s->window + block_len;
if (block_len <= prev_block_len) {
for(i=0;iwindows[bsize][i];
@@ -1107,14 +1108,13 @@ static int wma_decode_block(WMADecodeCon
for(ch = 0; ch < s->nb_channels; ch++) {
if (s->channel_coded[ch]) {
-DECLARE_ALIGNED_16(FFTSample, output[BLOCK_MAX_SIZE * 2]);
float *ptr;
int n4, index, n;
n = s->block_len;
n4 = s->block_len / 2;
s->mdct_ctx[bsize].fft.imdct_calc(&s->mdct_ctx[bsize],
- output, s->coefs[ch], s->mdct_tmp);
+ s->output, s->coefs[ch], s->mdct_tmp);
/* XXX: optimize all that by build the window and
multipying/adding at the same time */
@@ -1122,13 +1122,13 @@ static int wma_decode_block(WMADecodeCon
/* multiply by the window and add in the frame */
index = (s->frame_len / 2) + s->block_pos - n4;
ptr = &s->frame_out[ch][index];
-s->dsp.vector_fmul_add_add(ptr,window,output,ptr,0,2*n,1);
+s->dsp.vector_fmul_add_add(ptr,s->window,s->output,ptr,0,2*n,1);
/* specific fast case for ms-stereo : add to second
channel if it is not coded */
if (s->ms_stereo && !s->channel_coded[1]) {
ptr = &s->frame_out[1][index];
-s->dsp.vector_fmul_add_add(ptr,window,output,ptr,0,2*n,1);
+
s->dsp.vector_fmul_add_add(ptr,s->window,s->output,ptr,0,2*n,1);
}
}
}
Re: qemu and "-kernel-kqemu" switch
On Sun, Dec 31, 2006 at 06:21:25PM +0100, Per-Olov Sjoholm wrote: > According to this link > http://en.wikipedia.org/wiki/Comparison_of_virtual_machines > Qemu can run at almost native speed if it runs in full virtualization mode. > This seems to be with option -kernel-kqemu. If it is not using this option, > it's only 10 to 20% of native speed. > > >From http://fabrice.bellard.free.fr/qemu/kqemu-doc.html#SEC7 > --snip-- > This mode is activated with the `-kernel-kqemu' QEMU option. It is currently > only supported for 32 bit guest OSes (the x86_64 code is not debugged yet). > When KQEMU runs in full virtualization mode, both guest kernel and user code > are executed directly on the host CPU. In normal mode, only the user code is > executed directly and the kernel code is still dynamically translated by > QEMU. > --snip-- > > Is this -kernel-kqemu" option possible if running the qemu -current port > (0.82) on OpenBSD 4.0? Or is it a lot of porting work before this can be > used? The module in question is in binary form only. > Thanks in advance > Per-Olov > -- > GPG keyID: 4DB283CE > GPG fingerprint: 45E8 3D0E DE05 B714 D549 45BC CFB4 BBE9 4DB2 83CE >
MPlayer security fix.
Here is a security fix for the MPlayer port.
The details...
A potential buffer overflow was found in the code used to handle RealMedia
RTSP streams. When checking for matching asm rules, the code stores the
results in a fixed-size array, but no boundary checks are performed. This
may lead to a buffer overflow if the user is tricked into connecting to a
malicious server. Since the attacker can not write arbitrary data into the
buffer, creating an exploit is very hard; but a DoS attack is easily made.
Index: Makefile
===
RCS file: /cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.107
diff -u -p -r1.107 Makefile
--- Makefile28 Dec 2006 02:23:17 - 1.107
+++ Makefile1 Jan 2007 19:44:30 -
@@ -7,7 +7,7 @@ COMMENT="Movie player supporting MPEG,
DISTNAME= MPlayer-1.0pre8
DIST_SUBDIR= mplayer
-PKGNAME= ${DISTNAME:L}p2
+PKGNAME= ${DISTNAME:L}p3
CATEGORIES=x11
EXTRACT_SUFX= .tar.bz2
Index: patches/patch-libmpdemux_realrtsp_asmrp_c
===
RCS file: patches/patch-libmpdemux_realrtsp_asmrp_c
diff -N patches/patch-libmpdemux_realrtsp_asmrp_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-libmpdemux_realrtsp_asmrp_c 1 Jan 2007 19:55:47 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+--- libmpdemux/realrtsp/asmrp.c.orig Mon Jan 1 14:46:36 2007
libmpdemux/realrtsp/asmrp.cMon Jan 1 14:47:35 2007
+@@ -40,6 +40,7 @@
+ #include
+ #include
+ #include
++#include "asmrp.h"
+
+ /*
+ #define LOG
+@@ -645,8 +646,10 @@ static int asmrp_eval (asmrp_t *p, int *
+ #ifdef LOG
+ printf ("rule #%d is true\n", rule_num);
+ #endif
+- matches[num_matches] = rule_num;
+- num_matches++;
++ if(num_matches < MAX_RULEMATCHES - 1)
++matches[num_matches++] = rule_num;
++ else
++printf("Ignoring matched asm rule %d, too many matched rules.\n",
rule_num);
+ }
+
+ rule_num++;
Index: patches/patch-libmpdemux_realrtsp_asmrp_h
===
RCS file: patches/patch-libmpdemux_realrtsp_asmrp_h
diff -N patches/patch-libmpdemux_realrtsp_asmrp_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-libmpdemux_realrtsp_asmrp_h 1 Jan 2007 19:50:32 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libmpdemux/realrtsp/asmrp.h.orig Mon Jan 1 14:49:49 2007
libmpdemux/realrtsp/asmrp.hMon Jan 1 14:50:23 2007
+@@ -40,6 +40,8 @@
+ #ifndef HAVE_ASMRP_H
+ #define HAVE_ASMRP_H
+
++#define MAX_RULEMATCHES 16
++
+ int asmrp_match (const char *rules, int bandwidth, int *matches) ;
+
+ #endif
Index: patches/patch-libmpdemux_realrtsp_real_c
===
RCS file: patches/patch-libmpdemux_realrtsp_real_c
diff -N patches/patch-libmpdemux_realrtsp_real_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-libmpdemux_realrtsp_real_c1 Jan 2007 19:50:32 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libmpdemux/realrtsp/real.c.origMon Jan 1 14:49:12 2007
libmpdemux/realrtsp/real.c Mon Jan 1 14:49:37 2007
+@@ -528,7 +528,7 @@ rmff_header_t *real_parse_sdp(char *data
+ int j=0;
+ int n;
+ char b[64];
+-int rulematches[16];
++int rulematches[MAX_RULEMATCHES];
+
+ #ifdef LOG
+ printf("calling asmrp_match with:\n%s\n%u\n",
desc->stream[i]->asm_rule_book, bandwidth);
xine-lib security fix.
Here is a security fix for the xine-lib port.
The details...
A potential buffer overflow was found in the code used to handle RealMedia
RTSP streams. When checking for matching asm rules, the code stores the
results in a fixed-size array, but no boundary checks are performed. This
may lead to a buffer overflow if the user is tricked into connecting to a
malicious server. Since the attacker can not write arbitrary data into the
buffer, creating an exploit is very hard; but a DoS attack is easily made.
Index: Makefile
===
RCS file: /cvs/ports/multimedia/xine-lib/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile16 Dec 2006 12:22:34 - 1.9
+++ Makefile1 Jan 2007 20:18:20 -
@@ -4,7 +4,7 @@ COMMENT="multimedia decoding library"
V= 1.1.2
DISTNAME= xine-lib-${V}
-PKGNAME= ${DISTNAME}p3
+PKGNAME= ${DISTNAME}p4
EXTRACT_SUFX= .tar.bz2
CATEGORIES=multimedia
SHARED_LIBS= xine14.1
Index: patches/patch-src_input_libreal_asmrp_c
===
RCS file:
/cvs/ports/multimedia/xine-lib/patches/patch-src_input_libreal_asmrp_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_input_libreal_asmrp_c
--- patches/patch-src_input_libreal_asmrp_c 7 Dec 2006 09:21:01 -
1.1
+++ patches/patch-src_input_libreal_asmrp_c 1 Jan 2007 20:28:26 -
@@ -1,7 +1,15 @@
$OpenBSD: patch-src_input_libreal_asmrp_c,v 1.1 2006/12/07 09:21:01 steven Exp
$
src/input/libreal/asmrp.c.orig Mon Dec 4 14:27:53 2006
-+++ src/input/libreal/asmrp.c Mon Dec 4 14:30:49 2006
-@@ -604,7 +604,7 @@ static int asmrp_rule (asmrp_t *p) {
+--- src/input/libreal/asmrp.c.orig Fri Aug 27 14:34:16 2004
src/input/libreal/asmrp.c Mon Jan 1 15:27:04 2007
+@@ -37,6 +37,7 @@
+ #include
+ #include
+ #include
++#include "asmrp.h"
+
+ #define LOG_MODULE "asmrp"
+ #define LOG_VERBOSE
+@@ -604,7 +605,7 @@ static int asmrp_rule (asmrp_t *p) {
return ret;
}
@@ -10,7 +18,7 @@ $OpenBSD: patch-src_input_libreal_asmrp_
int rule_num, num_matches;
-@@ -613,7 +613,7 @@ static int asmrp_eval (asmrp_t *p, int *
+@@ -613,13 +614,15 @@ static int asmrp_eval (asmrp_t *p, int *
asmrp_get_sym (p);
rule_num = 0; num_matches = 0;
@@ -19,7 +27,17 @@ $OpenBSD: patch-src_input_libreal_asmrp_
if (asmrp_rule (p)) {
lprintf ("rule #%d is true\n", rule_num);
-@@ -629,7 +629,7 @@ static int asmrp_eval (asmrp_t *p, int *
+
+- matches[num_matches] = rule_num;
+- num_matches++;
++ if(num_matches < MAX_RULEMATCHES - 1)
++matches[num_matches++] = rule_num;
++ else
++printf("Ignoring matched asm rule %d, too many matched rules.\n",
rule_num);
+ }
+
+ rule_num++;
+@@ -629,7 +632,7 @@ static int asmrp_eval (asmrp_t *p, int *
return num_matches;
}
@@ -28,7 +46,7 @@ $OpenBSD: patch-src_input_libreal_asmrp_
asmrp_t *p;
int num_matches;
-@@ -641,7 +641,7 @@ int asmrp_match (const char *rules, int
+@@ -641,7 +644,7 @@ int asmrp_match (const char *rules, int
asmrp_set_id (p, "Bandwidth", bandwidth);
asmrp_set_id (p, "OldPNMPlayer", 0);
Index: patches/patch-src_input_libreal_asmrp_h
===
RCS file:
/cvs/ports/multimedia/xine-lib/patches/patch-src_input_libreal_asmrp_h,v
retrieving revision 1.1
diff -u -p -r1.1 patch-src_input_libreal_asmrp_h
--- patches/patch-src_input_libreal_asmrp_h 7 Dec 2006 09:21:01 -
1.1
+++ patches/patch-src_input_libreal_asmrp_h 1 Jan 2007 20:28:18 -
@@ -1,11 +1,13 @@
$OpenBSD: patch-src_input_libreal_asmrp_h,v 1.1 2006/12/07 09:21:01 steven Exp
$
src/input/libreal/asmrp.h.orig Mon Dec 4 14:28:04 2006
-+++ src/input/libreal/asmrp.h Mon Dec 4 14:31:10 2006
-@@ -37,6 +37,6 @@
+--- src/input/libreal/asmrp.h.orig Mon Dec 8 19:02:30 2003
src/input/libreal/asmrp.h Mon Jan 1 15:27:47 2007
+@@ -37,6 +37,8 @@
#ifndef HAVE_ASMRP_H
#define HAVE_ASMRP_H
-int asmrp_match (const char *rules, int bandwidth, int *matches) ;
++#define MAX_RULEMATCHES 16
++
+int asmrp_match (const char *rules, int bandwidth, int *matches, int
matchsize) ;
#endif
Index: patches/patch-src_input_libreal_real_c
===
RCS file:
/cvs/ports/multimedia/xine-lib/patches/patch-src_input_libreal_real_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_input_libreal_real_c
--- patches/patch-src_input_libreal_real_c 7 Dec 2006 09:21:01 -
1.3
+++ patches/patch-src_input_libreal_real_c 1 Jan 2007 20:28:18 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-src_input_libreal_real_c,v 1.3 2006/12/07 09:21:01 steven Exp $
--- src/input/libreal/real.c.orig Sun Jul 9 10:37:40 2006
-+++ src
vlc security fix.
Here is a security fix for the vlc port.
http://www.videolan.org/sa0701.html
Index: Makefile
===
RCS file: /cvs/ports/x11/vlc/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- Makefile24 Dec 2006 01:57:16 - 1.42
+++ Makefile4 Jan 2007 05:51:12 -
@@ -5,7 +5,7 @@ SHARED_ONLY=Yes
COMMENT= "videolan client; multimedia player"
V= 0.8.6
DISTNAME= vlc-${V}
-PKGNAME= vlc-${V}p0
+PKGNAME= vlc-${V}p1
CATEGORIES=x11
MASTER_SITES= http://download.videolan.org/pub/videolan/vlc/${V}/
Index: patches/patch-modules_access_cdda_access_c
===
RCS file: patches/patch-modules_access_cdda_access_c
diff -N patches/patch-modules_access_cdda_access_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-modules_access_cdda_access_c 4 Jan 2007 05:56:52 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- modules/access/cdda/access.c.orig Thu Jan 4 00:52:28 2007
modules/access/cdda/access.c Thu Jan 4 00:54:20 2007
+@@ -89,17 +89,17 @@ cdio_log_handler (cdio_log_level_t level
+ case CDIO_LOG_DEBUG:
+ case CDIO_LOG_INFO:
+ if (p_cdda->i_debug & INPUT_DBG_CDIO)
+- msg_Dbg( p_cdda_input, message);
++ msg_Dbg( p_cdda_input, "%s", message);
+ break;
+ case CDIO_LOG_WARN:
+-msg_Warn( p_cdda_input, message);
++msg_Warn( p_cdda_input, "%s", message);
+ break;
+ case CDIO_LOG_ERROR:
+ case CDIO_LOG_ASSERT:
+-msg_Err( p_cdda_input, message);
++msg_Err( p_cdda_input, "%s", message);
+ break;
+ default:
+-msg_Warn( p_cdda_input, message,
++msg_Warn( p_cdda_input, "%s\n%s %d", message,
+ "the above message had unknown cdio log level",
+ level);
+ }
Index: patches/patch-modules_access_vcdx_access_c
===
RCS file: patches/patch-modules_access_vcdx_access_c
diff -N patches/patch-modules_access_vcdx_access_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-modules_access_vcdx_access_c 4 Jan 2007 05:56:37 -
@@ -0,0 +1,43 @@
+$OpenBSD$
+--- modules/access/vcdx/access.c.orig Thu Jan 4 00:54:36 2007
modules/access/vcdx/access.c Thu Jan 4 00:56:28 2007
+@@ -92,17 +92,17 @@ cdio_log_handler (cdio_log_level_t level
+ case CDIO_LOG_DEBUG:
+ case CDIO_LOG_INFO:
+ if (p_vcdplayer->i_debug & INPUT_DBG_CDIO)
+- msg_Dbg( p_vcd_access, message);
++ msg_Dbg( p_vcd_access, "%s", message);
+ break;
+ case CDIO_LOG_WARN:
+-msg_Warn( p_vcd_access, message);
++msg_Warn( p_vcd_access, "%s", message);
+ break;
+ case CDIO_LOG_ERROR:
+ case CDIO_LOG_ASSERT:
+-msg_Err( p_vcd_access, message);
++msg_Err( p_vcd_access, "%s", message);
+ break;
+ default:
+-msg_Warn( p_vcd_access, message,
++msg_Warn( p_vcd_access, "%s\n%s %d", message,
+ _("The above message had unknown log level"),
+ level);
+ }
+@@ -118,14 +118,14 @@ vcd_log_handler (vcd_log_level_t level,
+ case VCD_LOG_DEBUG:
+ case VCD_LOG_INFO:
+ if (p_vcdplayer->i_debug & INPUT_DBG_VCDINFO)
+- msg_Dbg( p_vcd_access, message);
++ msg_Dbg( p_vcd_access, "%s", message);
+ break;
+ case VCD_LOG_WARN:
+-msg_Warn( p_vcd_access, message);
++msg_Warn( p_vcd_access, "%s", message);
+ break;
+ case VCD_LOG_ERROR:
+ case VCD_LOG_ASSERT:
+-msg_Err( p_vcd_access, message);
++msg_Err( p_vcd_access, "%s", message);
+ break;
+ default:
+ msg_Warn( p_vcd_access, "%s\n%s %d", message,
Re: UPDATE: warzone2100 2.3.5
On Monday 25 October 2010 18:44:37 Tobias Ulmer wrote: > Tried it on amd64 with the intention to look at the lp64 bugs. Anyway, > it doesn't even pass configure now because it uses /usr/bin/flex instead > of gflex. I've tracked this down to CONFIG_SITE forcing flex. Setting > CONFIG_SITE=/dev/null makes it go away, but this is probably not what > you want... This only showed up very recently. > The patch also needs to be regenerated without USE_X11. > > > Btw the version in the tree right now is broken in the middle of the > campaign, there are missing game data files (This can be repaired, you > have hunt around and repack the zip file containing the game date) > > It would be nice to get the update in... Yes. It's not perfect but what's currently in the ports tree has its own set of issues -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: warzone2100 2.3.5
On Wed, Oct 13, 2010 at 06:38:15PM -0400, Brad wrote:
> Here is an update to Warzone 2100 2.3.5.
>
> I'm looking for someone with an i386 system to test this out.
A second rev diff.
Index: Makefile
===
RCS file: /home/cvs/ports/games/warzone2100/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile24 Oct 2010 21:19:02 - 1.6
+++ Makefile26 Oct 2010 02:11:44 -
@@ -1,47 +1,51 @@
# $OpenBSD: Makefile,v 1.6 2010/10/24 21:19:02 ajacoutot Exp $
-COMMENT= 3d realtime strategy on a future earth
+ONLY_FOR_ARCHS=amd64 i386
-DISTNAME= warzone2100-2.0.7
-PKGNAME= ${DISTNAME}p2
+COMMENT= 3D realtime strategy on a future earth
+
+DISTNAME= warzone2100-2.3.5
CATEGORIES=games
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=warzone2100/}
HOMEPAGE= http://wz2100.net/
MAINTAINER=Simon Bertrang
-# GPL
+# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= GL GLU SDL X11 Xext c m ogg pthread pthread-stubs \
- sndio usbhid xcb z
-
-MASTER_SITES= http://download.gna.org/warzone/releases/2.0/
-
-LIB_DEPENDS= SDL_net.>=1::devel/sdl-net \
- physfs.>=1::devel/physfs \
- openal.>=1::audio/openal \
- vorbis.>=5,vorbisfile.>=4::audio/libvorbis \
- mad.>=2::audio/libmad \
- jpeg.>=62::graphics/jpeg \
- png.>=5::graphics/png
-
-BUILD_DEPENDS= ::devel/bison \
- ::archivers/unzip \
- ::archivers/zip
+WANTLIB= GL GLC GLU SDL.>=8 X11 c m physfs.>=1 ogg.>=6 openal.>=1 \
+ png.>=5 popt pthread sndio stdc++ theora vorbis.>=5 \
+ vorbisfile.>=4 z
+
+MODULES= devel/gettext
+LIB_DEPENDS= ::audio/libogg \
+ ::audio/libvorbis \
+ :openal->=0.0.8p7:audio/openal \
+ ::devel/physfs \
+ ::devel/popt \
+ ::devel/sdl \
+ ::graphics/png \
+ ::graphics/quesoglc \
+ ::multimedia/libtheora
+BUILD_DEPENDS= ::archivers/unzip \
+ ::archivers/zip \
+ ::devel/bison \
+ ::devel/flex
RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils
USE_GMAKE= Yes
-
-CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS+=${CONFIGURE_SHARED}
-CONFIGURE_ENV+=CPPFLAGS='-I${LOCALBASE}/include
-I${LOCALBASE}/include/libpng \
- -I${X11BASE}/include' \
- LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib' \
- LIBS='-pthread' \
- YACC='bison -y'
+CONFIGURE_STYLE= autoconf
+# Should be 2.65
+AUTOCONF_VERSION= 2.64
+CONFIGURE_ARGS+= --with-distributor="OpenBSD"
+CONFIGURE_ENV+=CPPFLAGS="-I${X11BASE}/include
-I${LOCALBASE}/include/libpng \
+ -I${LOCALBASE}/include" \
+ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
+ YACC="bison -y" \
+ ac_cv_prog_LEX="gflex"
.include
Index: distinfo
===
RCS file: /home/cvs/ports/games/warzone2100/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo22 Jul 2007 14:57:52 - 1.1.1.1
+++ distinfo11 Oct 2010 01:03:22 -
@@ -1,5 +1,5 @@
-MD5 (warzone2100-2.0.7.tar.bz2) = mDzMZ8/V3zGFxoNsYupyLw==
-RMD160 (warzone2100-2.0.7.tar.bz2) = qNSDZmq2YhtLP9jdl/xOlanZxWs=
-SHA1 (warzone2100-2.0.7.tar.bz2) = +4W+ejAWvSwAbKxkVTjaOn1wJdE=
-SHA256 (warzone2100-2.0.7.tar.bz2) =
5q4rNYTG8YlofL/HejQ5foIQy86rg3ERVcNllOmw+so=
-SIZE (warzone2100-2.0.7.tar.bz2) = 19622856
+MD5 (warzone2100-2.3.5.tar.gz) = HZ1yRVW2JXOp67zfVqTRYA==
+RMD160 (warzone2100-2.3.5.tar.gz) = 8nbx5jbTdbKPTp0ecXpWKp9WsPc=
+SHA1 (warzone2100-2.3.5.tar.gz) = Ej2HssxWA8ySZyuuopuwe9rr0u0=
+SHA256 (warzone2100-2.3.5.tar.gz) =
Op5ChR1rJEl/wH2ujXW74v8TWP+96uot6qYj7AFWpGk=
+SIZE (warzone2100-2.3.5.tar.gz) = 59205795
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 22 Jul 2007 14:57:52 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/07/22 14:57:52 simon Exp $
Makefile.in.orig Sun Jul 22 00:02:49 2007
-+++ Makefile.inSun Jul 22 00:03:05 2007
-@@ -199,7 +199,7 @@ target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = win32 lib src data icons nsis
--dist_doc_DATA = AUTHORS ChangeL
Re: UPDATE: x264
On Wednesday 27 October 2010 20:59:48 Edd Barrett wrote: > Hi, > > This is an x264 encoder update required for the mplayer update. > > Myself and jakemsr@ have successfully encoded x264 in mencoder (see > other mail in this list for this port) and the in-tree vlc. > > Tested build on i386, amd64, sparc64 and PPC. All other ports using > this library were build tested in i386. I'm waiting for kili to commit my orc update. Then I'll look at sending out a proper update to FFmpeg/x264. But you essentially knew I had something pending. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: mplayer
On Friday 29 October 2010 11:45:52 David Coppa wrote: > On Fri, Oct 29, 2010 at 1:30 PM, David Coppa wrote: > > P.S.: it would be nice if we'll import my opencore-amr port and patches > > as well http://marc.info/?l=openbsd-ports&m=127610307608245 > > I'd be glad... > > Nevermind... Unfortunately, I need to give up with this :( > > Fscking licensing issues (GPLv3 stupidity): > > https://bugs.gentoo.org/show_bug.cgi?id=299405#c6 There was no chance of this going in. It's also an issue for FFmpeg as well. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: style rule: space around variables
On Wednesday 03 November 2010 09:50:59 Antoine Jacoutot wrote: > Don't think that it's just me. Everyone has always been annoyed by this, > it's not like I'm ranting alone in my corner. Far from it. The people who like this are the exception. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: libtool static libs and -fPIC
On Friday 05 November 2010 18:54:39 Stuart Henderson wrote: > On 2010/11/05 15:37, Brad wrote: > > > note that the static library archive is now created from files in > > > the build directory rather than .libs, and that only the version in > > > .libs was built with -fPIC -DPIC. > > > > Maybe I am misunderstanding what you're saying but this is how > > it should be built. > > Without -fPIC you mean? Yes for a static archive. > But shouldn't linking with a static library work if required, > even though we don't want to do that in ports? Not to a shared library and that does not work with GNU libtool. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: libtool static libs and -fPIC
On Friday 05 November 2010 20:48:57 Jacob Meuser wrote: > On Fri, Nov 05, 2010 at 07:18:49PM -0400, Brad wrote: > > On Friday 05 November 2010 18:54:39 Stuart Henderson wrote: > > > On 2010/11/05 15:37, Brad wrote: > > > > > note that the static library archive is now created from files in > > > > > the build directory rather than .libs, and that only the version in > > > > > .libs was built with -fPIC -DPIC. > > > > > > > > Maybe I am misunderstanding what you're saying but this is how > > > > it should be built. > > > > > > Without -fPIC you mean? > > > > Yes for a static archive. > > > > > But shouldn't linking with a static library work if required, > > > even though we don't want to do that in ports? > > > > Not to a shared library and that does not work with GNU libtool. > > it does if the library name ends in _pic.a, but libtool doesn't create > such libraries. if they exist, it is to work around upstream thinking > it's ok to link static libraries (which are generally non-PIC) into > shared objects, but that doesn't work on all archs. there used to be > patches to create a _pic.a library in multimedia/mjpegtools, but that > was years ago. dunno if there's anything like that still in the tree. Well ya, I added the _pic.a matching for GNU libtool. But that is barely used anywhere. I don't remember if anything in ports or necessarily even in src does anymore. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: libtool static libs and -fPIC
On Friday 05 November 2010 21:01:34 Brad wrote: > > Well ya, I added the _pic.a matching for GNU libtool. But that is barely OpenBSD in GNU libtool... -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: warzone2100 2.3.5
On Mon, Oct 25, 2010 at 10:15:45PM -0400, Brad wrote:
> On Wed, Oct 13, 2010 at 06:38:15PM -0400, Brad wrote:
> > Here is an update to Warzone 2100 2.3.5.
> >
> > I'm looking for someone with an i386 system to test this out.
>
> A second rev diff.
Updated after the last WANTLIB commit.
Index: Makefile
===
RCS file: /home/cvs/ports/games/warzone2100/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile8 Nov 2010 18:14:21 - 1.7
+++ Makefile10 Nov 2010 02:00:40 -
@@ -1,48 +1,51 @@
# $OpenBSD: Makefile,v 1.7 2010/11/08 18:14:21 espie Exp $
-COMMENT= 3d realtime strategy on a future earth
+ONLY_FOR_ARCHS=i386
-DISTNAME= warzone2100-2.0.7
-REVISION = 2
+COMMENT= 3D realtime strategy on a future earth
+
+DISTNAME= warzone2100-2.3.5
CATEGORIES=games
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=warzone2100/}
HOMEPAGE= http://wz2100.net/
MAINTAINER=Simon Bertrang
-# GPL
+# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= GL GLU SDL X11 Xext c m ogg pthread pthread-stubs \
- sndio usbhid xcb z SDL_net.>=1 physfs.>=1 openal.>=1 \
- vorbis.>=5 vorbisfile.>=4 mad.>=2 jpeg.>=62 png.>=5
-
-MASTER_SITES= http://download.gna.org/warzone/releases/2.0/
+WANTLIB= GL GLC GLU SDL.>=8 X11 c m physfs.>=1 ogg.>=6 openal.>=1 \
+ png.>=5 popt pthread sndio stdc++ theora vorbis.>=5 \
+ vorbisfile.>=4 z
-LIB_DEPENDS= ::devel/sdl-net \
- ::devel/physfs \
- ::audio/openal \
+MODULES= devel/gettext
+LIB_DEPENDS= ::audio/libogg \
::audio/libvorbis \
- ::audio/libmad \
- ::graphics/jpeg \
- ::graphics/png
-
-BUILD_DEPENDS= ::devel/bison \
- ::archivers/unzip \
- ::archivers/zip
+ :openal->=0.0.8p7:audio/openal \
+ ::devel/physfs \
+ ::devel/popt \
+ ::devel/sdl \
+ ::graphics/png \
+ ::graphics/quesoglc \
+ ::multimedia/libtheora
+BUILD_DEPENDS= ::archivers/unzip \
+ ::archivers/zip \
+ ::devel/bison \
+ ::devel/flex
RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils
USE_GMAKE= Yes
-
-CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS+=${CONFIGURE_SHARED}
-CONFIGURE_ENV+=CPPFLAGS='-I${LOCALBASE}/include
-I${LOCALBASE}/include/libpng \
- -I${X11BASE}/include' \
- LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib' \
- LIBS='-pthread' \
- YACC='bison -y'
+CONFIGURE_STYLE= autoconf
+# Should be 2.65
+AUTOCONF_VERSION= 2.64
+CONFIGURE_ARGS+= --with-distributor="OpenBSD"
+CONFIGURE_ENV+=CPPFLAGS="-I${X11BASE}/include
-I${LOCALBASE}/include/libpng \
+ -I${LOCALBASE}/include" \
+ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
+ YACC="bison -y" \
+ ac_cv_prog_LEX="gflex"
.include
Index: distinfo
===
RCS file: /home/cvs/ports/games/warzone2100/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo22 Jul 2007 14:57:52 - 1.1.1.1
+++ distinfo11 Oct 2010 01:03:22 -
@@ -1,5 +1,5 @@
-MD5 (warzone2100-2.0.7.tar.bz2) = mDzMZ8/V3zGFxoNsYupyLw==
-RMD160 (warzone2100-2.0.7.tar.bz2) = qNSDZmq2YhtLP9jdl/xOlanZxWs=
-SHA1 (warzone2100-2.0.7.tar.bz2) = +4W+ejAWvSwAbKxkVTjaOn1wJdE=
-SHA256 (warzone2100-2.0.7.tar.bz2) =
5q4rNYTG8YlofL/HejQ5foIQy86rg3ERVcNllOmw+so=
-SIZE (warzone2100-2.0.7.tar.bz2) = 19622856
+MD5 (warzone2100-2.3.5.tar.gz) = HZ1yRVW2JXOp67zfVqTRYA==
+RMD160 (warzone2100-2.3.5.tar.gz) = 8nbx5jbTdbKPTp0ecXpWKp9WsPc=
+SHA1 (warzone2100-2.3.5.tar.gz) = Ej2HssxWA8ySZyuuopuwe9rr0u0=
+SHA256 (warzone2100-2.3.5.tar.gz) =
Op5ChR1rJEl/wH2ujXW74v8TWP+96uot6qYj7AFWpGk=
+SIZE (warzone2100-2.3.5.tar.gz) = 59205795
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 22 Jul 2007 14:57:52 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/07/22 14:57:52 simon Exp $
Makefile.in.orig Sun Jul 22 00:02:49 2007
-+++ Makefile.inSun Jul 22 00:03:05 2007
-@@ -199,7 +199,7 @@ target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = win32 lib src data icons nsis
--dis
Re: FIX: www/squid
On Tuesday 02 November 2010 11:05:50 Kirill Bychkov wrote: > On Tue, November 2, 2010 11:18, Giovanni Bechis wrote: > > I enabled to squid ntlm support and added a couple of fake ntlm helpers, > > the real ntlm helper is in samba package. > > I added an rcscript too. > > Comments ? Ok ? > > Cheers > >Giovanni > > Hi. I have no time to rework my old diff, but it is what i'm using for AD > authorization for a couple of years. > This was OKed by David Coppa some time earlier. I'll see about updating this and getting something appropriate in this weekend. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: warzone2100 2.3.5
On Tue, Nov 09, 2010 at 09:05:08PM -0500, Brad wrote:
> On Mon, Oct 25, 2010 at 10:15:45PM -0400, Brad wrote:
> > On Wed, Oct 13, 2010 at 06:38:15PM -0400, Brad wrote:
> > > Here is an update to Warzone 2100 2.3.5.
> > >
> > > I'm looking for someone with an i386 system to test this out.
> >
> > A second rev diff.
>
> Updated after the last WANTLIB commit.
Updated after the dependency format changes.
Index: Makefile
===
RCS file: /home/cvs/ports/games/warzone2100/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile22 Nov 2010 10:16:08 - 1.9
+++ Makefile22 Nov 2010 20:05:16 -
@@ -1,48 +1,49 @@
# $OpenBSD: Makefile,v 1.9 2010/11/22 10:16:08 espie Exp $
-COMMENT= 3d realtime strategy on a future earth
+ONLY_FOR_ARCHS=i386
-DISTNAME= warzone2100-2.0.7
-REVISION = 2
+COMMENT= 3D realtime strategy on a future earth
+
+DISTNAME= warzone2100-2.3.5
CATEGORIES=games
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=warzone2100/}
HOMEPAGE= http://wz2100.net/
-MAINTAINER=Simon Bertrang
-
-# GPL
+# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= GL GLU SDL X11 Xext c m ogg pthread pthread-stubs \
- sndio usbhid xcb z SDL_net>=1 physfs>=1 openal>=1 \
- vorbis>=5 vorbisfile>=4 mad>=2 jpeg>=62 png>=5
-
-MASTER_SITES= http://download.gna.org/warzone/releases/2.0/
+WANTLIB= GL GLC GLU SDL X11 c m physfs ogg openal>=1 png \
+ popt pthread sndio stdc++ theora vorbis vorbisfile \
+ z
-LIB_DEPENDS= devel/sdl-net \
- devel/physfs \
- audio/openal \
+MODULES= devel/gettext
+LIB_DEPENDS= audio/libogg \
audio/libvorbis \
- audio/libmad \
- graphics/jpeg \
- graphics/png
-
-BUILD_DEPENDS= devel/bison \
- archivers/unzip \
- archivers/zip
+ audio/openal>=0.0.8p7 \
+ devel/physfs \
+ devel/popt \
+ devel/sdl \
+ graphics/png \
+ graphics/quesoglc \
+ multimedia/libtheora
+BUILD_DEPENDS= archivers/unzip \
+ archivers/zip \
+ devel/bison \
+ devel/flex
RUN_DEPENDS= devel/desktop-file-utils
USE_GMAKE= Yes
-
-CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS+=${CONFIGURE_SHARED}
-CONFIGURE_ENV+=CPPFLAGS='-I${LOCALBASE}/include
-I${LOCALBASE}/include/libpng \
- -I${X11BASE}/include' \
- LDFLAGS='-L${LOCALBASE}/lib -L${X11BASE}/lib' \
- LIBS='-pthread' \
- YACC='bison -y'
+CONFIGURE_STYLE= autoconf
+# Should be 2.65
+AUTOCONF_VERSION= 2.64
+CONFIGURE_ARGS+= --with-distributor="OpenBSD"
+CONFIGURE_ENV+=CPPFLAGS="-I${X11BASE}/include
-I${LOCALBASE}/include/libpng \
+ -I${LOCALBASE}/include" \
+ LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib" \
+ YACC="bison -y" \
+ ac_cv_prog_LEX="gflex"
.include
Index: distinfo
===
RCS file: /home/cvs/ports/games/warzone2100/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo22 Jul 2007 14:57:52 - 1.1.1.1
+++ distinfo11 Oct 2010 01:03:22 -
@@ -1,5 +1,5 @@
-MD5 (warzone2100-2.0.7.tar.bz2) = mDzMZ8/V3zGFxoNsYupyLw==
-RMD160 (warzone2100-2.0.7.tar.bz2) = qNSDZmq2YhtLP9jdl/xOlanZxWs=
-SHA1 (warzone2100-2.0.7.tar.bz2) = +4W+ejAWvSwAbKxkVTjaOn1wJdE=
-SHA256 (warzone2100-2.0.7.tar.bz2) =
5q4rNYTG8YlofL/HejQ5foIQy86rg3ERVcNllOmw+so=
-SIZE (warzone2100-2.0.7.tar.bz2) = 19622856
+MD5 (warzone2100-2.3.5.tar.gz) = HZ1yRVW2JXOp67zfVqTRYA==
+RMD160 (warzone2100-2.3.5.tar.gz) = 8nbx5jbTdbKPTp0ecXpWKp9WsPc=
+SHA1 (warzone2100-2.3.5.tar.gz) = Ej2HssxWA8ySZyuuopuwe9rr0u0=
+SHA256 (warzone2100-2.3.5.tar.gz) =
Op5ChR1rJEl/wH2ujXW74v8TWP+96uot6qYj7AFWpGk=
+SIZE (warzone2100-2.3.5.tar.gz) = 59205795
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 22 Jul 2007 14:57:52 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/07/22 14:57:52 simon Exp $
Makefile.in.orig Sun Jul 22 00:02:49 2007
-+++ Makefile.inSun Jul 22 00:03:05 2007
-@@ -199,7 +199,7 @@ target_alias = @target_alias@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- SUBDIRS = win32 lib src data i
UPDATE: ffmpeg2theora 0.27
An update to ffmpeg2theora 0.27.
Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/ffmpeg2theora/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile19 Nov 2010 07:23:13 - 1.14
+++ Makefile5 Dec 2010 22:16:57 -
@@ -3,8 +3,7 @@
COMMENT= reencode many media file formats to Ogg Theora
N= ffmpeg2theora
-DISTNAME= ${N}-0.26
-REVISION= 0
+DISTNAME= ${N}-0.27
CATEGORIES=multimedia
EXTRACT_SUFX= .tar.bz2
Index: distinfo
===
RCS file: /home/cvs/ports/multimedia/ffmpeg2theora/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo26 May 2010 23:18:45 - 1.4
+++ distinfo5 Dec 2010 22:08:14 -
@@ -1,5 +1,5 @@
-MD5 (ffmpeg2theora-0.26.tar.bz2) = SM2MCvv7K86ZwDKjxuHR2w==
-RMD160 (ffmpeg2theora-0.26.tar.bz2) = nm/tHU2L1y5OLSNbjNzzXQ1fVUE=
-SHA1 (ffmpeg2theora-0.26.tar.bz2) = /UsuMZQairtC/mEMGdxeWa978YY=
-SHA256 (ffmpeg2theora-0.26.tar.bz2) =
uSU0v6mKnZvfzMgalgk6hnpSpMP3XDsiokRTVGcvAU4=
-SIZE (ffmpeg2theora-0.26.tar.bz2) = 93202
+MD5 (ffmpeg2theora-0.27.tar.bz2) = 7GvHQYrrN/IHWSgPI2whSg==
+RMD160 (ffmpeg2theora-0.27.tar.bz2) = pfqGDorcrRxVC5XCLV7PE2ousBY=
+SHA1 (ffmpeg2theora-0.27.tar.bz2) = dIDrU5lXB/Pzd2n1v7WQ5W+UOsY=
+SHA256 (ffmpeg2theora-0.27.tar.bz2) =
Gb6RE7/a6TfQ7FzQ5bgNWzkhluxbb+XblF5mryeqh1o=
+SIZE (ffmpeg2theora-0.27.tar.bz2) = 95300
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: [UPDATE] www/cherokee
On Sunday 19 December 2010 15:17:33 Fernando Quintero wrote: > Hi all, > Attached the patch for cherokee 1.0.8 --> 1.0.14, it's ok on @i386, please > test. A simple bug about system info was reported to the developers, see: > https://code.google.com/p/cherokee/issues/detail?id=1084 With a quick look over the diff I see you missed the @comment markers for the two new plugin libtool wrapper files. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: Repeating segfault in wormux game
On Sun, Dec 12, 2010 at 02:31:39PM +0100, Tomas Bodzar wrote: > $ gdb `which wormux` wormux.core > GNU gdb 6.3 > Copyright 2004 Free Software Foundation, Inc. > GDB is free software, covered by the GNU General Public License, and you are > welcome to change it and/or distribute copies of it under certain conditions. > Type "show copying" to see the conditions. > There is absolutely no warranty for GDB. Type "show warranty" for details. > This GDB was configured as "i386-unknown-openbsd4.8"...(no debugging > symbols found) > > Core was generated by `wormux'. > Program terminated with signal 11, Segmentation fault. > Reading symbols from /usr/lib/libpthread.so.13.1...done. > Loaded symbols for /usr/lib/libpthread.so.13.1 > Reading symbols from /usr/local/lib/libswmhack.so.0.0...done. > Loaded symbols for /usr/local/lib/libswmhack.so.0.0 > Reading symbols from /usr/local/lib/libSDL_net.so.1.1...done. > Loaded symbols for /usr/local/lib/libSDL_net.so.1.1 > Reading symbols from /usr/local/lib/libSDL_ttf.so.8.0...done. > Loaded symbols for /usr/local/lib/libSDL_ttf.so.8.0 > Reading symbols from /usr/local/lib/libSDL_mixer.so.4.0...done. > Loaded symbols for /usr/local/lib/libSDL_mixer.so.4.0 > Reading symbols from /usr/local/lib/libSDL_image.so.3.0...done. > Loaded symbols for /usr/local/lib/libSDL_image.so.3.0 > Reading symbols from /usr/local/lib/libpng.so.10.0...done. > Loaded symbols for /usr/local/lib/libpng.so.10.0 > Reading symbols from /usr/local/lib/libSDL_gfx.so.14.0...done. > Loaded symbols for /usr/local/lib/libSDL_gfx.so.14.0 > Reading symbols from /usr/local/lib/libSDL.so.8.0...done. > Loaded symbols for /usr/local/lib/libSDL.so.8.0 > Reading symbols from /usr/X11R6/lib/libX11.so.14.0...done. > Loaded symbols for /usr/X11R6/lib/libX11.so.14.0 > Reading symbols from /usr/local/lib/libxml2.so.12.0...done. > Loaded symbols for /usr/local/lib/libxml2.so.12.0 > Reading symbols from /usr/lib/libm.so.5.2...done. > Loaded symbols for /usr/lib/libm.so.5.2 > Reading symbols from /usr/local/lib/libintl.so.5.0...done. > Loaded symbols for /usr/local/lib/libintl.so.5.0 > Reading symbols from /usr/local/lib/libcurl.so.17.0...done. > Loaded symbols for /usr/local/lib/libcurl.so.17.0 > Reading symbols from /usr/lib/libstdc++.so.50.0...done. > Loaded symbols for /usr/lib/libstdc++.so.50.0 > Symbols already loaded for /usr/lib/libpthread.so.13.1 > Reading symbols from /usr/lib/libc.so.58.0...done. > Loaded symbols for /usr/lib/libc.so.58.0 > Reading symbols from /usr/local/lib/libiconv.so.6.0...done. > Loaded symbols for /usr/local/lib/libiconv.so.6.0 > Reading symbols from /usr/lib/libsndio.so.4.0...done. > Loaded symbols for /usr/lib/libsndio.so.4.0 > Reading symbols from /usr/lib/libusbhid.so.3.0...done. > Loaded symbols for /usr/lib/libusbhid.so.3.0 > Reading symbols from /usr/X11R6/lib/libfreetype.so.17.2...done. > Loaded symbols for /usr/X11R6/lib/libfreetype.so.17.2 > Reading symbols from /usr/lib/libz.so.4.1...done. > Loaded symbols for /usr/lib/libz.so.4.1 > Reading symbols from /usr/local/lib/libmikmod.so.2.4...done. > Loaded symbols for /usr/local/lib/libmikmod.so.2.4 > Reading symbols from /usr/local/lib/libvorbisfile.so.6.0...done. > Loaded symbols for /usr/local/lib/libvorbisfile.so.6.0 > Reading symbols from /usr/local/lib/libvorbis.so.8.0...done. > Loaded symbols for /usr/local/lib/libvorbis.so.8.0 > Reading symbols from /usr/local/lib/libFLAC.so.9.0...done. > Loaded symbols for /usr/local/lib/libFLAC.so.9.0 > Reading symbols from /usr/local/lib/libogg.so.6.1...done. > Loaded symbols for /usr/local/lib/libogg.so.6.1 > Reading symbols from /usr/local/lib/libsmpeg.so.2.0...done. > Loaded symbols for /usr/local/lib/libsmpeg.so.2.0 > Reading symbols from /usr/local/lib/libtiff.so.38.3...done. > Loaded symbols for /usr/local/lib/libtiff.so.38.3 > Reading symbols from /usr/local/lib/libjpeg.so.64.0...done. > Loaded symbols for /usr/local/lib/libjpeg.so.64.0 > Reading symbols from /usr/X11R6/lib/libxcb.so.2.2...done. > Loaded symbols for /usr/X11R6/lib/libxcb.so.2.2 > Reading symbols from /usr/X11R6/lib/libpthread-stubs.so.1.0...done. > Loaded symbols for /usr/X11R6/lib/libpthread-stubs.so.1.0 > Reading symbols from /usr/X11R6/lib/libXau.so.9.0...done. > Loaded symbols for /usr/X11R6/lib/libXau.so.9.0 > Reading symbols from /usr/X11R6/lib/libXdmcp.so.10.0...done. > Loaded symbols for /usr/X11R6/lib/libXdmcp.so.10.0 > Reading symbols from /usr/local/lib/libidn.so.17.0...done. > Loaded symbols for /usr/local/lib/libidn.so.17.0 > Reading symbols from /usr/lib/libssl.so.16.0...done. > Loaded symbols for /usr/lib/libssl.so.16.0 > Reading symbols from /usr/lib/libcrypto.so.19.0...done. > Loaded symbols for /usr/lib/libcrypto.so.19.0 > Reading symbols from /usr/libexec/ld.so...done. > Loaded symbols for /usr/libexec/ld.so > Reading symbols from /usr/X11R6/lib/libXrender.so.5.0...done. > Loaded symbols for /usr/X11R6/lib/libXrender.so.5.0 > Reading symbols from /usr/X11R6/lib/libXcursor.so.4.0...done. > Loaded sy
UPDATE: cairo 1.10.2
Here is a bug fix update to cairo 1.10.2.
Index: Makefile
===
RCS file: /home/cvs/ports/graphics/cairo/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile17 Nov 2010 08:05:13 - 1.31
+++ Makefile26 Dec 2010 17:42:02 -
@@ -2,8 +2,7 @@
COMMENT= vector graphics library
-DISTNAME= cairo-1.10.0
-REVISION= 0
+DISTNAME= cairo-1.10.2
SHARED_LIBS= cairo 11.0
SHARED_LIBS+= cairo-trace 0.0
SHARED_LIBS+= cairo-gobject 0.0
Index: distinfo
===
RCS file: /home/cvs/ports/graphics/cairo/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo11 Oct 2010 08:09:44 - 1.17
+++ distinfo26 Dec 2010 17:42:54 -
@@ -1,5 +1,5 @@
-MD5 (cairo-1.10.0.tar.gz) = cKLs5mz0c9l24tsPdb8Zng==
-RMD160 (cairo-1.10.0.tar.gz) = +mXU85JjCIV9E/PtDBAPifB13AE=
-SHA1 (cairo-1.10.0.tar.gz) = 7+fkdAjVGIaQIozK3IUjZS9r9wI=
-SHA256 (cairo-1.10.0.tar.gz) = DyzkzEYVWUCI1064tTYLrXw8w8Pam2Gvm/2XntHtlLI=
-SIZE (cairo-1.10.0.tar.gz) = 24022822
+MD5 (cairo-1.10.2.tar.gz) = 8QGp6It4MzeyCy4m39JtXw==
+RMD160 (cairo-1.10.2.tar.gz) = jI3gASA5j+KzpgoI/1mkZLLuv0c=
+SHA1 (cairo-1.10.2.tar.gz) = zM5a4D+ZxQXbl8KGoMmpCpJtPG4=
+SHA256 (cairo-1.10.2.tar.gz) = MgGMeZg1juvCrVeP+NhVnTT8gCUglfEQpXLtI9mJ/EE=
+SIZE (cairo-1.10.2.tar.gz) = 23558405
Index: patches/patch-src_Makefile_in
===
RCS file: /home/cvs/ports/graphics/cairo/patches/patch-src_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-src_Makefile_in
--- patches/patch-src_Makefile_in 11 Oct 2010 08:09:44 - 1.5
+++ patches/patch-src_Makefile_in 26 Dec 2010 17:43:53 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_Makefile_in,v 1.5 2010/10/11 08:09:44 eric Exp $
src/Makefile.in.orig Mon Sep 6 18:16:41 2010
-+++ src/Makefile.inMon Sep 13 17:44:05 2010
-@@ -2425,7 +2425,7 @@ cairo.def: cairo-features.h $(enabled_cairo_headers)
+--- src/Makefile.in.orig Sat Dec 25 09:22:52 2010
src/Makefile.inSun Dec 26 12:43:46 2010
+@@ -2429,7 +2429,7 @@ cairo.def: cairo-features.h $(enabled_cairo_headers)
) >$@
@ ! grep -q cairo_ERROR $@ || ($(RM) $@; false)
Index: patches/patch-src_cairo_h
===
RCS file: patches/patch-src_cairo_h
diff -N patches/patch-src_cairo_h
--- patches/patch-src_cairo_h 11 Oct 2010 08:09:44 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_cairo_h,v 1.1 2010/10/11 08:09:44 eric Exp $
src/cairo.h.orig Sat Oct 9 10:54:20 2010
-+++ src/cairo.hSat Oct 9 10:54:10 2010
-@@ -1973,7 +1973,7 @@ typedef enum _cairo_device_type {
- CAIRO_DEVICE_TYPE_SCRIPT,
- CAIRO_DEVICE_TYPE_XCB,
- CAIRO_DEVICE_TYPE_XLIB,
--CAIRO_DEVICE_TYPE_XML,
-+CAIRO_DEVICE_TYPE_XML
- } cairo_device_type_t;
-
- cairo_public cairo_device_type_t
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/graphics/cairo/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST 17 Oct 2010 12:50:53 - 1.9
+++ pkg/PLIST 26 Dec 2010 17:50:25 -
@@ -63,6 +63,7 @@ share/gtk-doc/html/cairo/cairo-Paths.htm
share/gtk-doc/html/cairo/cairo-PostScript-Surfaces.html
share/gtk-doc/html/cairo/cairo-Quartz-(CGFont)-Fonts.html
share/gtk-doc/html/cairo/cairo-Quartz-Surfaces.html
+share/gtk-doc/html/cairo/cairo-Recording-Surfaces.html
share/gtk-doc/html/cairo/cairo-Regions.html
share/gtk-doc/html/cairo/cairo-SVG-Surfaces.html
share/gtk-doc/html/cairo/cairo-Transformations.html
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: [patch] Add ssl flavour to security/vpnc
On Sunday 26 December 2010 20:35:57 Pascal Stumpf wrote: > This adds an OpenSSL flavour to vpnc. Without OpenSSL, it is pretty > useless for many people in Germany because most VPN Gateways at our > universities use hybrid auth. (And vpnc is the only possibility to get a > connection on *BSD at all.) > > The problem is: It is a GPL violation to distribute a GPL-licensed > program linked to OpenSSL. Compiling your own binary is completely fine, > but it is indistributable. So, is it possible to set PERMIT_PACKAGE_* > conditionally? Not when the library is a system library. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
UPDATE: dnsmasq 2.55
An update to dnsmasq 2.55.
Tested on i386 and lightly tested on amd64.
Index: Makefile
===
RCS file: /home/cvs/ports/net/dnsmasq/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile18 Oct 2010 18:36:46 - 1.17
+++ Makefile29 Dec 2010 00:08:01 -
@@ -2,7 +2,7 @@
COMMENT= caching DNS forwarder and DHCP server
-DISTNAME= dnsmasq-2.51
+DISTNAME= dnsmasq-2.55
CATEGORIES=net
MAINTAINER=Rui Reis
@@ -24,7 +24,7 @@ USE_GROFF = Yes
NO_REGRESS=Yes
pre-build:
- ${SUBST_CMD} ${WRKSRC}/man/dnsmasq.8 \
+ @${SUBST_CMD} ${WRKSRC}/man/dnsmasq.8 \
${WRKSRC}/src/config.h \
${WRKSRC}/dnsmasq.conf.example
Index: distinfo
===
RCS file: /home/cvs/ports/net/dnsmasq/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo27 Dec 2009 19:34:33 - 1.12
+++ distinfo28 Dec 2010 23:53:32 -
@@ -1,5 +1,5 @@
-MD5 (dnsmasq-2.51.tar.gz) = l0ZSYabeUlijw+3+UcoWpA==
-RMD160 (dnsmasq-2.51.tar.gz) = 6hUknW+Kjhu2LcBhiZiFwnkdaig=
-SHA1 (dnsmasq-2.51.tar.gz) = LxYbm86H3mz8GOLIQBd1O9sO8gk=
-SHA256 (dnsmasq-2.51.tar.gz) = CKf5XhqjRL4HaB9RTZkjILhpMsXcLwkaxu3QWZ/5BiI=
-SIZE (dnsmasq-2.51.tar.gz) = 407550
+MD5 (dnsmasq-2.55.tar.gz) = sJPXxrx/l65v010EhSkjKg==
+RMD160 (dnsmasq-2.55.tar.gz) = BhhSFXKoGcjuIDSM67VrWEGm2RE=
+SHA1 (dnsmasq-2.55.tar.gz) = ap+2tDhH5H0Hy+ME6ZoEuWCUIGg=
+SHA256 (dnsmasq-2.55.tar.gz) = z2Ps9Zd/AEdMvamDdqnYdDUAqC/ZjhP0PXA3vOn5+Sk=
+SIZE (dnsmasq-2.55.tar.gz) = 438852
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile 28 Dec 2010 23:57:26 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.orig Tue Dec 28 18:57:01 2010
Makefile Tue Dec 28 18:57:18 2010
+@@ -24,7 +24,7 @@ MSGMERGE = msgmerge
+ MSGFMT = msgfmt
+ XGETTEXT = xgettext
+
+-CFLAGS = -Wall -W -O2
++CFLAGS += -Wall -W
+
+ #
+
Index: patches/patch-bld_Makefile
===
RCS file: patches/patch-bld_Makefile
diff -N patches/patch-bld_Makefile
--- patches/patch-bld_Makefile 14 Jun 2009 17:07:25 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,9 +0,0 @@
-$OpenBSD: patch-bld_Makefile,v 1.2 2009/06/14 17:07:25 kili Exp $
bld/Makefile.orig Mon Jun 8 23:05:30 2009
-+++ bld/Makefile Sat Jun 13 12:05:54 2009
-@@ -1,4 +1,4 @@
--CFLAGS = -Wall -W -O2
-+#CFLAGS = -Wall -W -O2
-
- OBJS = cache.o rfc1035.o util.o option.o forward.o network.o \
-dnsmasq.o dhcp.o lease.o rfc2131.o netlink.o dbus.o bpf.o \
Index: patches/patch-man_dnsmasq_8
===
RCS file: /home/cvs/ports/net/dnsmasq/patches/patch-man_dnsmasq_8,v
retrieving revision 1.7
diff -u -p -r1.7 patch-man_dnsmasq_8
--- patches/patch-man_dnsmasq_8 27 Dec 2009 19:34:33 - 1.7
+++ patches/patch-man_dnsmasq_8 28 Dec 2010 23:55:57 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-man_dnsmasq_8,v 1.7 2009/12/27 19:34:33 sthen Exp $
man/dnsmasq.8.orig Mon Oct 5 22:15:32 2009
-+++ man/dnsmasq.8 Thu Dec 24 14:21:01 2009
-@@ -106,13 +106,12 @@ Specify an alternate path for dnsmasq to record its pr
+--- man/dnsmasq.8.orig Sun Jun 6 15:22:30 2010
man/dnsmasq.8 Tue Dec 28 18:55:44 2010
+@@ -113,13 +113,12 @@ Specify an alternate path for dnsmasq to record its pr
.TP
.B \-u, --user=
Specify the userid to which dnsmasq will change after startup. Dnsmasq must
normally be started as root, but it will drop root
@@ -17,7 +17,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.7 2009
.TP
.B \-v, --version
Print the version number.
-@@ -1011,7 +1010,7 @@ with # are always skipped. This flag may be given on t
+@@ -1133,7 +1132,7 @@ with # are always skipped. This flag may be given on t
line or in a configuration file.
.SH CONFIG FILE
At startup, dnsmasq reads
@@ -26,7 +26,7 @@ $OpenBSD: patch-man_dnsmasq_8,v 1.7 2009
if it exists. (On
FreeBSD, the file is
.I /usr/local/etc/dnsmasq.conf
-@@ -1266,7 +1265,7 @@ dnsmasq has no direct way of determining the charset i
+@@ -1440,7 +1439,7 @@ dnsmasq has no direct way of determining the charset i
assume that it is the system default.
.SH FILES
Index: patches/patch-src_dnsmasq_h
===
RCS file: /home/cvs/ports/net/dnsmasq/patches/patch-src_dnsmasq_h,v
retrieving revision 1.6
diff -u -p -r1.6 patch-src_dnsmasq_h
--- patches/patch-src_dnsmasq_h 14 Jun 2009 17:07:25 - 1.6
+++ patches/patch-src_dnsmasq_h 28 Dec 2010 23:56:01 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-src_dnsmasq_h,v 1.6 2009/06/14 17:07:25 kili
Re: UPDATE: graphics/cairo
- Original message - > This is an update to cairo 1.10.2, with a patch to help it build on gcc2 > archs. Has this been run through a full build on sparc? -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: UPDATE: graphics/cairo
- Original message - > On Mon, Jan 03, 2011 at 08:40:37AM -0500, Brad wrote: > > - Original message - > > > This is an update to cairo 1.10.2, with a patch to help it build on > > > gcc2 archs. > > > > Has this been run through a full build on sparc? > > I asked sebastia@ to test it (he sent me the gcc2 patch). Well that'll take awhile on sparc. Since cairo is already broken on sparc as is it would be better to put this in minus the patch and then put that in once he gets back to you after a full build run. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: USE_GROFF
On Monday 10 January 2011 17:58:22 Mikolaj Kucharski wrote: > Is revision bump needed when adding or removing USE_GROFF? No, right? Yes. The pkg/PLIST file won't change but the package list written to the resulting package is different. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: Package conflicts
- Original message - > pidgin-2.7.9,pidgin-facebookchat-1.68 > /usr/local/share/pixmaps/pidgin/protocols/16/facebook.png > /usr/local/share/pixmaps/pidgin/protocols/22/facebook.png > /usr/local/share/pixmaps/pidgin/protocols/48/facebook.png This has been fixed. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
UPDATE: pecl-APC 3.1.7
Here is an update to pecl-APC 3.1.7.
I don't use this opcode cache so please test.
Index: Makefile
===
RCS file: /home/cvs/ports/www/pecl-APC/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile22 Nov 2010 08:36:52 - 1.15
+++ Makefile16 Jan 2011 06:21:55 -
@@ -4,7 +4,7 @@ SHARED_ONLY=Yes
COMMENT= Alternative PHP Cache
-DISTNAME= APC-3.1.2
+DISTNAME= APC-3.1.7
PKGNAME= pecl-${DISTNAME}
CATEGORIES=www
@@ -12,7 +12,7 @@ HOMEPAGE= http://pecl.php.net/package/AP
MAINTAINER=William Yodlowsky
-# PHP License
+# PHP
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
Index: distinfo
===
RCS file: /home/cvs/ports/www/pecl-APC/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo22 Apr 2009 21:24:09 - 1.6
+++ distinfo16 Jan 2011 06:22:01 -
@@ -1,5 +1,5 @@
-MD5 (APC-3.1.2.tgz) = ChjPFks+BE4n7dTB2MMUXA==
-RMD160 (APC-3.1.2.tgz) = DisETjfhYfpEnV0npyGBIFrffhg=
-SHA1 (APC-3.1.2.tgz) = rr2GawZ3mBTpr1rhaUhoc0fFAFQ=
-SHA256 (APC-3.1.2.tgz) = B4WUrCCOcfRpUpjDLIrBDP70mwnvCESywkJnag6qVF4=
-SIZE (APC-3.1.2.tgz) = 123459
+MD5 (APC-3.1.7.tgz) = lCOYZuXRuQ4CZ16Yily61A==
+RMD160 (APC-3.1.7.tgz) = Ujw7auxrcSqJ42JDy3vyoyl656w=
+SHA1 (APC-3.1.7.tgz) = /TCqecdjLz2pAZM3apEVLRV/qR8=
+SHA256 (APC-3.1.7.tgz) = mlJr2qUeyOhMJBPg+cFQmblRw5yZVDn/L1SjNAqHm3Y=
+SIZE (APC-3.1.7.tgz) = 152735
Index: patches/patch-apc_php
===
RCS file: patches/patch-apc_php
diff -N patches/patch-apc_php
--- patches/patch-apc_php 22 Apr 2009 21:24:09 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,37 +0,0 @@
-$OpenBSD: patch-apc_php,v 1.2 2009/04/22 21:24:09 jasper Exp $
-
-"Get rid of very contrived local-user XSS - can't be triggered from external"
-from upstream CVS
-
apc.php.orig Fri Dec 12 12:37:26 2008
-+++ apc.phpWed Apr 22 10:32:53 2009
-@@ -61,7 +61,7 @@ function defaults($d,$v) {
-
- // rewrite $PHP_SELF to block XSS attacks
- //
--$PHP_SELF= isset($_SERVER['PHP_SELF']) ?
htmlentities(strip_tags($_SERVER['PHP_SELF'],''), ENT_QUOTES) : '';
-+$PHP_SELF= isset($_SERVER['PHP_SELF']) ?
htmlentities(strip_tags($_SERVER['PHP_SELF'],''), ENT_QUOTES, 'UTF-8') : '';
- $time = time();
- $host = getenv('HOSTNAME');
- if($host) { $host = '('.$host.')'; }
-@@ -1091,7 +1091,7 @@ EOB;
- }
- if (!$AUTHENTICATED) {
- // hide all path entries if not logged in
--
$list[$k.$entry[$fieldname]]=preg_replace('/^.*(\\/|)/','/',$entry);
-+
$list[$k.$entry[$fieldname]]=preg_replace('/^.*(\\/|)/','*hidden*/',$entry);
- } else {
- $list[$k.$entry[$fieldname]]=$entry;
- }
-@@ -1110,9 +1110,10 @@ EOB;
- $i=0;
- foreach($list as $k => $entry) {
- if(!$MYREQUEST['SEARCH'] || preg_match($MYREQUEST['SEARCH'],
$entry[$fieldname]) != 0) {
-+$field_value = htmlentities(strip_tags($entry[$fieldname],''),
ENT_QUOTES, 'UTF-8');
- echo
- '',
-- "",$entry[$fieldname],'',
-+ "",$field_value,'',
- '',$entry['num_hits'],'',
- '',$entry['mem_size'],'',
- '',date(DATE_FORMAT,$entry['access_time']),'',
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: [new] x11/irrlicht, [update] games/supertuxkart
On Tuesday 18 January 2011 19:09:08 Pascal Stumpf wrote: > On Tue, Jan 18, 2011 at 10:57:55PM +0100, Matthias Kilian wrote: > > On Tue, Jan 18, 2011 at 12:06:13AM +0100, Pascal Stumpf wrote: > > > > The version you're using in your port is even wrong. A shared library > > > > must have the name libFOO.so.major.minor. I've fixed this (and set > > > > the version to 1.0). Also some cleanups (less patches, allow for > > > > orverriding CC, CXX, CFLAGS, CXXFLAGS etc.). > > > > > > Ok, sorry. It was utterly stupid to follow the FreeBSD port there. :/ > > > But I think we should stick closer to what the authors originally > > > intended, and use $(VERSION_MAJOR).$(VERSION_MINOR) for the library > > > name; the same thing is passed to -soname. > > > > Sure, you can do this for a new port (like Irrlicht) if you like. > > But version numbers vill very soon diverge between with a projects > > version number and the shared library version number. > > > > - Many projects treat version nimbers (for both the project *and* > > shared librararies) based on policy, not on compatility. > > > > - We ports people don't trust upstream on shared library versions, > > and there's a good reason for it. We've seen so many upstream > > minor bumps which contained ABI and API breakage that we prefer > > to decide ourselves on version numbers of shared libs. Yes, that > > means that you will have to read the diffs for any update of > > Irrlicht and to check wether they missed a major bump. > > > > > > Really, I had this fun with poppler (IIRC), where ABI changes > > happened without major bumps from upstream. > > > > Advice of the day: sheared library version numbers are no coupled > > in any way to the projects version numbers. > > > > Ciao, > > Kili > > Hi, > thanks for the advice. What made me choose to follow the upstream > versioning scheme was the fact that by passing 1.7 to -soname, upstream > seemed indicate that major API changes are only due for ‘minor’ > releases. Judging from the changelog, it seems to be true that the third > digit indicates bugfix-only (well, almost …) releases, so the shlib > version suggested in the Makefile reflects that accurately. > > So, I’d just leave it alone for now, and if they really do make changes > to the API in a ‘bugfix-only’ release, we can still do our own bump if > it’s needed. Remove using -soname for linking shared libs with OpenBSD. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
