Re: UPDATE: xcache 1.3.2
Thanks very much, works great with horde, drupal, etc., on amd64 ...
Vijay
On 2011-06-15, at 3:32 PM, Brad wrote:
> Here is a bug fix update to xcache 1.3.2.
>
>
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/www/xcache/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile 16 Jan 2011 07:58:09 - 1.9
> +++ Makefile 15 Jun 2011 20:28:34 -
> @@ -4,7 +4,7 @@ SHARED_ONLY= Yes
>
> COMMENT= fast and stable PHP opcode cacher
>
> -VERSION= 1.3.1
> +VERSION= 1.3.2
> DISTNAME= xcache-${VERSION}
> CATEGORIES= www
> MASTER_SITES= http://xcache.lighttpd.net/pub/Releases/${VERSION}/
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/www/xcache/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo 16 Jan 2011 07:58:09 - 1.4
> +++ distinfo 15 Jun 2011 20:28:42 -
> @@ -1,5 +1,5 @@
> -MD5 (xcache-1.3.1.tar.gz) = r/ebGcdiO6kjIzrhk+lTeg==
> -RMD160 (xcache-1.3.1.tar.gz) = LgMf3ZeKdfRidzIkPCJY0UmSJ5E=
> -SHA1 (xcache-1.3.1.tar.gz) = hvvaP0rxhos2lfMZmETJ50JDfpc=
> -SHA256 (xcache-1.3.1.tar.gz) = vCUd+3LCxKjmGL1JjEMBIe3zgy14j0K/oECoR+sJjJk=
> -SIZE (xcache-1.3.1.tar.gz) = 106879
> +MD5 (xcache-1.3.2.tar.gz) = IF4iCfJOGKawhEpLbFLy5A==
> +RMD160 (xcache-1.3.2.tar.gz) = MNs7+kScSSiyXQLg7OEK/7N7F94=
> +SHA1 (xcache-1.3.2.tar.gz) = 6lVhNt6/eguZBIZQw/HjVkp1EAs=
> +SHA256 (xcache-1.3.2.tar.gz) = KBLTEmexczmXA9V/Fr4/AmPt7lG0LYSoG/Zp4S8YhcU=
> +SIZE (xcache-1.3.2.tar.gz) = 113715
>
> --
> This message has been scanned for viruses and
> dangerous content by MailScanner, and is
> believed to be clean.
>
Vijay Sankar
vsan...@foretell.ca
Re: gtar, xz (was: Re: CVS: cvs.openbsd.org: ports)
On Wed, Jun 15, 2011 at 3:11 PM, Amit Kulkarni wrote: > devel/coccinelle? That looks awesome. Has anyone played with using it for OpenBSD code (e.g., kernel and base)?
Re: gtar, xz (was: Re: CVS: cvs.openbsd.org: ports)
> be most if not all that's required. I don't want to do that manually > for each new release, though. Do we have any source-to-source > compiler tools that can be used to automate this? devel/coccinelle?
gtar, xz (was: Re: CVS: cvs.openbsd.org: ports)
Stuart Henderson wrote: > vim's tar support requires GNU tar to operate correctly; patch the relevant > script to use "gtar" not "tar". This is not added as a run dep to avoid > pulling in extra dependencies, especially xz which requires gcc3+ so is > not available on some arch and is more difficult to build on others. I'm open to arguments that gtar shouldn't depend on xz. Obviously, without xz, creating (with -J) or extracting .tar.xz archives won't work, but otherwise it is not needed. The port only uses the .xz distfile because it already has a RUN_DEPENDS on xz. Alternatively, should we make an effort to build xz on gcc2 archs? Moving all variable declarations to the start of their block should be most if not all that's required. I don't want to do that manually for each new release, though. Do we have any source-to-source compiler tools that can be used to automate this? -- Christian "naddy" Weisgerber na...@mips.inka.de
UPDATE: devel/py-pyro
Please find attached.
OK?
f.-
Index: Makefile
===
RCS file: /cvs/ports/devel/py-pyro/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile 8 Jun 2011 17:39:25 - 1.8
+++ Makefile 15 Jun 2011 18:53:34 -
@@ -2,14 +2,13 @@
COMMENT = distributed object middleware for Python
-MODPY_EGG_VERSION = 3.11
+MODPY_EGG_VERSION = 3.14
DISTNAME = Pyro-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME:L}
-REVISION = 0
CATEGORIES = devel
-HOMEPAGE = http://www.xs4all.nl/~irmen/pyro3/
+HOMEPAGE = http://irmen.home.xs4all.nl/pyro3/
# MIT
PERMIT_PACKAGE_CDROM = Yes
@@ -17,7 +16,7 @@ PERMIT_PACKAGE_FTP = Yes
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
-MASTER_SITES = ${HOMEPAGE}/download/
+MASTER_SITES = ${MASTER_SITE_PYPI:=P/Pyro/}
MODULES = lang/python
Index: distinfo
===
RCS file: /cvs/ports/devel/py-pyro/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 16 Jan 2011 18:07:39 - 1.4
+++ distinfo 15 Jun 2011 18:53:34 -
@@ -1,5 +1,5 @@
-MD5 (Pyro-3.11.tar.gz) = WZqfKyVPKZp1H2DoIKW10A==
-RMD160 (Pyro-3.11.tar.gz) = odYR+TFzMrFMsngGbHdMHUhtFxc=
-SHA1 (Pyro-3.11.tar.gz) = nnqCaj0oTK5tQ3H9oESH7D3q0qA=
-SHA256 (Pyro-3.11.tar.gz) = 7auRTTi73CWu3C1rMa5+m1CYKH0HhEIe7OxrYNiAWUw=
-SIZE (Pyro-3.11.tar.gz) = 295514
+MD5 (Pyro-3.14.tar.gz) = IQEjBCXmx29aounVFny9Ow==
+RMD160 (Pyro-3.14.tar.gz) = q/59Ly496QJ6UqvABpCymkoyeNE=
+SHA1 (Pyro-3.14.tar.gz) = fQZREYZsx1pBltQSqFym1RrmNzM=
+SHA256 (Pyro-3.14.tar.gz) = 8B4y+NHD9CfEkW4T2ejO4k2/kk9ykioGWRUVkRvRN1Y=
+SIZE (Pyro-3.14.tar.gz) = 296905
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-pyro/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST 16 Jan 2011 18:07:39 - 1.5
+++ pkg/PLIST 15 Jun 2011 18:53:34 -
@@ -71,6 +71,13 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/Pyro/protocol.py
lib/python${MODPY_VERSION}/site-packages/Pyro/protocol.pyc
lib/python${MODPY_VERSION}/site-packages/Pyro/protocol.pyo
+lib/python${MODPY_VERSION}/site-packages/Pyro/test/
+lib/python${MODPY_VERSION}/site-packages/Pyro/test/__init__.py
+lib/python${MODPY_VERSION}/site-packages/Pyro/test/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/Pyro/test/__init__.pyo
+lib/python${MODPY_VERSION}/site-packages/Pyro/test/echoserver.py
+lib/python${MODPY_VERSION}/site-packages/Pyro/test/echoserver.pyc
+lib/python${MODPY_VERSION}/site-packages/Pyro/test/echoserver.pyo
lib/python${MODPY_VERSION}/site-packages/Pyro/util.py
lib/python${MODPY_VERSION}/site-packages/Pyro/util.pyc
lib/python${MODPY_VERSION}/site-packages/Pyro/util.pyo
@@ -170,7 +177,9 @@ share/examples/py-pyro/authenticate/serv
share/examples/py-pyro/autoreconnect/
share/examples/py-pyro/autoreconnect/Readme.txt
share/examples/py-pyro/autoreconnect/client.py
+share/examples/py-pyro/autoreconnect/client_no_ns.py
share/examples/py-pyro/autoreconnect/server.py
+share/examples/py-pyro/autoreconnect/server_no_ns.py
share/examples/py-pyro/benchmark/
share/examples/py-pyro/benchmark/Readme.txt
share/examples/py-pyro/benchmark/bench.py
mhash/libmcrypt MODGNU_SHARED_LIBS removal
I spotted a strange undocumented MODGNU_SHARED_LIBS variable
in these and, digging into it, I found the words 'XXX to be killed'
where it's handled in gnu.port.mk. If that's indeed what we want to
do, this diff takes us 2 steps closer.
Besides gnu.port.mk there are another 12 ports using it:
devel/libproplist devel/libtool devel/libusb plan9/9libs print/a2ps
security/dante security/opensc security/pcsc-lite security/towitoko
www/cgicc www/libghttp x11/matchbox/libmatchbox
Comments? OKs?
Index: mhash/Makefile
===
RCS file: /cvs/ports/security/mhash/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- mhash/Makefile 18 Oct 2010 21:41:45 - 1.19
+++ mhash/Makefile 15 Jun 2011 20:30:46 -
@@ -5,8 +5,6 @@ COMMENT=strong hash library
DISTNAME= mhash-0.9.9.9
CATEGORIES=security
SHARED_LIBS= mhash 2.1 # .2.1
-MODGNU_SHARED_LIBS=mhash ''
-LIBmhash_ALIAS=realmhash
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mhash/}
@@ -26,5 +24,8 @@ USE_GROFF = Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
CONFIGURE_ARGS+= --enable-static
+
+MAKE_FLAGS+= librealmhash_la_LDFLAGS='-version-info
${LIBmhash_VERSION:S/./:/}:0' \
+ LIBmhash_LTVERSION='-version-info ${LIBmhash_VERSION:S/./:/}:0'
.include
Index: libmcrypt/Makefile
===
RCS file: /cvs/ports/security/libmcrypt/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- libmcrypt/Makefile 20 Nov 2010 17:22:43 - 1.24
+++ libmcrypt/Makefile 15 Jun 2011 20:30:46 -
@@ -6,8 +6,6 @@ DISTNAME = libmcrypt-2.5.8
REVISION = 1
CATEGORIES = security
SHARED_LIBS = mcrypt 8.7 # .8.7
-MODGNU_SHARED_LIBS = mcrypt ''
-LIBmcrypt_ALIAS = realmcrypt
HOMEPAGE = http://mcrypt.sf.net/
@@ -27,5 +25,8 @@ USE_GROFF = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = ${CONFIGURE_SHARED}
CONFIGURE_ARGS += --enable-static
+
+MAKE_FLAGS += librealmcrypt_la_LDFLAGS='-version-info
${LIBmcrypt_VERSION:S/./:/}:0' \
+ LIBmcrypt_LTVERSION='-version-info
${LIBmcrypt_VERSION:S/./:/}:0'
.include
UPDATE: xcache 1.3.2
Here is a bug fix update to xcache 1.3.2.
Index: Makefile
===
RCS file: /home/cvs/ports/www/xcache/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile16 Jan 2011 07:58:09 - 1.9
+++ Makefile15 Jun 2011 20:28:34 -
@@ -4,7 +4,7 @@ SHARED_ONLY=Yes
COMMENT= fast and stable PHP opcode cacher
-VERSION= 1.3.1
+VERSION= 1.3.2
DISTNAME= xcache-${VERSION}
CATEGORIES=www
MASTER_SITES= http://xcache.lighttpd.net/pub/Releases/${VERSION}/
Index: distinfo
===
RCS file: /home/cvs/ports/www/xcache/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo16 Jan 2011 07:58:09 - 1.4
+++ distinfo15 Jun 2011 20:28:42 -
@@ -1,5 +1,5 @@
-MD5 (xcache-1.3.1.tar.gz) = r/ebGcdiO6kjIzrhk+lTeg==
-RMD160 (xcache-1.3.1.tar.gz) = LgMf3ZeKdfRidzIkPCJY0UmSJ5E=
-SHA1 (xcache-1.3.1.tar.gz) = hvvaP0rxhos2lfMZmETJ50JDfpc=
-SHA256 (xcache-1.3.1.tar.gz) = vCUd+3LCxKjmGL1JjEMBIe3zgy14j0K/oECoR+sJjJk=
-SIZE (xcache-1.3.1.tar.gz) = 106879
+MD5 (xcache-1.3.2.tar.gz) = IF4iCfJOGKawhEpLbFLy5A==
+RMD160 (xcache-1.3.2.tar.gz) = MNs7+kScSSiyXQLg7OEK/7N7F94=
+SHA1 (xcache-1.3.2.tar.gz) = 6lVhNt6/eguZBIZQw/HjVkp1EAs=
+SHA256 (xcache-1.3.2.tar.gz) = KBLTEmexczmXA9V/Fr4/AmPt7lG0LYSoG/Zp4S8YhcU=
+SIZE (xcache-1.3.2.tar.gz) = 113715
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: UPDATE: devel/py-twisted
On Wed, Jun 15, 2011 at 09:54:34PM +0200, Landry Breuil wrote: > On Tue, Jun 14, 2011 at 02:11:44PM +0200, Eric Faurot wrote: > > Hi, > > > > This patch updates Twisted to 11.0.0. > > > > There are still some known issues in the regression suite. I am working > > on that with upstream. > > > > Please test if you use apps depending on Twisted. > > Distfiles are not on MASTER_SITES.. http://twistedmatrix.com/Releases/ > has them. > Giving it a shot on my buildbot/buildslave instances. Seems to work fine ... Landry
Re: fixing automake python macro to find Python 2.6
On Sat, Mar 12, 2011 at 01:40:16PM -0500, Brad wrote:
> On Sat, Mar 12, 2011 at 06:27:28PM +, Stuart Henderson wrote:
> > On 2011/03/12 12:45, Brad wrote:
> > > I noticed the automake python macro does not know how to find
> > > Python 2.6. Here is a patch to fix this.
> >
> > I think it would make sense to check for 2.7 as well..
>
> I see its the last 2.x release anyway. Might as well..
Updated to include automake 1.11.
It would be nice to get this in especially now that Python 2.7 even
is the new default.
Index: 1.10/Makefile
===
RCS file: /home/cvs/ports/devel/automake/1.10/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- 1.10/Makefile 21 May 2011 20:28:58 - 1.10
+++ 1.10/Makefile 15 Jun 2011 19:47:24 -
@@ -4,7 +4,7 @@ COMMENT=GNU standards-compliant Makefil
VERSION= 1.10
DISTNAME= automake-${VERSION}.3
-REVISION= 2
+REVISION= 3
PKGSPEC= automake->=${VERSION},<1.11
CATEGORIES=devel
Index: 1.10/patches/patch-m4_python_m4
===
RCS file: 1.10/patches/patch-m4_python_m4
diff -N 1.10/patches/patch-m4_python_m4
--- /dev/null 1 Jan 1970 00:00:00 -
+++ 1.10/patches/patch-m4_python_m4 15 Jun 2011 19:44:56 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- m4/python.m4.orig Tue Dec 8 14:35:33 2009
m4/python.m4 Sat Mar 12 13:33:29 2011
+@@ -39,7 +39,7 @@ AC_DEFUN([AM_PATH_PYTHON],
+ dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
+ dnl in 1.5.
+ m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
+-[python python2 python2.5 python2.4 python2.3 python2.2
dnl
++[python python2 python2.7 python2.6 python2.5 python2.4
python2.3 python2.2 dnl
+ python2.1 python2.0 python1.6 python1.5])
+
+ m4_if([$1],[],[
Index: 1.11/Makefile
===
RCS file: /home/cvs/ports/devel/automake/1.11/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- 1.11/Makefile 21 May 2011 20:28:58 - 1.4
+++ 1.11/Makefile 15 Jun 2011 19:47:15 -
@@ -4,7 +4,7 @@ COMMENT=GNU standards-compliant Makefil
VERSION= 1.11
DISTNAME= automake-${VERSION}.1
-REVISION= 1
+REVISION= 2
PKGSPEC= automake->=${VERSION},<1.12
CATEGORIES=devel
Index: 1.11/patches/patch-m4_python_m4
===
RCS file: 1.11/patches/patch-m4_python_m4
diff -N 1.11/patches/patch-m4_python_m4
--- /dev/null 1 Jan 1970 00:00:00 -
+++ 1.11/patches/patch-m4_python_m4 15 Jun 2011 19:47:05 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- m4/python.m4.orig Tue Dec 8 13:02:32 2009
m4/python.m4 Wed Jun 15 15:46:57 2011
+@@ -37,7 +37,7 @@ AC_DEFUN([AM_PATH_PYTHON],
+ dnl Find a Python interpreter. Python versions prior to 2.0 are not
+ dnl supported. (2.0 was released on October 16, 2000).
+ m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
+-[python python2 python3 python3.0 python2.5 python2.4
python2.3 python2.2 dnl
++[python python2 python3 python3.0 python2.7 python2.6
python2.5 python2.4 python2.3 python2.2 dnl
+ python2.1 python2.0])
+
+ m4_if([$1],[],[
Index: 1.8/Makefile
===
RCS file: /home/cvs/ports/devel/automake/1.8/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- 1.8/Makefile30 May 2011 09:08:24 - 1.13
+++ 1.8/Makefile15 Jun 2011 19:47:41 -
@@ -4,7 +4,7 @@ COMMENT=GNU standards-compliant Makefil
VERSION= 1.8
DISTNAME= automake-${VERSION}.5
-REVISION= 4
+REVISION= 5
PKGSPEC = automake->=${VERSION},<1.9
CATEGORIES=devel
Index: 1.8/patches/patch-m4_python_m4
===
RCS file: 1.8/patches/patch-m4_python_m4
diff -N 1.8/patches/patch-m4_python_m4
--- /dev/null 1 Jan 1970 00:00:00 -
+++ 1.8/patches/patch-m4_python_m4 15 Jun 2011 19:45:25 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- m4/python.m4.orig Fri Mar 26 15:50:01 2004
m4/python.m4 Sat Mar 12 13:35:48 2011
+@@ -52,7 +52,7 @@ AC_DEFUN([AM_PATH_PYTHON],
+ dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
+ dnl in 1.5.
+ m4_define([_AM_PYTHON_INTERPRETER_LIST],
+-[python python2 python2.4 python2.3 python2.2 dnl
++[python python2 python2.7 python2.6 python2.5 python2.4 python2.3
python2.2 dnl
+ python2.1 python2.0 python1.6 python1.5])
+
+ m4_if([$1],[],[
Index: 1.9/Makefile
===
RCS file: /home/cvs/ports/devel/automake/1.9/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- 1.9/Makefile18 May 2011 19:38:1
Re: UPDATE: devel/py-twisted
On Tue, Jun 14, 2011 at 02:11:44PM +0200, Eric Faurot wrote: > Hi, > > This patch updates Twisted to 11.0.0. > > There are still some known issues in the regression suite. I am working > on that with upstream. > > Please test if you use apps depending on Twisted. Distfiles are not on MASTER_SITES.. http://twistedmatrix.com/Releases/ has them. Giving it a shot on my buildbot/buildslave instances. Landry
UPDATE: xvidcore 1.3.2
A bug fix update to xvidcore 1.3.2.
Mostly bug fixes for Windows or things that don't affect us.
Index: Makefile
===
RCS file: /home/cvs/ports/multimedia/xvidcore/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile20 Mar 2011 23:49:32 - 1.12
+++ Makefile15 Jun 2011 18:52:59 -
@@ -2,7 +2,7 @@
COMMENT= ISO MPEG-4 compliant video codec
-DISTNAME= xvidcore-1.3.0
+DISTNAME= xvidcore-1.3.2
CATEGORIES=multimedia
MASTER_SITES= http://downloads.xvid.org/downloads/
@@ -17,11 +17,13 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
+
WANTLIB= m
WRKDIST= ${WRKDIR}/xvidcore
WRKBUILD= ${WRKSRC}/build/generic
+USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --disable-assembly
CONFIGURE_ENV= API_MAJOR=${LIBxvidcore_VERSION:R} \
@@ -30,7 +32,7 @@ CONFIGURE_ENV=API_MAJOR=${LIBxvidcore_V
NO_REGRESS=Yes
do-install:
- ${INSTALL_DATA} ${WRKBUILD}/=build/libxvidcore.* ${PREFIX}/lib
+ ${INSTALL_DATA} ${WRKBUILD}/=build/libxvidcore.{a,so*} ${PREFIX}/lib
${INSTALL_DATA} ${WRKSRC}/src/xvid.h ${PREFIX}/include
.include
Index: distinfo
===
RCS file: /home/cvs/ports/multimedia/xvidcore/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo20 Mar 2011 23:49:33 - 1.8
+++ distinfo15 Jun 2011 18:38:48 -
@@ -1,5 +1,5 @@
-MD5 (xvidcore-1.3.0.tar.gz) = L/CibXC1MmS8WZlpwrR4gg==
-RMD160 (xvidcore-1.3.0.tar.gz) = 8vUh/9h1dep/YoHi8ms4mwPKbx4=
-SHA1 (xvidcore-1.3.0.tar.gz) = KltQUVkkX60dPSNtyFXKaUnq1ME=
-SHA256 (xvidcore-1.3.0.tar.gz) = ZxwxOFndASuzbG/oGSr2Y1fuQBZi+2ALiTfXxRwr8GI=
-SIZE (xvidcore-1.3.0.tar.gz) = 816578
+MD5 (xvidcore-1.3.2.tar.gz) = h8jPe2nr7ZPC2C6lcJ0Jig==
+RMD160 (xvidcore-1.3.2.tar.gz) = nGhhPan1orKZiPXgvty1y1mVdDg=
+SHA1 (xvidcore-1.3.2.tar.gz) = VuBl0zFUWt4ExjyRFTuWJLUdbhs=
+SHA256 (xvidcore-1.3.2.tar.gz) = hFMnJMR/RS0RZ5YuZKfPNPwiwm9tO3r6cwSjdl6XaJo=
+SIZE (xvidcore-1.3.2.tar.gz) = 817743
Index: patches/patch-build_generic_Makefile
===
RCS file:
/home/cvs/ports/multimedia/xvidcore/patches/patch-build_generic_Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-build_generic_Makefile
--- patches/patch-build_generic_Makefile20 Mar 2011 23:49:33 -
1.3
+++ patches/patch-build_generic_Makefile15 Jun 2011 18:47:03 -
@@ -1,15 +1,15 @@
$OpenBSD: patch-build_generic_Makefile,v 1.3 2011/03/20 23:49:33 edd Exp $
build/generic/Makefile.origTue Jan 11 06:37:52 2011
-+++ build/generic/Makefile Sat Mar 5 16:51:43 2011
-@@ -44,6 +44,7 @@ include sources.inc
- include platform.inc
+--- build/generic/Makefile.origThu May 19 04:27:26 2011
build/generic/Makefile Wed Jun 15 14:46:05 2011
+@@ -46,6 +46,7 @@ include platform.inc
+ endif
RM = rm -rf
+INSTALL = install -c
##
#
-@@ -92,7 +93,7 @@ $(BUILD_DIR):
+@@ -94,7 +95,7 @@ $(BUILD_DIR):
.$(ASSEMBLY_EXTENSION).$(OBJECT_EXTENSION):
@echo " A: $(@D)/$(&6
- echo "${ECHO_T}ok" >&6
+@@ -4333,7 +4331,7 @@ $as_echo "ok" >&6; }
+ $as_echo "ok" >&6; }
STATIC_LIB="libxvidcore.\$(STATIC_EXTENSION)"
SHARED_LIB="libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR).\$(API_MINOR)"
-
SPECIFIC_LDFLAGS="-Wl,-soname,libxvidcore.\$(SHARED_EXTENSION).\$(API_MAJOR)
-shared -lc -lm"
@@ -19,7 +19,7 @@ $OpenBSD: patch-build_generic_configure,
SPECIFIC_CFLAGS="-fPIC"
;;
[cC][yY][gG][wW][iI][nN]*|mingw32*|mks*)
-@@ -4199,7 +4197,7 @@ echo "${ECHO_T}macho32" >&6
+@@ -4597,7 +4595,7 @@ $as_echo "macho32" >&6; }
AS="$chosen_asm_prog"
ASSEMBLY_EXTENSION="asm"
@@ -28,29 +28,29 @@ $OpenBSD: patch-build_generic_configure,
ASSEMBLY_SOURCES="SRC_${ARCHITECTURE}"
if test "$ARCHITECTURE" = "X86_64" ; then
AFLAGS=${AFLAGS}" -DARCH_IS_X86_64"
-@@ -4614,13 +4612,13 @@ echo "${ECHO_T}$ac_cv_header_pthread_h" >&6
-
- fi
- if test $ac_cv_header_pthread_h = yes; then
-- echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
--echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+ echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
-+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -4733,13 +4731,13 @@ done
+ if test x"$pthread" = x"yes" ; then
+ac_fn_c_check_header_mongrel "$LINENO" "pthread.h"
"ac_cv_header_pthread_h" "$ac_includes_default"
+ if test "x$ac_cv_header_pthread_h" = xyes; then :
+- { $as_echo "$as_me:${as_lineno-$LINENO}: che
158 Ofertas, com até 95% OFF: Filé Mignom + Kit Anti-Barriga + Pintado Assado + Buffet de Caldos + Beto Carrero World e Mais!
[IMAGE] 158 Ofertas em Campo Grande / MS Pacote da Beleza !!! 5 Sessões de Esfoliação Mecânica de Alta Frequência + Mascara Facial + Drenagem Facial (Adcos) + 05 Sessões De: R$ 500,00 - Por: R$ 170,00 - (34% de desconto) 2 Revisões para Moto pelo preço de 1 !! Faça a Revisão de sua Moto e ganhe a Revisão de seu Amor Gratis na Moto X De: R$ 100,00 - Por: R$ 29,90 - (30% de desconto) Sensazione di Italia! 58% OFF em 1kg de Rondelli Recheado de Presunto e Mussarela ao Molho Branco com Bacon Congelado na Dona Doces (de R$32,50 por R$13,70) De: R$ 32,00 - Por: R$ 13,70 - (57% de desconto) Super Oferta Depilação Completa de Virilha + Depilação das Axilas + Buço de R$ 45,00 por R$ 9,90 no Centro de Beleza Big Star De: R$ 45,00 - Por: R$ 9,90 - (22% de desconto) 64%OFF na Deliciosa Lingüiça tipo Maracajú do Empório da Costela. Servida com Mandioca+ Arroz+ Vinagrete+ Feijão+ Salada+ e Farofa. De $42 por apenas $14,90, incrível De: R$ 42,00 - Por: R$ 14,90 - (64% de desconto) Só R$ 25 por sessão! Tratamento Corporal com terapias combinadas (Ultravac + Massagem Redutora + Manta Térmica + Ultrasom)!Elimine a gordura localizada por apenas R$ 250,00! De: R$ 550,00 - Por: R$ 250,00 - (54% de desconto) Aproveite o friozinho com Delicioso Sobá médio na Feira Central na barraca do Kashima por apenas R$ 4,99 (54% OFF). (Esgotado) De: R$ 11,00 - Por: R$ 4,99 - (54% de desconto) Inovador, Levantamento de Rosto com Bambuterapia e Colágeno Elastina! De R$ 30,00 por R$ 14,90 ( 60% OFF )! De: R$ 30,00 - Por: R$ 14,90 - (60% de desconto) Super Imperdível, 1 Escova Modeladora com ou sem Chapinha + 1 Argiloterapia Facial + 1 Pé ou Mão de R$120,00 por R$24,90 (80% OFF). De: R$ 120,00 - Por: R$ 24,90 - (80% de desconto) Elimine a gordura indesejada já! Kit Anti-Barriga com Óleo de Cártamo + Colágeno + Chá Verde por apenas R$ 32,00. De: R$ 56,50 - Por: R$ 32,00 - (42% de desconto) Pintou ECOnomia! 78% de Desconto em Recarga de Cartucho Jato de Tinta Preto ou Colorido + Entrega em Domicílio na Eco Office (de até R$23 por R$5) De: R$ 23,00 - Por: R$ 5,00 - (78% de desconto) Adeus Celulite! 67% de desconto em Sessão de Carboxiterapia + Sessão de Ultra Vac + Sessão de Peeling de Diamante Facial no Equilibbrium (de R$300 por apenas R$98) De: R$ 300,00 - Por: R$ 98,00 - (67% de desconto) Tá esperando o que? Cadastre-se e concorra ao sorteio de um netbook! De: R$ 0,00 - Por: R$ 0,00 - (0% de desconto) Como é Grande e Suprema a Natureza na Ilha Bonita! De: R$ 30,00 - Por: R$ 12,00 - (60% de desconto) 08 Sessões do Manthus + 8 Sessões de Drenagem Manual + 1 Pé e Mão com Hidratação Térmica nos Pés, de 800 por 199,00. De: R$ 800,00 - Por: R$ 199,00 - (75% de desconto) Recupere seus cabelos fio a fio com 54% OFF em 5 Sessões de Hidratação Profunda Lowell de R$ 175,00 por apenas R$ 80,00 De: R$ 0,00 - Por: R$ 80,00 - (54% de desconto) 50% de desconto em hidratação de bancos de couro + higienização do ar-condicionado do carro com o Sistema Best Dry. De R$178 por R$89. De: R$ 178,00 - Por: R$ 89,00 - (50% de desconto) Realce o que você tem de melhor!!! 01 Maquiagem Elaborada + Designer de Sobrancelha, no Gel Cabeleireiros, de 105,00 por 35,90. De: R$ 105,00 - Por: R$ 35,90 - (66% de desconto) Atenção Belas de Campo Grande, 60% OFF para ter o Corpo Perfeito!! 05 Sessões de Carboxiterapia para Redução de Medidas de R$ 350,00 por R$ 140,00!! De: R$ 350,00 - Por: R$ 140,00 - (60% de desconto) Como é Grande e Suprema a Natureza em Bonito! De: R$ 30,00 - Por: R$ 12,00 - (60% de desconto) Não é História de Pescador! 58% OFF em Porção de Pintado Assado na Brasa para 02 Pessoas + Acompanhamentos + 02 Chopps da Brahma no Sabor Gaúcho Restaurante e Choperia (de R$70,70 por R$29,70) De: R$ 70,70 - Por: R$ 29,70 - (58% de desconto) 50%OFF em Lavagem externa+Aspiração interna+Cera + Limpeza de pneus e Tapetes de R$25 por R$12,49 ! De: R$ 25,00 - Por: R$ 12,49 - (50% de desconto) 88% em 01 pe e mao + 05 sessoes de parafina, de R$ 250,00 por R$ 30,00 em Gel Cabeleireiros. De: R$ 250,00 - Por: R$ 30,00 - (88% de desconto) O INVERNO NÃO VAI CHEGAR PROS SEUS CABELOS! 70% DE DESCONTO EM LAVAGEM CAPILAR + RESTAURAÇÃO CAPILAR UNI-SYSTEM + ESCOVA MODELADORA NO BELLAS - CABELOS E ESTÉTICA! (DE R$ 50,00 POR R$ 14,99) De: R$ 50,00 - Por: R$ 14,99 - (70% de desconto) Querendo cuidar de seu corpo? 66% OFF em 01 Sessão de Heccus + 01 Sessão de Corrente Russa, de 90,00 por 29,90. De: R$ 90,00 - Por: R$ 29,90 - (67% de desconto) Bonito com Luxo! Diária no Apartamento Luxo Premium Duplo no Zagaia Eco Resort Hotel, de R$ 685,00 por R$ 290,00 ? 58% OFF (em até 12 vezes) De: R$ 685,00 - Por: R$ 290,00 - (58% de desconto) Chegou a Hora De Dar Um Up No Possante!! Alinhamento À Laser + Balanceamento Dos Pneus Dianteiros + Check Up Da Suspensão De Freios + Rodízio Dos Pneus Para Carros De Passeio Aros 13, 14, 15, 16 De R$ 35,53 Por R$ 15,99. São 55% OFF!! De: R$ 35,53 - Por: R$ 15,99 - (55% de desconto) Adeus chapinha!! 76% OFF e
NEW: devel/p5-File-Touch
Perl module that implements a function similar to touch(1). Tgz attached. p5-File-Touch.tgz Description: GNU Zip compressed data
Re: drupal6-securelogin distfile rerolled
On 2011-06-15, Vijay Sankar wrote: >>> I am getting a size mismatch after applying the patch. >> >> make makesum? if you're testing a patch to fix an issue with mismatching distfiles, regenerating makesums isn't the most helpful thing you could do ;) > I thought the new checksums in the patched distinfo would be used. indeed, I had generated them from a "newer than the existing port but older than what's there now" distfile hence the mismatch.
Re: drupal6-securelogin distfile rerolled
On 2011-06-15, at 11:07 AM, Stuart Henderson wrote: > On 2011/06/15 10:53, Vijay Sankar wrote: >> Hi, >> >> I am getting a size mismatch after applying the patch. > > oh, let's just mirror it then...thanks for testing > > Index: Makefile > === > RCS file: /cvs/ports/www/drupal6/securelogin/Makefile,v > retrieving revision 1.4 > diff -u -p -r1.4 Makefile > --- Makefile 15 Nov 2010 09:05:41 - 1.4 > +++ Makefile 15 Jun 2011 16:07:20 - > @@ -2,8 +2,10 @@ > > COMMENT = redirect login screen to https > > -DISTNAME = securelogin-6.x-1.x-dev > +DISTNAME = securelogin-6.x-1.x-dev > PKGNAME = drupal6-securelogin-1 > -REVISION = 1 > +REVISION = 2 > + > +MASTER_SITES = http://spacehopper.org/mirrors/ > > .include > Index: distinfo > === > RCS file: /cvs/ports/www/drupal6/securelogin/distinfo,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 distinfo > --- distinfo 15 Jul 2009 10:44:00 - 1.1.1.1 > +++ distinfo 15 Jun 2011 16:07:20 - > @@ -1,5 +1,5 @@ > -MD5 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = bCxHwR6BMMUL1Ccm/0OwNA== > -RMD160 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = > qH5tjXDen1Zu5KPCY5Kh0HDprhc= > -SHA1 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = xm7riyXG0z9RLQW6KAW+n6m4yAM= > -SHA256 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = > zwvaUuiOwT9wy7/uRJOsZB1rFqdManHLQ2qWH8tRBfc= > -SIZE (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 8361 > +MD5 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 6nit7xJsnUXgxtij3HGgow== > +RMD160 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = > bBCJNikPyje8WwSgDSflZsb0hvo= > +SHA1 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 4ZJxpmuDDHp8UB2i3VYARgyNWtU= > +SHA256 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = > QKql4bbWQo6zS6ae0o3tJxp9AR7o/LqUd04rhUqwEdc= > +SIZE (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 8655 > Thanks very much. I was able to build and install it on a test system. Everything works as expected. Small error patching Makefile -- not sure why amd64# patch -C -p0 < makefile.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -- |Index: Makefile |=== |RCS file: /cvs/ports/www/drupal6/securelogin/Makefile,v |retrieving revision 1.4 |diff -u -p -r1.4 Makefile |--- Makefile 15 Nov 2010 09:05:41 - 1.4 |+++ Makefile 15 Jun 2011 16:07:20 - -- Patching file Makefile using Plan A... patch: malformed patch at line 10: COMMENT = redirect login screen to https distinfo patched without any problems amd64# patch -p0 < distinfo.patch Hmm... Looks like a unified diff to me... The text leading up to this was: -- |Index: distinfo |=== |RCS file: /cvs/ports/www/drupal6/securelogin/distinfo,v |retrieving revision 1.1.1.1 |diff -u -p -r1.1.1.1 distinfo |--- distinfo 15 Jul 2009 10:44:00 - 1.1.1.1 |+++ distinfo 15 Jun 2011 16:07:20 - -- Patching file distinfo using Plan A... Hunk #1 succeeded at 1. done amd64# make clean all ===> Cleaning for drupal6-securelogin-1p2 ===> Checking files for drupal6-securelogin-1p2 >> Fetch http://www.drupal.org/files/projects/securelogin-6.x-1.x-dev.tar.gz securelogin-6.x-1.x-de... 100% || 8655 00:00 >> (SHA256) drupal6/securelogin-6.x-1.x-dev.tar.gz: OK ===> Extracting for drupal6-securelogin-1p2 ===> Patching for drupal6-securelogin-1p2 ===> Configuring for drupal6-securelogin-1p2 amd64# make package ===> Faking installation for drupal6-securelogin-1p2 mkdir -p /home/ports/pobj/drupal6-securelogin-1/fake-amd64/var/www/htdocs/drupal6/sites/all/modules/; cp -R /home/ports/pobj/drupal6-securelogin-1/securelogin /home/ports/pobj/drupal6-securelogin-1/fake-amd64/var/www/htdocs/drupal6/sites/all/modules/; chown -R root.daemon /home/ports/pobj/drupal6-securelogin-1/fake-amd64/var/www/htdocs/drupal6/sites/all/modules/ ===> Building package for drupal6-securelogin-1p2 Create /home/ports/packages/no-arch/drupal6-securelogin-1p2.tgz Link to /home/ports/packages/amd64/all/drupal6-securelogin-1p2.tgz Link to /home/ports/packages/amd64/ftp/drupal6-securelogin-1p2.tgz Link to /home/ports/packages/amd64/cdrom/drupal6-securelogin-1p2.tgz I will report back if there are any issues, once this is on the production server. Thanks again, Vijay Vijay Sankar vsan...@foretell.ca
Re: drupal6-securelogin distfile rerolled
On 2011-06-15, at 11:01 AM, Amit Kulkarni wrote: >> Hi, >> >> I am getting a size mismatch after applying the patch. > > make makesum? > >> amd64# pwd >> /home/ports/www/drupal6/securelogin >> amd64# make clean all >> ===> Cleaning for drupal6-securelogin-1p2 >> ===> Checking files for drupal6-securelogin-1p2 Fetch http://www.drupal.org/files/projects/securelogin-6.x-1.x-dev.tar.gz >> securelogin-6.x-1.x-de... 100% || 8655 00:00 Size does not match for /home/ports/distfiles/drupal6/securelogin-6.x-1.x-dev.tar.gz Fetch ftp://ftp.drupal.org/pub/drupal/files/projects/securelogin-6.x-1.x-dev.tar.gz >> securelogin-6.x-1.x-de... 100% || 8655 00:00 Size does not match for /home/ports/distfiles/drupal6/securelogin-6.x-1.x-dev.tar.gz Fetch http://ftp.openbsd.org/pub/OpenBSD/distfiles/drupal6/securelogin-6.x-1.x-dev.tar.gz >> ftp: Error retrieving file: 404 Not Found Fetch ftp://ftp.usa.openbsd.org/pub/OpenBSD/distfiles/drupal6/securelogin-6.x-1.x-dev.tar.gz >> securelogin-6.x-1.x-de... 100% || 8361 00:00 Size does not match for /home/ports/distfiles/drupal6/securelogin-6.x-1.x-dev.tar.gz >> *** Error code 1 >> >> Stop in /home/ports/www/drupal6/securelogin (line 2684 of >> /home/ports/infrastructure/mk/bsd.port.mk). >> *** Error code 1 >> >> Stop in /home/ports/www/drupal6/securelogin (line 2062 of >> /home/ports/infrastructure/mk/bsd.port.mk). >> *** Error code 1 >> >> Stop in /home/ports/www/drupal6/securelogin (line 2273 of >> /home/ports/infrastructure/mk/bsd.port.mk). >> *** Error code 1 >> >> Stop in /home/ports/www/drupal6/securelogin (line 2221 of >> /home/ports/infrastructure/mk/bsd.port.mk). >> amd64# >> >> On 2011-06-15, at 6:42 AM, Stuart Henderson wrote: >> >>> anyone using securelogin who can test this? only minor changes >>> since the previous distfile. >>> >>> Index: Makefile >>> === >>> RCS file: /cvs/ports/www/drupal6/securelogin/Makefile,v >>> retrieving revision 1.4 >>> diff -u -p -r1.4 Makefile >>> --- Makefile 15 Nov 2010 09:05:41 - 1.4 >>> +++ Makefile 15 Jun 2011 11:41:23 - >>> @@ -2,8 +2,8 @@ >>> >>> COMMENT = redirect login screen to https >>> >>> -DISTNAME = securelogin-6.x-1.x-dev >>> +DISTNAME = securelogin-6.x-1.x-dev >>> PKGNAME = drupal6-securelogin-1 >>> -REVISION = 1 >>> +REVISION = 2 >>> >>> .include >>> Index: distinfo >>> === >>> RCS file: /cvs/ports/www/drupal6/securelogin/distinfo,v >>> retrieving revision 1.1.1.1 >>> diff -u -p -r1.1.1.1 distinfo >>> --- distinfo 15 Jul 2009 10:44:00 - 1.1.1.1 >>> +++ distinfo 15 Jun 2011 11:41:23 - >>> @@ -1,5 +1,5 @@ >>> -MD5 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = bCxHwR6BMMUL1Ccm/0OwNA== >>> -RMD160 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = >>> qH5tjXDen1Zu5KPCY5Kh0HDprhc= >>> -SHA1 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = >>> xm7riyXG0z9RLQW6KAW+n6m4yAM= >>> -SHA256 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = >>> zwvaUuiOwT9wy7/uRJOsZB1rFqdManHLQ2qWH8tRBfc= >>> -SIZE (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 8361 >>> +MD5 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = bF2on2/cibW7YImfPVWA2Q== >>> +RMD160 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = >>> t6N9Y+vXNBvmacil9ZI9FwdmywY= >>> +SHA1 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = >>> FzcjJ0NeFNi2B7zAKQ1b0BurM7U= >>> +SHA256 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = >>> 2MJRxJ5wwfI21x48gdYEwKCZHlbefZ8STUHwVfTsJcI= >>> +SIZE (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 8450 >>> >> >> Vijay Sankar >> vsan...@foretell.ca >> >> >> >> I thought the new checksums in the patched distinfo would be used. Also, the size of the downloaded securelogin-6.x-1.x-dev.tar.gz file is 8361 as listed in the original port and not 8450 as in the patch file. I deleted drupal6/securelogin* and retried. It did not work and I got the same results. Vijay Sankar vsan...@foretell.ca
Re: drupal6-securelogin distfile rerolled
On 2011/06/15 10:53, Vijay Sankar wrote: > Hi, > > I am getting a size mismatch after applying the patch. oh, let's just mirror it then...thanks for testing Index: Makefile === RCS file: /cvs/ports/www/drupal6/securelogin/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- Makefile15 Nov 2010 09:05:41 - 1.4 +++ Makefile15 Jun 2011 16:07:20 - @@ -2,8 +2,10 @@ COMMENT = redirect login screen to https -DISTNAME = securelogin-6.x-1.x-dev +DISTNAME = securelogin-6.x-1.x-dev PKGNAME = drupal6-securelogin-1 -REVISION = 1 +REVISION = 2 + +MASTER_SITES = http://spacehopper.org/mirrors/ .include Index: distinfo === RCS file: /cvs/ports/www/drupal6/securelogin/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo15 Jul 2009 10:44:00 - 1.1.1.1 +++ distinfo15 Jun 2011 16:07:20 - @@ -1,5 +1,5 @@ -MD5 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = bCxHwR6BMMUL1Ccm/0OwNA== -RMD160 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = qH5tjXDen1Zu5KPCY5Kh0HDprhc= -SHA1 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = xm7riyXG0z9RLQW6KAW+n6m4yAM= -SHA256 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = zwvaUuiOwT9wy7/uRJOsZB1rFqdManHLQ2qWH8tRBfc= -SIZE (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 8361 +MD5 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 6nit7xJsnUXgxtij3HGgow== +RMD160 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = bBCJNikPyje8WwSgDSflZsb0hvo= +SHA1 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 4ZJxpmuDDHp8UB2i3VYARgyNWtU= +SHA256 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = QKql4bbWQo6zS6ae0o3tJxp9AR7o/LqUd04rhUqwEdc= +SIZE (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 8655
Re: drupal6-securelogin distfile rerolled
> Hi, > > I am getting a size mismatch after applying the patch. make makesum? > amd64# pwd > /home/ports/www/drupal6/securelogin > amd64# make clean all > ===> Cleaning for drupal6-securelogin-1p2 > ===> Checking files for drupal6-securelogin-1p2 >>> Fetch http://www.drupal.org/files/projects/securelogin-6.x-1.x-dev.tar.gz > securelogin-6.x-1.x-de... 100% || 8655 00:00 >>> Size does not match for >>> /home/ports/distfiles/drupal6/securelogin-6.x-1.x-dev.tar.gz >>> Fetch >>> ftp://ftp.drupal.org/pub/drupal/files/projects/securelogin-6.x-1.x-dev.tar.gz > securelogin-6.x-1.x-de... 100% || 8655 00:00 >>> Size does not match for >>> /home/ports/distfiles/drupal6/securelogin-6.x-1.x-dev.tar.gz >>> Fetch >>> http://ftp.openbsd.org/pub/OpenBSD/distfiles/drupal6/securelogin-6.x-1.x-dev.tar.gz > ftp: Error retrieving file: 404 Not Found >>> Fetch >>> ftp://ftp.usa.openbsd.org/pub/OpenBSD/distfiles/drupal6/securelogin-6.x-1.x-dev.tar.gz > securelogin-6.x-1.x-de... 100% || 8361 00:00 >>> Size does not match for >>> /home/ports/distfiles/drupal6/securelogin-6.x-1.x-dev.tar.gz > *** Error code 1 > > Stop in /home/ports/www/drupal6/securelogin (line 2684 of > /home/ports/infrastructure/mk/bsd.port.mk). > *** Error code 1 > > Stop in /home/ports/www/drupal6/securelogin (line 2062 of > /home/ports/infrastructure/mk/bsd.port.mk). > *** Error code 1 > > Stop in /home/ports/www/drupal6/securelogin (line 2273 of > /home/ports/infrastructure/mk/bsd.port.mk). > *** Error code 1 > > Stop in /home/ports/www/drupal6/securelogin (line 2221 of > /home/ports/infrastructure/mk/bsd.port.mk). > amd64# > > On 2011-06-15, at 6:42 AM, Stuart Henderson wrote: > >> anyone using securelogin who can test this? only minor changes >> since the previous distfile. >> >> Index: Makefile >> === >> RCS file: /cvs/ports/www/drupal6/securelogin/Makefile,v >> retrieving revision 1.4 >> diff -u -p -r1.4 Makefile >> --- Makefile 15 Nov 2010 09:05:41 - 1.4 >> +++ Makefile 15 Jun 2011 11:41:23 - >> @@ -2,8 +2,8 @@ >> >> COMMENT = redirect login screen to https >> >> -DISTNAME = securelogin-6.x-1.x-dev >> +DISTNAME = securelogin-6.x-1.x-dev >> PKGNAME = drupal6-securelogin-1 >> -REVISION = 1 >> +REVISION = 2 >> >> .include >> Index: distinfo >> === >> RCS file: /cvs/ports/www/drupal6/securelogin/distinfo,v >> retrieving revision 1.1.1.1 >> diff -u -p -r1.1.1.1 distinfo >> --- distinfo 15 Jul 2009 10:44:00 - 1.1.1.1 >> +++ distinfo 15 Jun 2011 11:41:23 - >> @@ -1,5 +1,5 @@ >> -MD5 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = bCxHwR6BMMUL1Ccm/0OwNA== >> -RMD160 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = >> qH5tjXDen1Zu5KPCY5Kh0HDprhc= >> -SHA1 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = xm7riyXG0z9RLQW6KAW+n6m4yAM= >> -SHA256 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = >> zwvaUuiOwT9wy7/uRJOsZB1rFqdManHLQ2qWH8tRBfc= >> -SIZE (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 8361 >> +MD5 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = bF2on2/cibW7YImfPVWA2Q== >> +RMD160 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = >> t6N9Y+vXNBvmacil9ZI9FwdmywY= >> +SHA1 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = FzcjJ0NeFNi2B7zAKQ1b0BurM7U= >> +SHA256 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = >> 2MJRxJ5wwfI21x48gdYEwKCZHlbefZ8STUHwVfTsJcI= >> +SIZE (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 8450 >> > > Vijay Sankar > vsan...@foretell.ca > > > >
Re: drupal6-securelogin distfile rerolled
Hi, I am getting a size mismatch after applying the patch. amd64# pwd /home/ports/www/drupal6/securelogin amd64# make clean all ===> Cleaning for drupal6-securelogin-1p2 ===> Checking files for drupal6-securelogin-1p2 >> Fetch http://www.drupal.org/files/projects/securelogin-6.x-1.x-dev.tar.gz securelogin-6.x-1.x-de... 100% || 8655 00:00 >> Size does not match for >> /home/ports/distfiles/drupal6/securelogin-6.x-1.x-dev.tar.gz >> Fetch >> ftp://ftp.drupal.org/pub/drupal/files/projects/securelogin-6.x-1.x-dev.tar.gz securelogin-6.x-1.x-de... 100% || 8655 00:00 >> Size does not match for >> /home/ports/distfiles/drupal6/securelogin-6.x-1.x-dev.tar.gz >> Fetch >> http://ftp.openbsd.org/pub/OpenBSD/distfiles/drupal6/securelogin-6.x-1.x-dev.tar.gz ftp: Error retrieving file: 404 Not Found >> Fetch >> ftp://ftp.usa.openbsd.org/pub/OpenBSD/distfiles/drupal6/securelogin-6.x-1.x-dev.tar.gz securelogin-6.x-1.x-de... 100% || 8361 00:00 >> Size does not match for >> /home/ports/distfiles/drupal6/securelogin-6.x-1.x-dev.tar.gz *** Error code 1 Stop in /home/ports/www/drupal6/securelogin (line 2684 of /home/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /home/ports/www/drupal6/securelogin (line 2062 of /home/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /home/ports/www/drupal6/securelogin (line 2273 of /home/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /home/ports/www/drupal6/securelogin (line 2221 of /home/ports/infrastructure/mk/bsd.port.mk). amd64# On 2011-06-15, at 6:42 AM, Stuart Henderson wrote: > anyone using securelogin who can test this? only minor changes > since the previous distfile. > > Index: Makefile > === > RCS file: /cvs/ports/www/drupal6/securelogin/Makefile,v > retrieving revision 1.4 > diff -u -p -r1.4 Makefile > --- Makefile 15 Nov 2010 09:05:41 - 1.4 > +++ Makefile 15 Jun 2011 11:41:23 - > @@ -2,8 +2,8 @@ > > COMMENT = redirect login screen to https > > -DISTNAME = securelogin-6.x-1.x-dev > +DISTNAME = securelogin-6.x-1.x-dev > PKGNAME = drupal6-securelogin-1 > -REVISION = 1 > +REVISION = 2 > > .include > Index: distinfo > === > RCS file: /cvs/ports/www/drupal6/securelogin/distinfo,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 distinfo > --- distinfo 15 Jul 2009 10:44:00 - 1.1.1.1 > +++ distinfo 15 Jun 2011 11:41:23 - > @@ -1,5 +1,5 @@ > -MD5 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = bCxHwR6BMMUL1Ccm/0OwNA== > -RMD160 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = > qH5tjXDen1Zu5KPCY5Kh0HDprhc= > -SHA1 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = xm7riyXG0z9RLQW6KAW+n6m4yAM= > -SHA256 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = > zwvaUuiOwT9wy7/uRJOsZB1rFqdManHLQ2qWH8tRBfc= > -SIZE (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 8361 > +MD5 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = bF2on2/cibW7YImfPVWA2Q== > +RMD160 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = > t6N9Y+vXNBvmacil9ZI9FwdmywY= > +SHA1 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = FzcjJ0NeFNi2B7zAKQ1b0BurM7U= > +SHA256 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = > 2MJRxJ5wwfI21x48gdYEwKCZHlbefZ8STUHwVfTsJcI= > +SIZE (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 8450 > Vijay Sankar vsan...@foretell.ca
Re: [NEW] sysutils/hotplug-diskmount
Hi! A year ago i tried to submit it to port-tree but currently it's not added :) On Thu, Mar 11, 2010 at 02:27:29PM +0200, Alexey Vatchenko wrote: > I wrote a little utility to easily mount plugged removable disks. It's a kind > of plugin for hotplugd(8). > It mounts partitions of inserted disk under /vol directory tree, naming mount > points according to a disk label. > > Port is attached. > > Home page: http://www.bsdua.org/hotplug-diskmount.html Anyway, after a year of use it on the daily basis i can say that it's stable enough. Several guys told me that they use it also without any problems. Some of them made me resubmit it to port-tree :) Port is attached. http://www.bsdua.org/hotplug-diskmount.html Thanks! hotplug-diskmount.tar.gz Description: application/tar-gz
Re: drupal6-securelogin distfile rerolled
2011/6/15 Stuart Henderson : > On 2011-06-15, wen heping wrote: >> I submitted a patch to fix this problem in April too(not committed). > > Did you test that this still works, or just that it builds? Something changed now since my submission, drupal6-core update to 6.22 , I did not test it now. > > It's kind-of hard for anyone to handle a diff for 21 ports in one go. > I would encourage you to split things up a bit. Thank your suggestion. But sometimes I was confused to whether or not bundle my patches. I shall split these patches if I gain the power to re-create these patches next time :) wen > > http://article.gmane.org/gmane.os.openbsd.ports/47894 > > >
Re: NEW: devel/asm6
On 2011-06-14, Anthony J. Bentley wrote:
>> It might be nice to ask the author if it might be possible to
>> adopt a standard license like the ISC one, or at least add
>> permission to modify.
>
> Talked to the author, he re-rolled the distfile with a modify clause.
>
>> To avoid a systrace warning on gcc4 arch, I would make the
>> first line of do-build look like this:
>>
>> cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${CC} -o asm6 asm6.c
>
> Done. New port attached.
Perfect, thanks. OK sthen@, would anyone like to import it or
give me an ok to do so?
Re: drupal6-securelogin distfile rerolled
On 2011-06-15, wen heping wrote: > I submitted a patch to fix this problem in April too(not committed). Did you test that this still works, or just that it builds? It's kind-of hard for anyone to handle a diff for 21 ports in one go. I would encourage you to split things up a bit. http://article.gmane.org/gmane.os.openbsd.ports/47894
Re: vim / viewing files inside a tar
On Wed, 15 Jun 2011, Stuart Henderson wrote:
> vim allows listing contents of a tar{.gz,bz2}/tgz/... file and
> is supposed to allow viewing of files internal to that tar.
> amongst other things, this is convenient for use with a mail
> client to read files inside a .tgz posted to ports@/etc.
>
> the contents listing does currently works with /bin/tar
> however viewing internal files fails (you just get a blank
> screen) as this requires GNU tar options.
>
> diff below changes tar.vim to use gtar; I haven't added it as
> a run dependency as I don't think it's required in the normal
> case, and the error message when it fails is perfectly clear
> (<***error*** (tar#Browse) "gtar" not available on your system)
> but could do so if preferred.
>
> ok?
ok. And also NOT adding gtar as a run dependency makes sense to me.
Ciao,
David
Re: vim / viewing files inside a tar
On Wed, Jun 15, 2011 at 01:36:10PM +0100, Stuart Henderson wrote:
> vim allows listing contents of a tar{.gz,bz2}/tgz/... file and
> is supposed to allow viewing of files internal to that tar.
> amongst other things, this is convenient for use with a mail
> client to read files inside a .tgz posted to ports@/etc.
>
> the contents listing does currently works with /bin/tar
> however viewing internal files fails (you just get a blank
> screen) as this requires GNU tar options.
>
> diff below changes tar.vim to use gtar; I haven't added it as
> a run dependency as I don't think it's required in the normal
> case, and the error message when it fails is perfectly clear
> (<***error*** (tar#Browse) "gtar" not available on your system)
> but could do so if preferred.
Fwiw, let g:tar_cmd="gtar" in .vimrc achieves the same, i've had it
since a good while, but fixing globally seems saner.
Landry
Re: UPDATE: RabbitMQ-2.5.0 (from maintainer)
On Wed, Jun 15, 2011 at 12:57:24PM +0200, Landry Breuil wrote: > On Wed, Jun 15, 2011 at 02:05:20AM +0200, Piotr Sikora wrote: > > Hello, > > attached are 2 versions of the same patch, which updates RabbitMQ > > port to the latest version. "rabbitmq-2.5.0__with_new_regress.patch" > > is exactly the same as "rabbitmq-2.5.0.patch" but it includes more > > elegant version of the "make regress" target which I made for the > > RabbitMQ-2.4.1 port. > > > > I would prefer version with new regress to be committed, but if > > anyone objects or feels that it shouldn't be combined with the > > update, then we can commit the one without it. It's only "make > > regress", so it doesn't really matter. > > > > Tested on amd64. > > Regress tests fails with bus error on sparc64, but i don't know if it's > a failure from erlang or rabbitmq. I'll retest 2.4.1, and if it was > already failing on sparc64 i'll commit your update, but this should be > looked in. IIRC it was already failing in 1.x so no change there. > Landry -- viq pgp1CgaxMSZbK.pgp Description: PGP signature
vim / viewing files inside a tar
vim allows listing contents of a tar{.gz,bz2}/tgz/... file and
is supposed to allow viewing of files internal to that tar.
amongst other things, this is convenient for use with a mail
client to read files inside a .tgz posted to ports@/etc.
the contents listing does currently works with /bin/tar
however viewing internal files fails (you just get a blank
screen) as this requires GNU tar options.
diff below changes tar.vim to use gtar; I haven't added it as
a run dependency as I don't think it's required in the normal
case, and the error message when it fails is perfectly clear
(<***error*** (tar#Browse) "gtar" not available on your system)
but could do so if preferred.
ok?
Index: Makefile
===
RCS file: /cvs/ports/editors/vim/Makefile,v
retrieving revision 1.120
diff -u -p -r1.120 Makefile
--- Makefile10 Apr 2011 18:01:13 - 1.120
+++ Makefile15 Jun 2011 12:31:09 -
@@ -9,7 +9,7 @@ VERSION=7.3.${REV}
# keep PKGNAME for full version number
PKGNAME= vim-${VERSION}
PKGNAME-main= vim-${VERSION}
-REVISION-main= 0
+REVISION-main= 1
PKGNAME-lang= vim-lang-${VERSION}
P= ${DISTNAME:C/[-\.]//g}
CATEGORIES=editors
Index: patches/patch-runtime_autoload_tar_vim
===
RCS file: patches/patch-runtime_autoload_tar_vim
diff -N patches/patch-runtime_autoload_tar_vim
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-runtime_autoload_tar_vim 15 Jun 2011 12:31:09 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- runtime/autoload/tar.vim.orig Wed Jun 15 13:27:21 2011
runtime/autoload/tar.vim Wed Jun 15 13:30:00 2011
+@@ -42,7 +42,7 @@ if !exists("g:tar_readoptions")
+ let g:tar_readoptions= "OPxf"
+ endif
+ if !exists("g:tar_cmd")
+- let g:tar_cmd= "tar"
++ let g:tar_cmd= "gtar"
+ endif
+ if !exists("g:tar_writeoptions")
+ let g:tar_writeoptions= "uf"
Re: UPDATE: RabbitMQ-2.5.0 (from maintainer)
Hi, Regress tests fails with bus error on sparc64, but i don't know if it's a failure from erlang or rabbitmq. I'll retest 2.4.1, and if it was already failing on sparc64 i'll commit your update, but this should be looked in. We looked into this with viq a while ago and it turned out that it was "erl_call" (part of Erlang) that SIGBUSes very early on: --- #0 0x00108924 in ei_gethostbyname_r () #1 0x00107e6c in ei_connect_tmo () #2 0x00104074 in main () --- If anyone with access to sparc64 (and possibly some Erlang knowledge) could look further into this, that would be great. btw: any words on Erlang-14bXX update? Best regards, Piotr Sikora < piotr.sik...@frickle.com >
Re: drupal6-securelogin distfile rerolled
I submitted a patch to fix this problem in April too(not committed). wen 2011/6/15 Stuart Henderson : > anyone using securelogin who can test this? only minor changes > since the previous distfile. > > Index: Makefile > === > RCS file: /cvs/ports/www/drupal6/securelogin/Makefile,v > retrieving revision 1.4 > diff -u -p -r1.4 Makefile > --- Makefile 15 Nov 2010 09:05:41 - 1.4 > +++ Makefile 15 Jun 2011 11:41:23 - > @@ -2,8 +2,8 @@ > > COMMENT = redirect login screen to https > > -DISTNAME = securelogin-6.x-1.x-dev > +DISTNAME = securelogin-6.x-1.x-dev > PKGNAME = drupal6-securelogin-1 > -REVISION = 1 > +REVISION = 2 > > .include > Index: distinfo > === > RCS file: /cvs/ports/www/drupal6/securelogin/distinfo,v > retrieving revision 1.1.1.1 > diff -u -p -r1.1.1.1 distinfo > --- distinfo 15 Jul 2009 10:44:00 - 1.1.1.1 > +++ distinfo 15 Jun 2011 11:41:23 - > @@ -1,5 +1,5 @@ > -MD5 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = bCxHwR6BMMUL1Ccm/0OwNA== > -RMD160 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = > qH5tjXDen1Zu5KPCY5Kh0HDprhc= > -SHA1 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = xm7riyXG0z9RLQW6KAW+n6m4yAM= > -SHA256 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = > zwvaUuiOwT9wy7/uRJOsZB1rFqdManHLQ2qWH8tRBfc= > -SIZE (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 8361 > +MD5 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = bF2on2/cibW7YImfPVWA2Q== > +RMD160 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = > t6N9Y+vXNBvmacil9ZI9FwdmywY= > +SHA1 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = FzcjJ0NeFNi2B7zAKQ1b0BurM7U= > +SHA256 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = > 2MJRxJ5wwfI21x48gdYEwKCZHlbefZ8STUHwVfTsJcI= > +SIZE (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 8450 > >
drupal6-securelogin distfile rerolled
anyone using securelogin who can test this? only minor changes since the previous distfile. Index: Makefile === RCS file: /cvs/ports/www/drupal6/securelogin/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- Makefile15 Nov 2010 09:05:41 - 1.4 +++ Makefile15 Jun 2011 11:41:23 - @@ -2,8 +2,8 @@ COMMENT = redirect login screen to https -DISTNAME = securelogin-6.x-1.x-dev +DISTNAME = securelogin-6.x-1.x-dev PKGNAME = drupal6-securelogin-1 -REVISION = 1 +REVISION = 2 .include Index: distinfo === RCS file: /cvs/ports/www/drupal6/securelogin/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo15 Jul 2009 10:44:00 - 1.1.1.1 +++ distinfo15 Jun 2011 11:41:23 - @@ -1,5 +1,5 @@ -MD5 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = bCxHwR6BMMUL1Ccm/0OwNA== -RMD160 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = qH5tjXDen1Zu5KPCY5Kh0HDprhc= -SHA1 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = xm7riyXG0z9RLQW6KAW+n6m4yAM= -SHA256 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = zwvaUuiOwT9wy7/uRJOsZB1rFqdManHLQ2qWH8tRBfc= -SIZE (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 8361 +MD5 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = bF2on2/cibW7YImfPVWA2Q== +RMD160 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = t6N9Y+vXNBvmacil9ZI9FwdmywY= +SHA1 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = FzcjJ0NeFNi2B7zAKQ1b0BurM7U= +SHA256 (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 2MJRxJ5wwfI21x48gdYEwKCZHlbefZ8STUHwVfTsJcI= +SIZE (drupal6/securelogin-6.x-1.x-dev.tar.gz) = 8450
Update: net/samba 3.5.9
Bug fix update for Samba to version 3.5.9 http://www.samba.org/samba/history/samba-3.5.9.html Ian McWilliam samba-3.5.9.diff Description: Binary data
Re: UPDATE: RabbitMQ-2.5.0 (from maintainer)
On Wed, Jun 15, 2011 at 02:05:20AM +0200, Piotr Sikora wrote: > Hello, > attached are 2 versions of the same patch, which updates RabbitMQ > port to the latest version. "rabbitmq-2.5.0__with_new_regress.patch" > is exactly the same as "rabbitmq-2.5.0.patch" but it includes more > elegant version of the "make regress" target which I made for the > RabbitMQ-2.4.1 port. > > I would prefer version with new regress to be committed, but if > anyone objects or feels that it shouldn't be combined with the > update, then we can commit the one without it. It's only "make > regress", so it doesn't really matter. > > Tested on amd64. Regress tests fails with bus error on sparc64, but i don't know if it's a failure from erlang or rabbitmq. I'll retest 2.4.1, and if it was already failing on sparc64 i'll commit your update, but this should be looked in. Landry
Re: [new] Dokuwiki
On Wed, Jun 15, 2011 at 11:58:38AM +0200, Landry Breuil wrote:
> On Wed, Jun 15, 2011 at 11:41:35AM +0200, Pierre-Emmanuel André wrote:
> > Hi,
> >
> > DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at
> > creating documentation of any kind. It is targeted at developer teams,
> > workgroups and small companies. It has a simple but powerful syntax
> > which makes sure the datafiles remain readable outside the Wiki and
> > eases the creation of structured texts. All data is stored in plain text
> > files, no database is required.
> >
> > Homepage: http://www.dokuwiki.org/dokuwiki
>
> I like, but why so much pain with the version ?
>
> DISTNAME=dokuwiki-2011-05-25a
> PKGNAME=${DISTNAME:S/-05-/.05./}
>
> no ?
Yeah, you're right. It's way better :)
> Other than that it looks good at first sight.
>
> Landry
--
Pierre-Emmanuel André
GPG key: 0x7AE329DC
Re: [new] Dokuwiki
On Wed, Jun 15, 2011 at 11:41:35AM +0200, Pierre-Emmanuel André wrote:
> Hi,
>
> DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at
> creating documentation of any kind. It is targeted at developer teams,
> workgroups and small companies. It has a simple but powerful syntax
> which makes sure the datafiles remain readable outside the Wiki and
> eases the creation of structured texts. All data is stored in plain text
> files, no database is required.
>
> Homepage: http://www.dokuwiki.org/dokuwiki
I like, but why so much pain with the version ?
DISTNAME=dokuwiki-2011-05-25a
PKGNAME=${DISTNAME:S/-05-/.05./}
no ?
Other than that it looks good at first sight.
Landry
[new] Dokuwiki
Hi, DokuWiki is a standards compliant, simple to use Wiki, mainly aimed at creating documentation of any kind. It is targeted at developer teams, workgroups and small companies. It has a simple but powerful syntax which makes sure the datafiles remain readable outside the Wiki and eases the creation of structured texts. All data is stored in plain text files, no database is required. Homepage: http://www.dokuwiki.org/dokuwiki Feedbacks welcome. Regards, -- Pierre-Emmanuel André GPG key: 0x7AE329DC dokuwiki-2011.05.25a.tgz Description: application/tar-gz
Re: update: audio/sox 14.3.0 -> 14.3.2
On Jun 15 09:30:42, Stuart Henderson wrote:
> In gmane.os.openbsd.ports, you wrote:
> > This brings audio/sox to the latest release,
> > adds myself as MAINTAINER as the port didn't have one,
> > and deletes an unnecessary "-I" option that was solved upstream.
> > http://sourceforge.net/mailarchive/message.php?msg_id=27073571
>
> thanks, committed with the following tweaks;
>
> - a function was renamed (and some new ones added), so bump
> library major. (not hugely important as nothing depends on the
> library, but it is correct to do this).
>
> - zap REVISION
>
> - more specific GPL version info (v2 or newer => v2+)
It seems we don't even need the patch file:
$OpenBSD: patch-src_formats_c,v 1.1 2009/11/06 00:04:37 sthen Exp $
--- src/formats.c.orig Tue Jun 14 14:47:49 2011
+++ src/formats.c Tue Jun 14 14:48:58 2011
@@ -407,7 +407,7 @@
/* To fix this #error, either simply remove the #error line and live without
* file-type detection with pipes, or add support for your compiler in the
* lines above. Test with cat monkey.au | ./sox --info - */
- #error FIX NEEDED HERE
+ /*#error FIX NEEDED HERE*/
#define NO_REWIND_PIPE
(void)fp;
#endif
Looking at the source, this patch just comments out this #error:
/* Hack to rewind pipes (a small amount).
* Works by resetting the FILE buffer pointer */
static void UNUSED rewind_pipe(FILE * fp)
{
/* _FSTDIO is for Torek stdio (i.e. most BSD-derived libc's)
* In theory, we no longer need to check _NEWLIB_VERSION or __APPLE__ */
#if defined _FSTDIO || defined _NEWLIB_VERSION || defined __APPLE__
fp->_p -= AUTO_DETECT_SIZE;
fp->_r += AUTO_DETECT_SIZE;
#elif defined __GLIBC__
fp->_IO_read_ptr = fp->_IO_read_base;
#elif defined _MSC_VER || defined __MINGW_H || defined _ISO_STDIO_ISO_H
fp->_ptr = fp->_base;
#else
/* To fix this #error, either simply remove the #error line and live without
* file-type detection with pipes, or add support for your compiler in the
* lines above. Test with cat monkey.au | ./sox --info - */
#error FIX NEEDED HERE
#define NO_REWIND_PIPE
(void)fp;
#endif
}
So we are already "supported" in the FSTDIO branch,
and we can just leave the #error there.
$ grep -Fr FSTDIO /usr/include/
/usr/include/stdio.h:#define _FSTDIO /* Define for new stdio with functions. */
SoX so compiled indeed does filetype detection on pipes
(at least on my 4.9/i386 and current/amd64).
Jan
IncríveisOfertas - 60% OFF em Levantamento Facial com Bambuterapia e Colágeno | Kit Anti Barriga 40% OFF | Sobá Esgot =?utf-8?B?YWRvIHwgMWtnIGRlIFJvbmRlbGxpI
Adicione incriveis_oferta...@querohost.com.br aos seus endere�os para receber sempre os nossos emails. www.incriveisofertas.com [IMAGE] Super Imperd�vel, 1 Escova Modeladora com ou sem Chapinha + 1 Argiloterapia Facial + 1 P� ou M�o de R$120,00 por R$24,90 (80% OFF). de R$ 120,00 por R$ R$ 24,90 [IMAGE] Sensazione di Italia! 58% OFF em 1kg de Rondelli Recheado de Presunto e Mussarela ao Molho Branco com Bacon Congelado na Dona Doces (de R$32,50 por R$13,70) de R$ 32,00 por R$ R$ 13,70 [IMAGE] Inovador, Levantamento de Rosto com Bambuterapia e Col�geno Elastina! De R$ 30,00 por R$ 14,90 ( 60% OFF )! de R$ 30,00 por R$ R$ 14,90 [IMAGE] Elimine a gordura indesejada j�! Kit Anti-Barriga com �leo de C�rtamo + Col�geno + Ch� Verde por apenas R$ 32,00. de R$ 56,50 por R$ R$ 32,00 [IMAGE] Aproveite o friozinho com Delicioso Sob� m�dio na Feira Central na barraca do Kashima por apenas R$ 4,99 (54% OFF). de R$ 11,00 por R$ R$ 4,99 [IMAGE] Não desejo mais receber estes e-mails.
