Re: missing dependancy for pcmanfm
On Mon, 10 Sep 2007, Benoit Chesneau wrote: Here is a small patch to add shared-mime-info as a dependancy for pcmanfm. Without it it can't detect image file and create thumnails. Committed, thanks. Next time, don't forget to bump PKGNAME ;) Cheers! -- Antoine
missing dependancy for pcmanfm
Here is a small patch to add shared-mime-info as a dependancy for pcmanfm. Without it it can't detect image file and create thumnails. - benoît -- bchesneau.info | neurofriends.net | osbud.net ppcmanfm-shared_mime_info.patch Description: Binary data
UPDATE: SCons 0.97
Here is an update for SCons to 0.97, the latest stable release.
Index: Makefile
===
RCS file: /cvs/ports/devel/scons/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile3 Jun 2006 14:40:41 - 1.4
+++ Makefile9 Sep 2007 23:04:25 -
@@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.4 2006/06/03 14:40:41 steven Exp $
-COMMENT= "Python-based build system"
+COMMENT= Python-based build system
-VERSION= 0.96.92
+VERSION= 0.97
DISTNAME= scons-${VERSION}
-PKGNAME= ${DISTNAME}p1
CATEGORIES=devel
HOMEPAGE= http://www.scons.org/
@@ -28,9 +27,9 @@ SUBST_VARS+= VERSION
post-extract:
@perl -pi -e 's,^#!.*python$$,#!${MODPY_BIN},' \
${WRKSRC}/script/{scons,sconsign}
-
+
post-install:
- ${INSTALL_MAN} ${WRKSRC}/scons.1${PREFIX}/man/man1
+ ${INSTALL_MAN} ${WRKSRC}/scons.1 ${PREFIX}/man/man1
${INSTALL_MAN} ${WRKSRC}/sconsign.1 ${PREFIX}/man/man1
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/scons/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo5 Apr 2007 15:38:06 - 1.4
+++ distinfo4 Sep 2007 21:24:31 -
@@ -1,5 +1,5 @@
-MD5 (scons-0.96.92.tar.gz) = C2s4jN1kC38pfzemeMZdXA==
-RMD160 (scons-0.96.92.tar.gz) = daoEcX2pjsyrxCGA9uq57kuL2QQ=
-SHA1 (scons-0.96.92.tar.gz) = F6P0YvTrNwUt8XtH5lKNckcgkus=
-SHA256 (scons-0.96.92.tar.gz) = wqthQxdMDT0tby5a5rx33TpIQ6ul5B0SZfVM3CwX6+s=
-SIZE (scons-0.96.92.tar.gz) = 372708
+MD5 (scons-0.97.tar.gz) = 3lMPop6D87bvthiHM5j6MQ==
+RMD160 (scons-0.97.tar.gz) = Ma8172L+VqT68pGk1stz3loX2B8=
+SHA1 (scons-0.97.tar.gz) = cymA8PTbp8ujL//KC1M0l+91Gvw=
+SHA256 (scons-0.97.tar.gz) = GV31Sv7dYHZ+VTkxh98PHn4N2zpGNHpe6C1QUPlkw7o=
+SIZE (scons-0.97.tar.gz) = 439523
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/scons/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 17 Apr 2006 14:57:11 - 1.2
+++ pkg/PLIST 4 Sep 2007 21:26:06 -
@@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST,v 1.2 2006/04/17 14:57:11 steven Exp $
bin/scons
bin/scons-${VERSION}
+bin/scons-time
+bin/scons-time-${VERSION}
bin/sconsign
bin/sconsign-${VERSION}
lib/scons-${VERSION}/
@@ -56,6 +58,8 @@ lib/scons-${VERSION}/SCons/Options/PathO
lib/scons-${VERSION}/SCons/Options/PathOption.pyc
lib/scons-${VERSION}/SCons/Options/__init__.py
lib/scons-${VERSION}/SCons/Options/__init__.pyc
+lib/scons-${VERSION}/SCons/PathList.py
+lib/scons-${VERSION}/SCons/PathList.pyc
lib/scons-${VERSION}/SCons/Platform/
lib/scons-${VERSION}/SCons/Platform/__init__.py
lib/scons-${VERSION}/SCons/Platform/__init__.pyc
@@ -291,9 +295,25 @@ lib/scons-${VERSION}/SCons/Warnings.py
lib/scons-${VERSION}/SCons/Warnings.pyc
lib/scons-${VERSION}/SCons/__init__.py
lib/scons-${VERSION}/SCons/__init__.pyc
+lib/scons-${VERSION}/SCons/compat/
+lib/scons-${VERSION}/SCons/compat/__init__.py
+lib/scons-${VERSION}/SCons/compat/__init__.pyc
+lib/scons-${VERSION}/SCons/compat/_scons_UserString.py
+lib/scons-${VERSION}/SCons/compat/_scons_UserString.pyc
+lib/scons-${VERSION}/SCons/compat/_scons_sets.py
+lib/scons-${VERSION}/SCons/compat/_scons_sets.pyc
+lib/scons-${VERSION}/SCons/compat/_scons_sets15.py
+lib/scons-${VERSION}/SCons/compat/_scons_sets15.pyc
+lib/scons-${VERSION}/SCons/compat/_scons_subprocess.py
+lib/scons-${VERSION}/SCons/compat/_scons_subprocess.pyc
+lib/scons-${VERSION}/SCons/compat/builtins.py
+lib/scons-${VERSION}/SCons/compat/builtins.pyc
+lib/scons-${VERSION}/SCons/cpp.py
+lib/scons-${VERSION}/SCons/cpp.pyc
lib/scons-${VERSION}/SCons/dblite.py
lib/scons-${VERSION}/SCons/dblite.pyc
lib/scons-${VERSION}/SCons/exitfuncs.py
lib/scons-${VERSION}/SCons/exitfuncs.pyc
[EMAIL PROTECTED] man/man1/scons-time.1
@man man/man1/scons.1
@man man/man1/sconsign.1
NEW: devel/p5-Tie-(various)
comments, ok? -> p5-Tie-Cache-LRU-Expires This is an expiring LRU cache, using Tie::Cache::LRU. Each entry in this cache expires after 'EXPIRES' seconds (default 3600). The cache is in RAM (see Tie::Cache::LRU). -> p5-Tie-Cache-LRU This is an implementation of a least-recently used (LRU) cache keeping the cache in RAM. A LRU cache is similar to the kind of cache used by a web browser. New items are placed into the top of the cache. When the cache grows past its size limit, it throws away items off the bottom. The trick is that whenever an item is -accessed-, it is pulled back to the top. The end result of all this is that items which are frequently accessed tend to stay in the cache. -> p5-Tie-LLHash This class implements an ordered hash-like object. It's a cross between a Perl hash and a linked list. Use it whenever you want the speed and structure of a Perl hash, but the orderedness of a list. Don't use it if you want to be able to address your hash entries by number, like you can in a real list ($list[5]). See also Tie::IxHash by Gurusamy Sarathy. It's similar (it also does ordered hashes), but it has a different internal data structure and a different flavor of usage. IxHash stores its data internally as both a hash and an array in parallel. LLHash stores its data as a bidirectional linked list, making both inserts and deletes very fast. IxHash therefore makes your hash behave more like a list than LLHash does. This module keeps more of the hash flavor. -> p5-Tie-RegexpHash This module allows one to use regular expressions for hash keys, so that values can be associated with anything that matches the key. p5-Tie-Cache-LRU-Expires.tgz Description: application/tar-gz p5-Tie-Cache-LRU.tgz Description: application/tar-gz p5-Tie-LLHash.tgz Description: application/tar-gz p5-Tie-RegexpHash.tgz Description: application/tar-gz
Re: new printing ports committed
On Sun, Sep 09, 2007 at 05:01:31PM +0200, Antoine Jacoutot wrote: > I'd like to say that most of the foomatic work (i.e. 99%) has been made > by jakemsr@, I'm just the cleaning guy... so a big big thank to him. All > credit goes to him, all complaints go to me. thank you for taking the time to look these over and getting them in the tree! -- [EMAIL PROTECTED] SDF Public Access UNIX System - http://sdf.lonestar.org
Comments? ap2 flavor for www/mod_fastcgi
Hi,
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. The unflavored build is identical to
what's in CVS right now, specifying FLAVOR=ap2 builds it for
www/apache-httpd.
Tested on a -current amd64 (as of yesterday).
Any comments welcome, of course. I tried to infer the appropriate
style from the docs and by looking at other ports, but this is my
first attempt so please don't get too upset if I blundered somewhere :o)
Greets,
Roland
diff --git a/flavored_mod_fastcgi/Makefile b/flavored_mod_fastcgi/Makefile
index f426594..e9485fb 100644
--- a/flavored_mod_fastcgi/Makefile
+++ b/flavored_mod_fastcgi/Makefile
@@ -3,7 +3,7 @@
COMMENT="Apache FastCGI module"
DISTNAME= mod_fastcgi-2.4.2
-PKGNAME= ${DISTNAME}p1
+PKGNAME= flavored_${DISTNAME}p1
CATEGORIES= www
@@ -11,8 +11,8 @@ HOMEPAGE= http://www.fastcgi.com/
MASTER_SITES= ${HOMEPAGE}dist/
-MODULES= apache-module
-MODAPACHE_NAME=fastcgi
+FLAVORS= ap2
+FLAVOR?=
MAINTAINER= Marc Balmer <[EMAIL PROTECTED]>
@@ -24,6 +24,14 @@ PERMIT_DISTFILES_FTP= Yes
NO_REGRESS= Yes
+.if !${FLAVOR:L:Map2}
+
+##
+# default: build for builtin Apache
+
+MODULES= apache-module
+MODAPACHE_NAME=fastcgi
+
do-build:
(cd ${WRKBUILD}; apxs -o mod_fastcgi.so -c *.c)
@@ -35,4 +43,35 @@ do-install:
${INSTALL_DATA} ${WRKBUILD}/docs/* ${PREFIX}/share/doc/mod_fastcgi
${MODAPACHE_INSTALL}
+.else
+
+##
+# ap2 flavor: build for Apache 2 port
+
+BUILD_DEPENDS= ::www/apache-httpd
+
+PATCH_LIST=ap2-patch-* patch-docs_mod_fastcgi_html
+
+MAKE_FILE= Makefile.AP2
+
+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
+
+INSTALL_TARGET=local-install
+
+# only automated for sub-packages, not flavors (?)
+MESSAGE= ${PKGDIR}/MESSAGE-ap2
+UNMESSAGE= ${PKGDIR}/UNMESSAGE-ap2
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/apache2/mod/mod_fastcgi
+ ${INSTALL_DATA} ${WRKBUILD}/docs/*
${PREFIX}/share/doc/apache2/mod/mod_fastcgi
+
+.endif
+
.include
diff --git a/flavored_mod_fastcgi/patches/ap2-patch-fcgi_h
b/flavored_mod_fastcgi/patches/ap2-patch-fcgi_h
new file mode 100644
index 000..2bc85f9
--- /dev/null
+++ b/flavored_mod_fastcgi/patches/ap2-patch-fcgi_h
@@ -0,0 +1,41 @@
+$OpenBSD$
+--- fcgi.h.origMon Feb 3 15:07:37 2003
fcgi.h Sat Sep 8 16:45:23 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
diff --git a/flavored_mod_fastcgi/pkg/MESSAGE-ap2
b/flavored_mod_fastcgi/pkg/MESSAGE-ap2
new file mode 100644
index 000..f40ffdb
--- /dev/null
+++ b/flavored_mod_fastcgi/pkg/MESSAGE-ap2
@@ -0,0 +1,9 @@
+To finish the install of mod_fastcgi, you need
+to enable the module by adding the following line
+to your /etc/apache2/httpd2.conf file:
+
+ LoadModule fastcgi_module ${PREFIX}/lib/apache2/mod_fastcgi.so
+
+If you already have Apache running on your machine,
+you should not use "apachectl2 restart" - instead,
+you should fully stop and then restart the server.
diff --git a/flavored_mod_fastcgi/pkg/PFRAG.ap2
b/flavored_mod_fastcgi/pkg/PFRAG.ap2
new file mode 100644
index 000..920d7fd
--- /dev/null
+++ b/flavored_mod_fastcgi/pkg/PFRAG.ap2
@@ -0,0 +1,1
[Resubmit] swish-e
>From DESCR: Swish-e is a fast, flexible, and free open source system for indexing collections of Web pages or other files. Swish-e is ideally suited for collections of a million documents or smaller. Using the GNOME libxml2 parser and a collection of filters, Swish-e can index plain text, e-mail, PDF, HTML, XML, Microsoft Word/PowerPoint/Excel and just about any file that can be converted to XML or HTML text. Swish-e is also often used to supplement databases like the MySQL DBMS for very fast full-text searching. Please test and comment. -ME swish-e.tar.gz Description: application/tar-gz
Re: NEW: audio/last.fm
>Here's a port of the official last.fm client. Works without issues on amd64. Haven't ussed with firefox... Thanks for creating port! What about commiting it?
UPDATE: textproc/wdiff
An updated version of wdiff with gettext support
and some improvements.
Comments ? Ok ?
Giovanni
Index: Makefile
===
RCS file: /cvs/ports/textproc/wdiff/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile7 Dec 2004 00:23:24 - 1.17
+++ Makefile9 Sep 2007 17:20:37 -
@@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.17 2004/12/07 00:23:24 alek Exp $
-COMMENT= "word differences between text files"
+COMMENT= word differences between text files
-DISTNAME= wdiff-0.5
+DISTNAME= wdiff-0.5g
CATEGORIES=textproc
-MASTER_SITES= ${MASTER_SITE_GNU:=wdiff/}
+MASTER_SITES= http://wdiff.progiciels-bpi.ca/archives/
# License: GPL
PERMIT_PACKAGE_CDROM= Yes
@@ -13,6 +13,13 @@
PERMIT_DISTFILES_FTP= Yes
WANTLIB= c termcap
+MODULES= gettext
CONFIGURE_STYLE=gnu dest old
+CONFIGURE_ENV= CFLAGS=-I${LOCALBASE}/include \
+ LDFLAGS=-L${LOCALBASE}/lib
+CONFIGURE_ARGS=--without-included-gettext
+USE_GMAKE= Yes
+FAKE_FLAGS=DESTDIR=${WRKINST} \
+ PREFIX=${PREFIX}
.include
Index: distinfo
===
RCS file: /cvs/ports/textproc/wdiff/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo5 Apr 2007 17:26:20 - 1.3
+++ distinfo9 Sep 2007 17:20:37 -
@@ -1,5 +1,5 @@
-MD5 (wdiff-0.5.tar.gz) = f5x49d1vtPPavij71NFDGQ==
-RMD160 (wdiff-0.5.tar.gz) = ezE8+souw3WQSIiLvboL4c2IpeE=
-SHA1 (wdiff-0.5.tar.gz) = ROGIUOFlGGMxOc8kqDFl5i47qpU=
-SHA256 (wdiff-0.5.tar.gz) = 7P2nShfRLISHOheUOw86UJrAEsw1cIhkRipTgKjStCg=
-SIZE (wdiff-0.5.tar.gz) = 129267
+MD5 (wdiff-0.5g.tar.gz) = O5uOzSjHdZgkehRubmAi3g==
+RMD160 (wdiff-0.5g.tar.gz) = LqvAk+Dn3GFdDGjuxKmTtCejk2M=
+SHA1 (wdiff-0.5g.tar.gz) = 9h+KEkfUwASjK8Lz2Bg6xcz6shI=
+SHA256 (wdiff-0.5g.tar.gz) = WDNfOMgwcgp35pL4czZ0A2EIAjLSgY0VQDV3bCXMyfE=
+SIZE (wdiff-0.5g.tar.gz) = 377446
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/textproc/wdiff/patches/patch-Makefile_in,v
retrieving revision 1.1
diff -u -r1.1 patch-Makefile_in
--- patches/patch-Makefile_in 23 Dec 2002 09:09:12 - 1.1
+++ patches/patch-Makefile_in 9 Sep 2007 17:20:37 -
@@ -1,12 +1,14 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2002/12/23 09:09:12 pvalchev Exp $
Makefile.in.orig Sun Nov 6 00:45:13 1994
-+++ Makefile.inMon Dec 23 02:06:10 2002
-@@ -129,7 +129,7 @@ getopt.o getopt1.o: getopt.h
- check: wdiff
- $(srcdir)/check_it
+$OpenBSD$
+--- Makefile.in.orig Sat Sep 8 15:49:56 2007
Makefile.inSat Sep 8 15:55:05 2007
+@@ -34,8 +34,8 @@ SHELL = @SHELL@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-prefix = @prefix@
+-exec_prefix = @exec_prefix@
++prefix = ${PREFIX}
++exec_prefix = ${PREFIX}
--install: all
-+install: all install-man
- $(srcdir)/mkinstalldirs $(bindir) $(infodir)
- for name in $(PROGRAMS); do \
- $(INSTALL_PROGRAM) $$name \
+ bindir = @bindir@
+ sbindir = @sbindir@
Index: patches/patch-configure
===
RCS file: /cvs/ports/textproc/wdiff/patches/patch-configure,v
retrieving revision 1.1
diff -u -r1.1 patch-configure
--- patches/patch-configure 23 Dec 2002 09:09:12 - 1.1
+++ patches/patch-configure 9 Sep 2007 17:20:37 -
@@ -1,11 +1,21 @@
-$OpenBSD: patch-configure,v 1.1 2002/12/23 09:09:12 pvalchev Exp $
configure.orig Sun Nov 6 00:59:26 1994
-+++ configure Mon Dec 23 02:06:10 2002
-@@ -1159,6 +1159,7 @@ EOF
+$OpenBSD$
+--- configure.orig Fri Sep 7 19:47:52 2007
configure Fri Sep 7 19:58:26 2007
+@@ -2962,7 +2962,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_save_LIBS="$LIBS"
+-LIBS="-lintl $LIBS"
++LIBS=" -lintl -liconv $LIBS"
+ cat > conftest.$ac_ext <&4
+ echo "$ac_t""$with_included_gettext" 1>&6
+ if test $with_included_gettext$ac_cv_func_gettext = nono; then
+-LIBS="$LIBS -lintl"
++LIBS="$LIBS -lintl -liconv"
+ fi
+ else
+ with_included_gettext=yes
Index: patches/patch-doc_Makefile_in
===
RCS file: patches/patch-doc_Makefile_in
diff -N patches/patch-doc_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-doc_Makefile_in 9 Sep 2007 17:20:37 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- doc/Makefile.in.orig Sat Sep 8 16:29:38 2007
doc/Makefile.inSat Sep 8 16:30:07 2007
+@@ -33,7 +33,7 @@ SHELL = @SHELL@
+ srcdir = @srcdir@
+ top_srcdir = @top_srcdir@
+ VPATH = @srcdir@
+-prefix = @prefix@
++prefix = ${PREFIX}
+ exec_prefix = @exec_prefix@
+
+ bindir = @bindir@
Index: patches/patch-src_Makefile_in
===
new printing ports committed
Hi. I just committed some printing related ports (foomatic-*) that will ease printing on OpenBSD in the future (when all the needed parts are in). Some small changes have been made to cups and hpijs, if you're using those packages, make sure you don't see any regression or let me know asap. I'm actually working on gutenprint (which I'll send to ports@ soon) and if I feel motivated enough, I'll update hpijs and import hplip (HP inkjet printers support). I'd like to say that most of the foomatic work (i.e. 99%) has been made by jakemsr@, I'm just the cleaning guy... so a big big thank to him. All credit goes to him, all complaints go to me. Hopefully, when everything's in and working, we'll be able to work on creating a good "Printing under OpenBSD" FAQ. Cheers ;) -- Antoine
Re: UPDATE: archivers/p7zip
On 2007/09/09 13:58, Eric Faurot wrote: > On Sun, 9 Sep 2007 01:13:56 -0400 > Josh Grosse <[EMAIL PROTECTED]> wrote: > > > From 4.49 to 4.53. > > > > It passes regression tests on i386. > > It passes on macppc too. and sparc64. Since the Makefile is now copied anyway, might as well copy it to Makefile and miss out MAKE_FILE= I think I prefer it with PKGNAME= left in though, anyone else?
Re: UPDATE: archivers/p7zip
On Sun, 9 Sep 2007 01:13:56 -0400 Josh Grosse <[EMAIL PROTECTED]> wrote: > From 4.49 to 4.53. > > It passes regression tests on i386. It passes on macppc too. I slightly edited the Makefile. I can commit if I get oks. Eric. p7zip.diff Description: Binary data
