Re: Comments? ap2 flavor for www/mod_fastcgi
* Simon Bertrang wrote: On Wed, Sep 12, 2007 at 04:17:53PM -0700, Roland Philippsen wrote: Simon Bertrang wrote: On Mon, Sep 10, 2007 at 11:59:27PM -0400, Mike Erdely wrote: On Sun, Sep 09, 2007 at 12:57:30PM -0700, Roland Philippsen wrote: here's a suggestion for adding an Apache2-flavor to www/mod_fastcgi. The patch (created with git) is best applied using 'patch -p2' from within the mod_fastcgi directory. ... I made a couple tweaks and used cvs diff (below). ... Another proposal using MULTI_PACKAGES instead of FLAVOR which allows to install both at the same time. patches/patch-fcgi_h works in both version, so i changed it to apply unconditionally which make the Makefile even smaller. Thanks for the input. I didn't test your patch yet, but... The reason why I hadn't opted for MULTI_PACKAGES was that it would change the default behavior of the port. People who want just the good old thing would be forced to specify SUBPACKAGE=main in the environment when building mod_fastcgi, otherwise they're forced to install apache-httpd, which might not be exactly what they want. Or am I missing something here? No, i actually thought about it and probably a pseudo flavor like ap2 could enable the additional package. If you like to you can sprinkle the required .if's other the few places where it matters. I think the maintainer will also have an opinion to that and he's on the cc list now... mbalmer enlighten us :-) I don't use Apache 2. I just ask you guys to not change the default behaviour (for the in-tree Apache) and that a final diff has my ok on it. Regards, Simon
request for EMBOSS
Hi list, I'd like to ask if anyone would be willing to make a package of EMBOSS, http://emboss.sourceforge.net/, for OpenBSD? This is free analog of industry standard GCG pack, used mostly for molecular biology. I'd be glad to pay small fee of 50 euros for such package or as an alternative pre-order 4.2 for person who make it. Would be really nice if it worked on sparc64 as well. Regards, Igor Ralets Post doc at CNS Gene Therapy Unit, Lund University, Sweden
Re: NEW: devel/cutils
On Wed, Sep 12, 2007 at 02:55:11PM +0300, Paul Irofti wrote:
On Wed, Sep 12, 2007 at 10:59:02AM +0100, Stuart Henderson wrote:
On 2007/09/12 11:24, Paul Irofti wrote:
Fixed the warning and attached the actual port not the blobs.
thanks, here it is again with a little tidying:
add $Id$
lowercase COMMENT, remove
PKGNAME= already defaults to ${DISTNAME}
add HOMEPAGE (not much info there, but I think it makes sense,
and oh cool, there's a repton clone :-)
add comment with license info
add WANTLIB
spaces to tabs
no need for CONFIGURE_SHARED
unfortunately the yacc tools this provides don't grok most of
the pfctl-derived parse.y
Thanks for the clean-up!
ok on i386, but you should add
NO_REGRESS=yes
I will test on sparc64 later on and report results.
I hope somebody will commit this because these are very usefull tools.
Regards,
ahb
wmii window manager port update
Can someone please update this wm in the ports tree to the latest version ? It is still a very old and unsupported version being present at the moment (3.1). There's already an unofficial one here: http://marc.info/?l=openbsd-portsm=118151081820139w=2 that I've tested and works, but it's not in the ports tree yet. I think the 4.2 release would really deserve to have such a wonderful window manager in the official ports tree and as a package. Thanks in advance, Catalin Stoian http://unixlust.com
Re: wmii window manager port update
On Thu, Sep 13, 2007 at 11:43:11AM +0200, Catalin Stoian wrote:
Can someone please update this wm in the ports tree to the latest
version ? It is still a very old and unsupported version being present
at the moment (3.1). There's already an unofficial one here:
http://marc.info/?l=openbsd-portsm=118151081820139w=2 that I've
tested and works, but it's not in the ports tree yet. I think the 4.2
release would really deserve to have such a wonderful window manager
in the official ports tree and as a package. Thanks in advance,
way, way too late for 4.2 release.
here's that port as a diff against the x11/wmii in-tree port,
with some tweaks.
testing on amd64 looks good so far.
Benoit, are you going to take over maintainership of this?
--
[EMAIL PROTECTED]
SDF Public Access UNIX System - http://sdf.lonestar.org
Index: Makefile
===
RCS file: /home/cvs/OpenBSD/ports/x11/wmii/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile17 Jun 2007 09:06:03 - 1.6
+++ Makefile13 Sep 2007 10:23:08 -
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.6 2007/06/17 09:06:03 steven Exp $
+# $OpenBSD$
-COMMENT= dynamic window manager
+COMMENT= dynamic window manager
-DISTNAME= wmii-3.1
-PKGNAME= ${DISTNAME}p2
-CATEGORIES=x11
+DISTNAME= wmii+ixp-20070516
+PKGNAME= ${DISTNAME:S/+ixp//}
+CATEGORIES=x11
-HOMEPAGE= http://wmii.suckless.org
+HOMEPAGE= http://www.suckless.org/wiki/wmii
# MIT/X
PERMIT_PACKAGE_CDROM= Yes
@@ -14,19 +14,13 @@
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${HOMEPAGE}/download/
+WANTLIB= X11 Xext c m
-WANTLIB= X11 c m
+MASTER_SITES= http://www.suckless.org/snaps/
+EXTRACT_SUFX= .tgz
-USE_X11= Yes
-
-NO_REGRESS=Yes
-
-FAKE_FLAGS=SYSCONFDIR=${SYSCONFDIR}
-
-post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/wmii-3
- ${INSTALL_DATA} ${WRKINST}${SYSCONFDIR}/wmii-3/* \
- ${PREFIX}/share/examples/wmii-3
+USE_X11= Yes
+NO_REGRESS=Yes
.include bsd.port.mk
+
Index: distinfo
===
RCS file: /home/cvs/OpenBSD/ports/x11/wmii/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo5 Apr 2007 17:36:25 - 1.3
+++ distinfo13 Sep 2007 10:23:08 -
@@ -1,5 +1,5 @@
-MD5 (wmii-3.1.tar.gz) = EIFHpCg7120qduR7sMlrrA==
-RMD160 (wmii-3.1.tar.gz) = xauqCYKwNrja+iJHUbgNgmXBn1k=
-SHA1 (wmii-3.1.tar.gz) = NjtSIH0lBdWSGtvNqYE27iQKZz0=
-SHA256 (wmii-3.1.tar.gz) = k0KKTe/P+eFPKLkH8ifVZXBmqYOp719KbU5fq1bncWs=
-SIZE (wmii-3.1.tar.gz) = 60935
+MD5 (wmii+ixp-20070516.tgz) = LQvXOHCk0811xEVOBNvT2w==
+RMD160 (wmii+ixp-20070516.tgz) = bl2myZt3Aj6z6F+NKnfV9duk8tQ=
+SHA1 (wmii+ixp-20070516.tgz) = n1AfIwU+FaAWHAUNm3sRul+wBsE=
+SHA256 (wmii+ixp-20070516.tgz) = iuxAcxx794J7VzOvHad4fQJzS6Vrv+RZjpy/4iRGkQQ=
+SIZE (wmii+ixp-20070516.tgz) = 84114
Index: patches/patch-cmd_wm_area_c
===
RCS file: patches/patch-cmd_wm_area_c
diff -N patches/patch-cmd_wm_area_c
--- patches/patch-cmd_wm_area_c 17 Jun 2006 17:42:03 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
cmd/wm/area.c.orig Sat Jun 17 13:44:30 2006
-+++ cmd/wm/area.c Sat Jun 17 19:39:01 2006
-@@ -150,7 +150,7 @@ place_client(Area *a, Client *c)
- static unsigned int mx, my;
- static Bool *field = nil;
- Bool fit = False;
-- unsigned int i, j, k, x, y, maxx, maxy, dx, dy, cx, cy, diff;
-+ unsigned int i, j, k, x, y, maxx, maxy, dx, dy, cx = 0, cy = 0, diff;
- XPoint p1 = {0, 0}, p2 = {0, 0};
- Frame *f = c-frame.data[c-sel];
-
Index: patches/patch-config_mk
===
RCS file: /home/cvs/OpenBSD/ports/x11/wmii/patches/patch-config_mk,v
retrieving revision 1.2
diff -u -r1.2 patch-config_mk
--- patches/patch-config_mk 17 Jun 2006 17:42:03 - 1.2
+++ patches/patch-config_mk 13 Sep 2007 10:23:08 -
@@ -1,22 +1,28 @@
config.mk.orig Sat Jun 17 13:44:29 2006
-+++ config.mk Sat Jun 17 19:28:41 2006
-@@ -2,8 +2,8 @@
+$OpenBSD$
+--- config.mk.orig Wed May 9 19:04:41 2007
config.mk Sun Jun 10 22:23:06 2007
+@@ -1,10 +1,10 @@
+ # Customize below to fit your system
# paths
- PREFIX = /usr/local
--CONFPREFIX = ${PREFIX}/etc
--MANPREFIX = ${PREFIX}/share/man
-+CONFPREFIX = ${SYSCONFDIR}
-+MANPREFIX = ${PREFIX}/man
+-PREFIX = /usr/local
++#PREFIX = /usr/local
+ BIN = ${PREFIX}/bin
+-MAN = ${PREFIX}/share/man
+-ETC = ${PREFIX}/etc
++MAN = ${PREFIX}/man
++ETC = ${PREFIX}/share/examples/wmii
+ LIBDIR = ${PREFIX}/lib
+ INCLUDE = ${PREFIX}/include
- X11INC = /usr/X11R6/include
- X11LIB = /usr/X11R6/lib
-@@ -14,7 +14,7 @@ VERSION =
Re: NEW: devel/cutils
On 2007/09/13 10:56, Andreas Bihlmaier wrote: NO_REGRESS=yes thanks - fixed, also tested on sparc64 now. ok? cutils.tgz Description: application/tar-gz
Re: UPDATE: vpnc - 0.5.1
hello, runs fine for me on macppc and i386 against a Cisco Systems, Inc./VPN 3000 Concentrator Version 4.1.7.Q suggestions: - remove .orig files - install a sample split tunnel script split.sh: #!/bin/sh # this effectively disables changes to /etc/resolv.conf INTERNAL_IP4_DNS= # This sets up split networking regardless # of the concentrators specifications. # You can add as many routes as you want, # but you must set the counter $CISCO_SPLIT_INC # accordingly CISCO_SPLIT_INC=1 CISCO_SPLIT_INC_0_ADDR=10.0.0.0 CISCO_SPLIT_INC_0_MASK=255.255.0.0 CISCO_SPLIT_INC_0_MASKLEN=16 CISCO_SPLIT_INC_0_PROTOCOL=0 CISCO_SPLIT_INC_0_SPORT=0 CISCO_SPLIT_INC_0_DPORT=0 . /etc/vpnc/vpnc-script - patch against vpnc-script that not existing routes get not removed(prevents error messages in split tunnel mode). but i do know how to check if a route exists which handle special netmask because route/netstat shows routes in cidr notation. tomorrow i will see if dead peer detection and rekeying works. thomas On Wed, Sep 12, 2007 at 09:47:08PM -0500, Aaron Hsu wrote: The compressed archive of the port is available at http://www.sacrificumdeo.net/vpnc.tar.gz -- ((name Aaron Hsu) (email/xmpp [EMAIL PROTECTED]) (phone 703-597-7656) (site http://www.aaronhsu.com;))
Re: Comments? ap2 flavor for www/mod_fastcgi
On Thu, Sep 13, 2007 at 09:28:56AM +0200, Marc Balmer wrote:
I don't use Apache 2. I just ask you guys to not change the default
behaviour (for the in-tree Apache) and that a final diff has my ok on
it.
I made some changes that fix what Roland mentioned earlier in the thread:
http://marc.info/?l=openbsd-portsm=118965843013806w=2
Changes:
- s/\${GMAKE}/${MAKE}/ (gmake is not needed)
- I moved Simon's post-patch section to pre-patch. This was the crux
of Roland's issue (I saw it too with Apache2) that chroot specific
patches were adding unnecessary symbols to the ap2 version.
- I added a post-patch which only patches the ap2 specific files, even
though the fcgi.h patch doesn't seem to affect the ap1 version, it's
not necessary.
I tested this on i386 and macppc. ap1 version works as it always did.
ap2 version works with no errors when starting apache2.
Thoughts? Comments? ok?
-ME
Index: Makefile
===
RCS file: /cvs/ports/www/mod_fastcgi/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile30 Jun 2007 15:32:30 - 1.4
+++ Makefile13 Sep 2007 16:07:44 -
@@ -1,9 +1,11 @@
# $OpenBSD: Makefile,v 1.4 2007/06/30 15:32:30 simon Exp $
-COMMENT=Apache FastCGI module
+COMMENT-main= Apache FastCGI module
+COMMENT-ap2= Apache2 FastCGI module
DISTNAME= mod_fastcgi-2.4.2
-PKGNAME= ${DISTNAME}p1
+PKGNAME-main= ${DISTNAME}p1
+PKGNAME-ap2= ap2-${DISTNAME}
CATEGORIES= www
@@ -24,13 +26,40 @@ PERMIT_DISTFILES_FTP= Yes
NO_REGRESS= Yes
+MULTI_PACKAGES=-main -ap2
+
+BUILD_DEPENDS= ::www/apache-httpd
+
+MAKE_FLAGS=top_dir=${PREFIX}/share/apache2 \
+ APXS=${PREFIX}/sbin/apxs2 \
+ APACHECTL=${PREFIX}/sbin/apachectl2
+
+FAKE_FLAGS=top_dir=${TRUEPREFIX}/share/apache2 \
+ APXS=${TRUEPREFIX}/sbin/apxs2 \
+ APACHECTL=${TRUEPREFIX}/sbin/apachectl2
+
+DESCR-ap2= ${PKGDIR}/DESCR-main
+
+pre-patch:
+ mkdir ${WRKBUILD}/ap2 touch ${WRKBUILD}/ap2/.deps
+ cd ${WRKBUILD}/ap2 ln ../{Makefile.*,*.[hc],modules.mk} .
+
+post-patch:
+ @cd ${WRKBUILD}/ap2 \
+ ${PATCH} -z .orig --forward --quiet -E -p0 \
+ ${PATCHDIR}/ap2-patch-fcgi_h
+
do-build:
(cd ${WRKBUILD}; apxs -o mod_fastcgi.so -c *.c)
+ (cd ${WRKBUILD}/ap2; ${MAKE} -f Makefile.AP2 ${MAKE_FLAGS})
post-build:
@${MODAPACHE_CREATE_ENABLE_SCRIPT}
do-install:
+ cd ${WRKBUILD}/ap2 ${MAKE} -f Makefile.AP2 ${FAKE_FLAGS}
local-install
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/apache2/mod/mod_fastcgi
+ ${INSTALL_DATA} ${WRKBUILD}/docs/*
${PREFIX}/share/doc/apache2/mod/mod_fastcgi
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_fastcgi
${INSTALL_DATA} ${WRKBUILD}/docs/* ${PREFIX}/share/doc/mod_fastcgi
${MODAPACHE_INSTALL}
Index: patches/ap2-patch-fcgi_h
===
RCS file: patches/ap2-patch-fcgi_h
diff -N patches/ap2-patch-fcgi_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/ap2-patch-fcgi_h13 Sep 2007 16:07:44 -
@@ -0,0 +1,41 @@
+$OpenBSD$
+--- fcgi.h.origTue Feb 4 00:07:37 2003
fcgi.h Thu Sep 13 00:01:59 2007
+@@ -73,6 +73,37 @@ typedef apr_status_t apcb_t;
+ #define ap_reset_timeout(a)
+ #define ap_unblock_alarms()
+
++/* starting with apache 2.2 the backward-compatibility defines for
++ * 1.3 APIs are not available anymore. Define them ourselves here.
++ * see
http://www.fastcgi.com/archives/fastcgi-developers/2005-December/004060.html
++ */
++#ifndef ap_copy_table
++
++#define ap_copy_table apr_table_copy
++#define ap_cpystrn apr_cpystrn
++#define ap_destroy_pool apr_pool_destroy
++#define ap_isspace apr_isspace
++#define ap_make_array apr_array_make
++#define ap_make_table apr_table_make
++#define ap_null_cleanup apr_pool_cleanup_null
++#define ap_palloc apr_palloc
++#define ap_pcalloc apr_pcalloc
++#define ap_psprintf apr_psprintf
++#define ap_pstrcat apr_pstrcat
++#define ap_pstrdup apr_pstrdup
++#define ap_pstrndup apr_pstrndup
++#define ap_push_array apr_array_push
++#define ap_register_cleanup apr_pool_cleanup_register
++#define ap_snprintf apr_snprintf
++#define ap_table_add apr_table_add
++#define ap_table_do apr_table_do
++#define ap_table_get apr_table_get
++#define ap_table_set apr_table_set
++#define ap_table_setn apr_table_setn
++#define ap_table_unset apr_table_unset
++
++#endif /* defined(ap_copy_table) */
++
+ #if (defined(HAVE_WRITEV) !HAVE_WRITEV !defined(NO_WRITEV)) || defined
WIN32
+ #define NO_WRITEV
+ #endif
Index: patches/patch-fcgi_pm_c
===
RCS file: /cvs/ports/www/mod_fastcgi/patches/patch-fcgi_pm_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-fcgi_pm_c
--- patches/patch-fcgi_pm_c 14 Feb 2005 06:23:23 - 1.1.1.1
+++
Re: Comments? ap2 flavor for www/mod_fastcgi
On Thu, Sep 13, 2007 at 01:26:44PM -0400, Mike Erdely wrote:
I tested this on i386 and macppc. ap1 version works as it always did.
ap2 version works with no errors when starting apache2.
I added the PSEUDO_FLAVOR=ap2 like Simon suggested so that the default.
I also replaced the ln with cp in pre-patch, so it works the way I
intended with the last diff.
Please test!
ok?
-ME
Index: Makefile
===
RCS file: /cvs/ports/www/mod_fastcgi/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile30 Jun 2007 15:32:30 - 1.4
+++ Makefile13 Sep 2007 18:39:07 -
@@ -1,9 +1,11 @@
# $OpenBSD: Makefile,v 1.4 2007/06/30 15:32:30 simon Exp $
-COMMENT=Apache FastCGI module
+COMMENT-main= Apache FastCGI module
+COMMENT-ap2= Apache2 FastCGI module
DISTNAME= mod_fastcgi-2.4.2
-PKGNAME= ${DISTNAME}p1
+PKGNAME-main= ${DISTNAME}p1
+PKGNAME-ap2= ap2-${DISTNAME}
CATEGORIES= www
@@ -16,6 +18,9 @@ MODAPACHE_NAME= fastcgi
MAINTAINER= Marc Balmer [EMAIL PROTECTED]
+PSEUDO_FLAVORS=ap2
+FLAVOR?=
+
# Proprietary license
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@@ -24,13 +29,44 @@ PERMIT_DISTFILES_FTP= Yes
NO_REGRESS= Yes
+MULTI_PACKAGES=-main
+
+.if ${FLAVOR:L:Map2}
+MULTI_PACKAGES+= -ap2
+BUILD_DEPENDS= ::www/apache-httpd
+MAKE_FLAGS=top_dir=${PREFIX}/share/apache2 \
+ APXS=${PREFIX}/sbin/apxs2 \
+ APACHECTL=${PREFIX}/sbin/apachectl2
+FAKE_FLAGS=top_dir=${TRUEPREFIX}/share/apache2 \
+ APXS=${TRUEPREFIX}/sbin/apxs2 \
+ APACHECTL=${TRUEPREFIX}/sbin/apachectl2
+DESCR-ap2= ${PKGDIR}/DESCR-main
+
+pre-patch:
+ mkdir ${WRKBUILD}/ap2 touch ${WRKBUILD}/ap2/.deps
+ cd ${WRKBUILD}/ap2 cp ../{Makefile.*,*.[hc],modules.mk} .
+
+post-patch:
+ @cd ${WRKBUILD}/ap2 \
+ ${PATCH} -z .orig --forward --quiet -E -p0 \
+ ${PATCHDIR}/ap2-patch-fcgi_h
+.endif
+
do-build:
(cd ${WRKBUILD}; apxs -o mod_fastcgi.so -c *.c)
+.if ${FLAVOR:L:Map2}
+ (cd ${WRKBUILD}/ap2; ${MAKE} -f Makefile.AP2 ${MAKE_FLAGS})
+.endif
post-build:
@${MODAPACHE_CREATE_ENABLE_SCRIPT}
do-install:
+.if ${FLAVOR:L:Map2}
+ cd ${WRKBUILD}/ap2 ${MAKE} -f Makefile.AP2 ${FAKE_FLAGS}
local-install
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/apache2/mod/mod_fastcgi
+ ${INSTALL_DATA} ${WRKBUILD}/docs/*
${PREFIX}/share/doc/apache2/mod/mod_fastcgi
+.endif
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/mod_fastcgi
${INSTALL_DATA} ${WRKBUILD}/docs/* ${PREFIX}/share/doc/mod_fastcgi
${MODAPACHE_INSTALL}
Index: patches/ap2-patch-fcgi_h
===
RCS file: patches/ap2-patch-fcgi_h
diff -N patches/ap2-patch-fcgi_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/ap2-patch-fcgi_h13 Sep 2007 18:39:07 -
@@ -0,0 +1,41 @@
+$OpenBSD$
+--- fcgi.h.origTue Feb 4 00:07:37 2003
fcgi.h Thu Sep 13 00:01:59 2007
+@@ -73,6 +73,37 @@ typedef apr_status_t apcb_t;
+ #define ap_reset_timeout(a)
+ #define ap_unblock_alarms()
+
++/* starting with apache 2.2 the backward-compatibility defines for
++ * 1.3 APIs are not available anymore. Define them ourselves here.
++ * see
http://www.fastcgi.com/archives/fastcgi-developers/2005-December/004060.html
++ */
++#ifndef ap_copy_table
++
++#define ap_copy_table apr_table_copy
++#define ap_cpystrn apr_cpystrn
++#define ap_destroy_pool apr_pool_destroy
++#define ap_isspace apr_isspace
++#define ap_make_array apr_array_make
++#define ap_make_table apr_table_make
++#define ap_null_cleanup apr_pool_cleanup_null
++#define ap_palloc apr_palloc
++#define ap_pcalloc apr_pcalloc
++#define ap_psprintf apr_psprintf
++#define ap_pstrcat apr_pstrcat
++#define ap_pstrdup apr_pstrdup
++#define ap_pstrndup apr_pstrndup
++#define ap_push_array apr_array_push
++#define ap_register_cleanup apr_pool_cleanup_register
++#define ap_snprintf apr_snprintf
++#define ap_table_add apr_table_add
++#define ap_table_do apr_table_do
++#define ap_table_get apr_table_get
++#define ap_table_set apr_table_set
++#define ap_table_setn apr_table_setn
++#define ap_table_unset apr_table_unset
++
++#endif /* defined(ap_copy_table) */
++
+ #if (defined(HAVE_WRITEV) !HAVE_WRITEV !defined(NO_WRITEV)) || defined
WIN32
+ #define NO_WRITEV
+ #endif
Index: patches/patch-fcgi_pm_c
===
RCS file: /cvs/ports/www/mod_fastcgi/patches/patch-fcgi_pm_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-fcgi_pm_c
--- patches/patch-fcgi_pm_c 14 Feb 2005 06:23:23 - 1.1.1.1
+++ patches/patch-fcgi_pm_c 13 Sep 2007 18:39:07 -
@@ -1,6 +1,6 @@
--- fcgi_pm.c.orig Thu Oct 30 02:08:34 2003
-+++ fcgi_pm.c Mon Feb 14 06:57:49 2005
-@@ -26,7 +26,7 @@ time_t fcgi_dynamic_epoch = 0;
Re: Comments? ap2 flavor for www/mod_fastcgi
Mike Erdely wrote: On Thu, Sep 13, 2007 at 01:26:44PM -0400, Mike Erdely wrote: I tested this on i386 and macppc. ap1 version works as it always did. ap2 version works with no errors when starting apache2. I added the PSEUDO_FLAVOR=ap2 like Simon suggested so that the default. I also replaced the ln with cp in pre-patch, so it works the way I intended with the last diff. Please test! Looks good on amd64 (again, I only really tested the ap2 part). However, in order to install the -ap2 sub-package, I had to specify the FLAVOR and the SUBPACKGE like so: $ env FLAVOR=ap2 SUBPACKAGE=-ap2 make install Specifying only the flavor results in an apache1-only install. Giving only the sub-package results in an error Fatal: Subpackage -ap2 does not exist. I think that's only a very minor nuisance though: people who install binary packages wont notice, and ports users can figure that one out quite easily. Thanks a lot Mike! Roland
Re: Comments? ap2 flavor for www/mod_fastcgi
Mike Erdely [2007-09-13, 14:50:16]: On Thu, Sep 13, 2007 at 01:26:44PM -0400, Mike Erdely wrote: I tested this on i386 and macppc. ap1 version works as it always did. ap2 version works with no errors when starting apache2. I added the PSEUDO_FLAVOR=ap2 like Simon suggested so that the default. I also replaced the ln with cp in pre-patch, so it works the way I intended with the last diff. [...] +PSEUDO_FLAVORS= ap2 +FLAVOR?= we usually make no_foo pseudo flavors, and build everything by default.
Re: Comments? ap2 flavor for www/mod_fastcgi
On Thu, Sep 13, 2007 at 12:18:30PM -0700, Roland Philippsen wrote: However, in order to install the -ap2 sub-package, I had to specify the FLAVOR and the SUBPACKGE like so: $ env FLAVOR=ap2 SUBPACKAGE=-ap2 make install That's exactly right. From bsd.port.mk(5), the target you're looking for is install-all to install all subpackages: install-all Install all packages in a multi-packages port. install only installs the -main subpackage. Or, make it two steps: 1. FLAVOR=ap2 make package 2. pkg_add /usr/ports/packages/`arch -s`/all/ap2-mod_fastcgi -ME
Re: Fix for OpenVPN after route.h changes
Works for me on i386, too. Thanks.
Re: wmii window manager port update
On 9/13/07, Jacob Meuser [EMAIL PROTECTED] wrote: Benoit, are you going to take over maintainership of this? ok for me. Main problem is lack of stable releases of wmii, they only provide snapshots these days. Is this ok for ports ? - Benoît
Re: wmii window manager port update
On Thu, Sep 13, 2007 at 11:25:48PM +0200, Benoit Chesneau wrote: On 9/13/07, Jacob Meuser [EMAIL PROTECTED] wrote: Benoit, are you going to take over maintainership of this? ok for me. Main problem is lack of stable releases of wmii, they only provide snapshots these days. Is this ok for ports ? if projects done have a normal release cycle, like in this case, sure. - Beno?t cheers, jasper -- ``Sapere aude!''
UPDATE: xcursorgen 7.3
Attached patch updates xcursorgen to the version 1.0.2 shipped with
X.Org 7.3.
Changelog:
Set version string in man page
Use strdup instead of malloc/strlen/strcpy
Correct help flag in usage message (-?, not -h)
Add options/flags to man page other man page cleanups
Remove unused AC_TYPE_SIGNAL from configure.ac
Use PACKAGE_VERSION for --version output
Replace static ChangeLog with dist-hook to generate from git log
Change xcursorgen_CFLAGS to AM_CFLAGS to make automake-1.10 happier
Coverity #624: RESOURCE_LEAK: Returned without freeing storage fp
renamed: .cvsignore - .gitignore
Coverity #621: RESOURCE_LEAK: Returned without freeing storage curr
free(curr) in error path when second malloc fails.
ok?
--
Matthieu Herrb
Index: Makefile
===
RCS file: /cvs/OpenBSD/ports/x11/xcursorgen/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- Makefile16 Dec 2006 12:22:36 - 1.14
+++ Makefile13 Sep 2007 22:34:18 -
@@ -1,8 +1,10 @@
# $OpenBSD: Makefile,v 1.14 2006/12/16 12:22:36 espie Exp $
-COMMENT= X11 Cursors themes generator
-DISTNAME= xcursorgen-X11R7.1-1.0.1
-PKGNAME= xcursorgen-7.1
+COMMENT= X11 Cursors themes generator
+DIST_VERS= 1.0.2
+XORG_VERS= 7.3
+DISTNAME= xcursorgen-${DIST_VERS}
+PKGNAME= xcursorgen-${XORG_VERS}
CATEGORIES=x11
HOMEPAGE= http://wiki.X.Org/
@@ -17,16 +19,20 @@
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ftp://ftp.x.org/pub/X11R7.1/src/app/ \
- ftp://x.mirrors.skynet.be/pub/x.org/pub/X11R7.1/src/app/
+MASTER_SITES= ftp://ftp.x.org/pub/X11R${XORG_VERS}/src/app/ \
+
ftp://x.mirrors.skynet.be/pub/x.org/pub/X11R${XORG_VERS}/src/app/
WANTLIB= X11 Xcursor c m z
SEPARATE_BUILD=concurrent
USE_X11= Yes
+AUTOCONF_VERSION= 2.59
+AUTOMAKE_VERSION= 1.9
CONFIGURE_STYLE= gnu
-CONFIGURE_ENV= XCURSORGEN_CFLAGS=-I${X11BASE}/include
-I${LOCALBASE}/include/libpng \
- XCURSORGEN_LIBS=-L${X11BASE}/lib -L${LOCALBASE}/lib
-lX11 -lXcursor -lpng -lz -lm
+CONFIGURE_ENV= AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ ACLOCAL=aclocal -I ${X11BASE}/share/aclocal \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
+CONFIGURE_SCRIPT= autogen.sh
NO_REGRESS=Yes
Index: distinfo
===
RCS file: /cvs/OpenBSD/ports/x11/xcursorgen/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo5 Apr 2007 17:36:26 - 1.7
+++ distinfo13 Sep 2007 22:34:18 -
@@ -1,5 +1,5 @@
-MD5 (xcursorgen-X11R7.1-1.0.1.tar.gz) = 91kK26d21Fh+CtaWWa+/EQ==
-RMD160 (xcursorgen-X11R7.1-1.0.1.tar.gz) = Lkelwa/YMbLblKo2JQueKVd8fn8=
-SHA1 (xcursorgen-X11R7.1-1.0.1.tar.gz) = novmX+M7gt8AEDWje02ABczCJG4=
-SHA256 (xcursorgen-X11R7.1-1.0.1.tar.gz) =
wJ6YkvwKcGQQ4nEKQ/rjU8xU3rbYYluNUZfTwzhA0Go=
-SIZE (xcursorgen-X11R7.1-1.0.1.tar.gz) = 99351
+MD5 (xcursorgen-1.0.2.tar.gz) = Xy+AOnj3Ub1SMtKO4TveKA==
+RMD160 (xcursorgen-1.0.2.tar.gz) = 8BREtdCpGck8m2URBNDyqd9lMM4=
+SHA1 (xcursorgen-1.0.2.tar.gz) = QEQZYg7e3U9CSikL7agrQpqfDOs=
+SHA256 (xcursorgen-1.0.2.tar.gz) = UTD++QuHiJyohanawIkPr/r4lzym+K6snLpoGHT5hWA=
+SIZE (xcursorgen-1.0.2.tar.gz) = 106798
Index: files/host.def
===
RCS file: files/host.def
diff -N files/host.def
--- files/host.def 24 Apr 2003 21:42:38 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-/* $OpenBSD: host.def,v 1.1 2003/04/24 21:42:38 matthieu Exp $ */
-
-#define HasLibpng YES
-#define LibpngDir @LOCALBASE@
-#define LibpngDirStandard NO
-#define LibpngIncDir@LOCALBASE@/include/libpng
-#define LibpngIncDirStandardNO
-#define LibpngLibDir@LOCALBASE@/lib
-#define LibpngLibDirStandardNO
-
-#define DontPreprocessManPages NO
-
-
--- /dev/null Fri Sep 14 00:34:20 2007
+++ patches/patch-configure_ac Fri Sep 14 00:19:14 2007
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.ac.orig Fri Sep 14 00:17:46 2007
configure.ac Fri Sep 14 00:17:46 2007
+@@ -11,7 +11,7 @@
+ AC_PROG_INSTALL
+
+ # Checks for pkg-config packages
+-PKG_CHECK_MODULES(XCURSORGEN, x11 xcursor libpng12)
++PKG_CHECK_MODULES(XCURSORGEN, x11 xcursor libpng)
+ AC_SUBST(XCURSOR_CFLAGS)
+ AC_SUBST(XCURSOR_LIBS)
+
Re: UPDATE: vpnc - 0.5.1
here is a port with all these suggestions On Thu, Sep 13, 2007 at 04:46:37PM +0200, Thomas Schoeller wrote: hello, runs fine for me on macppc and i386 against a Cisco Systems, Inc./VPN 3000 Concentrator Version 4.1.7.Q suggestions: - remove .orig files - install a sample split tunnel script split.sh: #!/bin/sh # this effectively disables changes to /etc/resolv.conf INTERNAL_IP4_DNS= # This sets up split networking regardless # of the concentrators specifications. # You can add as many routes as you want, # but you must set the counter $CISCO_SPLIT_INC # accordingly CISCO_SPLIT_INC=1 CISCO_SPLIT_INC_0_ADDR=10.0.0.0 CISCO_SPLIT_INC_0_MASK=255.255.0.0 CISCO_SPLIT_INC_0_MASKLEN=16 CISCO_SPLIT_INC_0_PROTOCOL=0 CISCO_SPLIT_INC_0_SPORT=0 CISCO_SPLIT_INC_0_DPORT=0 . /etc/vpnc/vpnc-script - patch against vpnc-script that not existing routes get not removed(prevents error messages in split tunnel mode). but i do know how to check if a route exists which handle special netmask because route/netstat shows routes in cidr notation. tomorrow i will see if dead peer detection and rekeying works. thomas On Wed, Sep 12, 2007 at 09:47:08PM -0500, Aaron Hsu wrote: The compressed archive of the port is available at http://www.sacrificumdeo.net/vpnc.tar.gz -- ((name Aaron Hsu) (email/xmpp [EMAIL PROTECTED]) (phone 703-597-7656) (site http://www.aaronhsu.com;)) vpnc.tar.gz Description: application/tar-gz
Re: UPDATE: xcursorgen 7.3
On Fri, Sep 14, 2007 at 12:45:06AM +0200, Matthieu Herrb wrote:
Attached patch updates xcursorgen to the version 1.0.2 shipped with
X.Org 7.3.
snip
ok?
I had to make a few changes to make it work.
xcursorgen wanted autoconf-2.61, needed to add to WANTLIB, added
changed CONFIGURE_STYLE to autoconf automake.
Builds fine on i386 with the attached diff.
Thoughts?
-ME
Index: Makefile
===
RCS file: /cvs/ports/x11/xcursorgen/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile16 Dec 2006 12:22:36 - 1.14
+++ Makefile14 Sep 2007 05:15:10 -
@@ -1,8 +1,10 @@
# $OpenBSD: Makefile,v 1.14 2006/12/16 12:22:36 espie Exp $
-COMMENT= X11 Cursors themes generator
-DISTNAME= xcursorgen-X11R7.1-1.0.1
-PKGNAME= xcursorgen-7.1
+COMMENT= X11 Cursors themes generator
+DIST_VERS= 1.0.2
+XORG_VERS= 7.3
+DISTNAME= xcursorgen-${DIST_VERS}
+PKGNAME= xcursorgen-${XORG_VERS}
CATEGORIES=x11
HOMEPAGE= http://wiki.X.Org/
@@ -17,17 +19,22 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ftp://ftp.x.org/pub/X11R7.1/src/app/ \
- ftp://x.mirrors.skynet.be/pub/x.org/pub/X11R7.1/src/app/
+MASTER_SITES= ftp://ftp.x.org/pub/X11R${XORG_VERS}/src/app/ \
+
ftp://x.mirrors.skynet.be/pub/x.org/pub/X11R${XORG_VERS}/src/app/
WANTLIB= X11 Xcursor c m z
+WANTLIB+= Xau Xdmcp Xfixes Xrender
SEPARATE_BUILD=concurrent
USE_X11= Yes
-CONFIGURE_STYLE= gnu
-CONFIGURE_ENV= XCURSORGEN_CFLAGS=-I${X11BASE}/include
-I${LOCALBASE}/include/libpng \
- XCURSORGEN_LIBS=-L${X11BASE}/lib -L${LOCALBASE}/lib
-lX11 -lXcursor -lpng -lz -lm
-
NO_REGRESS=Yes
+AUTOCONF_VERSION= 2.61
+AUTOMAKE_VERSION= 1.9
+CONFIGURE_STYLE= autoconf automake
+CONFIGURE_ENV= AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ ACLOCAL=aclocal -I ${X11BASE}/share/aclocal \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION}
+MAKE_FLAGS+= AUTOCONF_VERSION=${AUTOCONF_VERSION}
+CONFIGURE_SCRIPT= autogen.sh
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/x11/xcursorgen/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo5 Apr 2007 17:36:26 - 1.7
+++ distinfo14 Sep 2007 05:15:10 -
@@ -1,5 +1,5 @@
-MD5 (xcursorgen-X11R7.1-1.0.1.tar.gz) = 91kK26d21Fh+CtaWWa+/EQ==
-RMD160 (xcursorgen-X11R7.1-1.0.1.tar.gz) = Lkelwa/YMbLblKo2JQueKVd8fn8=
-SHA1 (xcursorgen-X11R7.1-1.0.1.tar.gz) = novmX+M7gt8AEDWje02ABczCJG4=
-SHA256 (xcursorgen-X11R7.1-1.0.1.tar.gz) =
wJ6YkvwKcGQQ4nEKQ/rjU8xU3rbYYluNUZfTwzhA0Go=
-SIZE (xcursorgen-X11R7.1-1.0.1.tar.gz) = 99351
+MD5 (xcursorgen-1.0.2.tar.gz) = Xy+AOnj3Ub1SMtKO4TveKA==
+RMD160 (xcursorgen-1.0.2.tar.gz) = 8BREtdCpGck8m2URBNDyqd9lMM4=
+SHA1 (xcursorgen-1.0.2.tar.gz) = QEQZYg7e3U9CSikL7agrQpqfDOs=
+SHA256 (xcursorgen-1.0.2.tar.gz) = UTD++QuHiJyohanawIkPr/r4lzym+K6snLpoGHT5hWA=
+SIZE (xcursorgen-1.0.2.tar.gz) = 106798
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure_ac 14 Sep 2007 05:15:10 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- configure.ac.orig Fri Sep 14 00:17:46 2007
configure.ac Fri Sep 14 00:17:46 2007
+@@ -11,7 +11,7 @@
+ AC_PROG_INSTALL
+
+ # Checks for pkg-config packages
+-PKG_CHECK_MODULES(XCURSORGEN, x11 xcursor libpng12)
++PKG_CHECK_MODULES(XCURSORGEN, x11 xcursor libpng)
+ AC_SUBST(XCURSOR_CFLAGS)
+ AC_SUBST(XCURSOR_LIBS)
+
