[Update] www/pear
Hi,
Here is an update of www/pear to 1.9.2.
Tested OK on Loongson.
Comments ? OK ?
wen
Index: pear/Makefile
===
RCS file: /cvs/ports/www/pear/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- pear/Makefile 22 Nov 2010 08:36:52 - 1.8
+++ pear/Makefile 29 May 2011 05:08:18 -
@@ -3,7 +3,7 @@
COMMENT-main= base classes for common PHP tasks
COMMENT-utils= utilities for managing pear extensions
-VERSION= 1.7.2
+VERSION= 1.9.2
DISTNAME= pear-${VERSION}
PKGNAME-main= ${DISTNAME}
PKGNAME-utils= pear-utils-${VERSION}
@@ -12,8 +12,8 @@
EXTRACT_SUFX= .tar.bz2
HOMEPAGE= http://pear.php.net/
-MASTER_SITES= http://freebsd.unixfreunde.de/sources/ \
- ${MASTER_SITE_FREEBSD_LOCAL:=miwi/}
+MASTER_SITES= http://freebsd.unixfreunde.de/pear/ \
+ http://mirror.thekeelecentre.com/distfiles/
MAINTAINER=Robert Nagy
@@ -36,6 +36,7 @@
NO_REGRESS=Yes
do-install:
+ @perl -pi -e "s,%%BUNDLEDIR%%,${WRKSRC}/go-pear-bundle,g"
${WRKSRC}/go-pear
@perl -pi -e "s,%%PREFIX%%,${WRKINST}${PREFIX-main},g" ${WRKSRC}/go-pear
@${LOCALBASE}/bin/php -nq ${WRKSRC}/go-pear
@@ -46,6 +47,7 @@
@find ${WRKINST}${PREFIX-main} -name "*.php" -exec perl -pi -e
"s,${WRKINST},,g" {} \;
@find ${WRKINST}${PREFIX-utils}/bin -type f -exec perl -pi -e
"s,${WRKINST},,g" {} \;
+ @if [ ! -d /tmp ]; then mkdir /tmp; fi
@patch -d ${WRKINST}${PREFIX-main}/pear <
${FILESDIR}/patch-lib_PEAR_Config_php
@perl -pi -e "s,OPENBSD_PEAR_ROOT,'${PREFIX-main}/pear',g" \
${WRKINST}${PREFIX-main}/pear/lib/PEAR/Config.php
Index: pear/distinfo
===
RCS file: /cvs/ports/www/pear/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- pear/distinfo 22 Aug 2008 14:48:53 - 1.3
+++ pear/distinfo 29 May 2011 05:08:18 -
@@ -1,5 +1,5 @@
-MD5 (pear-1.7.2.tar.bz2) = hRVDeDsPcifKSCeUYlJzgg==
-RMD160 (pear-1.7.2.tar.bz2) = XokTRvvkaA08e6IBFQaty7zpidM=
-SHA1 (pear-1.7.2.tar.bz2) = T2mFAv4rME04SK/T8LJWlLBs98M=
-SHA256 (pear-1.7.2.tar.bz2) = //FwuvKMjCe8S4lEO0AvxjrByPLPoPW8THDYNzGJ7ho=
-SIZE (pear-1.7.2.tar.bz2) = 296233
+MD5 (pear-1.9.2.tar.bz2) = v/xBCwg6HJUL3NYIU4x0Ww==
+RMD160 (pear-1.9.2.tar.bz2) = QwCXe+VvUv9/eQeDOj8V8kl7Mj0=
+SHA1 (pear-1.9.2.tar.bz2) = 0XVWYSTt9/Bvn6TDydaXhjlW+vQ=
+SHA256 (pear-1.9.2.tar.bz2) = KHuH+OvdE51UvQ7W7+HIujhwzYT6dGbQZqkW1CA/mn8=
+SIZE (pear-1.9.2.tar.bz2) = 325241
Index: pear/files/patch-lib_PEAR_Config_php
===
RCS file: /cvs/ports/www/pear/files/patch-lib_PEAR_Config_php,v
retrieving revision 1.2
diff -u -r1.2 patch-lib_PEAR_Config_php
--- pear/files/patch-lib_PEAR_Config_php22 Aug 2008 14:48:53 -
1.2
+++ pear/files/patch-lib_PEAR_Config_php29 May 2011 05:08:18 -
@@ -1,13 +1,11 @@
-$OpenBSD: patch-lib_PEAR_Config_php,v 1.2 2008/08/22 14:48:53 robert Exp $
lib/PEAR/Config.php.orig Fri Aug 22 16:30:55 2008
-+++ lib/PEAR/Config.phpFri Aug 22 16:38:49 2008
-@@ -84,12 +84,7 @@
+--- lib/PEAR/Config.php.orig Sat May 28 21:47:36 2011
lib/PEAR/Config.phpSat May 28 21:57:17 2011
+@@ -80,11 +80,7 @@
if (getenv('PHP_PEAR_INSTALL_DIR')) {
define('PEAR_CONFIG_DEFAULT_PHP_DIR', getenv('PHP_PEAR_INSTALL_DIR'));
} else {
--if (file_exists($PEAR_INSTALL_DIR) && is_dir($PEAR_INSTALL_DIR)) {
--define('PEAR_CONFIG_DEFAULT_PHP_DIR',
-- $PEAR_INSTALL_DIR);
+-if (@file_exists($PEAR_INSTALL_DIR) && is_dir($PEAR_INSTALL_DIR)) {
+-define('PEAR_CONFIG_DEFAULT_PHP_DIR', $PEAR_INSTALL_DIR);
-} else {
-define('PEAR_CONFIG_DEFAULT_PHP_DIR', $PEAR_INSTALL_DIR);
-}
@@ -15,7 +13,7 @@
}
// Default for ext_dir
-@@ -112,8 +107,7 @@
+@@ -107,8 +103,7 @@
if (getenv('PHP_PEAR_DOC_DIR')) {
define('PEAR_CONFIG_DEFAULT_DOC_DIR', getenv('PHP_PEAR_DOC_DIR'));
} else {
@@ -25,7 +23,7 @@
}
// Default for bin_dir
-@@ -127,8 +121,7 @@
+@@ -122,8 +117,7 @@
if (getenv('PHP_PEAR_DATA_DIR')) {
define('PEAR_CONFIG_DEFAULT_DATA_DIR', getenv('PHP_PEAR_DATA_DIR'));
} else {
@@ -35,7 +33,7 @@
}
// Default for cfg_dir
-@@ -151,8 +144,7 @@
+@@ -146,8 +140,7 @@
if (getenv('PHP_PEAR_TEST_DIR')) {
define('PEAR_CONFIG_DEFAULT_TEST_DIR', getenv('PHP_PEAR_TEST_DIR'));
} else {
@@ -45,7 +43,7 @@
}
// Default for temp_dir
-@@ -168,9 +160,7 @@
+@@ -163,9 +156,7 @@
if (getenv('PHP_PEAR_CACHE_DIR')) {
define('PEAR_CONFIG_DEFAULT_CACHE_DIR', getenv('PHP_PEAR_CACHE_DIR'));
} else {
@@ -56,7 +54,7 @@
}
// Default for download_dir
-@@ -229,9 +219,7 @@
+@@ -224,9 +215,7 @@
if (getenv('PHP_PEAR_SIG_BIN')) {
define('PEAR_CONFIG_DEFAULT_SIG_BIN', getenv('PHP_PEAR_SIG_BIN'));
} else {
Index: pear/patches/patch-
automake: use ${SHELL} to run install-sh
Here is the same change Matthieu mentioned in this thread brought over
to automake 1.8..
http://marc.info/?l=openbsd-ports&m=130552728727077&w=2
Index: Makefile
===
RCS file: /home/cvs/ports/devel/automake/1.8/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile5 May 2011 12:30:16 - 1.12
+++ Makefile28 May 2011 17:28:32 -
@@ -4,7 +4,7 @@ COMMENT=GNU standards-compliant Makefil
VERSION= 1.8
DISTNAME= automake-${VERSION}.5
-REVISION= 3
+REVISION= 4
PKGSPEC = automake->=${VERSION},<1.9
CATEGORIES=devel
Index: patches/patch-lib_am_header-vars_am
===
RCS file: patches/patch-lib_am_header-vars_am
diff -N patches/patch-lib_am_header-vars_am
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-lib_am_header-vars_am 28 May 2011 17:27:58 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- lib/am/header-vars.am.orig Sat May 28 13:26:16 2011
lib/am/header-vars.am Sat May 28 13:27:46 2011
+@@ -41,9 +41,9 @@ top_builddir = %TOPDIR%
+
+ am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+ INSTALL = @INSTALL@
+-install_sh_DATA = $(install_sh) -c -m 644
+-install_sh_PROGRAM = $(install_sh) -c
+-install_sh_SCRIPT = $(install_sh) -c
++install_sh_DATA = ${SHELL} $(install_sh) -c -m 644
++install_sh_PROGRAM = ${SHELL} $(install_sh) -c
++install_sh_SCRIPT = ${SHELL} $(install_sh) -c
+ INSTALL_HEADER = $(INSTALL_DATA)
+ transform = $(program_transform_name)
+
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Python 2.6.6p2 Crashes on OpenBSD 4.9 -current
Hi, python 2.6 consistently crashes, when running Plone 4.0.5 on acur# sysctl kern.version kern.version=OpenBSD 4.9-current (GENERIC.MP) #15: Thu May 26 10:22:04 MDT 2011 dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP as well as on 4.9 from the CDs (i386 as well as amd64). I installed the following packages acur# pkg_info -A bzip2-1.0.6 block-sorting file compressor, unencumbered python-2.6.6p2 interpreted object-oriented programming language sqlite3-3.7.5 embedded SQL implementation and then installed Plone 4.0.5. I ran plone standalone as user vsankar (login class staff) Plone starts up without any problems but quite frequently it automatically restarts without any log entries and I get the following core -rw--- 1 vsankar vsankar 160187264 May 28 11:24 python.core If I install Plone as root, I don't get a python.core file but the random restarts still occur. I tried this with PIL from ports installed, PIL installed through Plone buildout, and PIL installed through virtualenv with the same result. I have asked around on Plone IRCs, forums etc., but have not had any response. Any clues on running Plone 4.0.5 successfully on OpenBSD 4.9 very much appreciated. Plone 4.0.5 works fine on OpenBSD 4.7 but has not worked for me on 4.8, 4.9, and 4.9 -current. If you need any additional information, I can report back with that. Thanks very much, Vijay Vijay Sankar vsan...@foretell.ca
Re: [Update] geo/gdal
> Here is an update of geo/gdal to 1.8.0. > > Tested OK on i386. > > Comments ? OK ? I asked Landry a month ago about this update and since gdal 1.8.0 has been marked safe for threads. (*) Make --with-threads=yes the default this should be tested somehow, or until somebody confirms just go with with-threads=no?
Re: UPDATE: graphics/asymptote
On Sat, May 28, 2011 at 07:43:01PM +0600, Alexandr Shadchin wrote:
> Hi,
>
> This update package asymptote to the latest release 2.10.
> Tested on amd64.
>
> * enable gsl (or make flavor?)
> * fix depends
> * move share/doc/asymptote/examples in share/examples/asymptote
> * add @exec and @unexec-delete in PLIST
>
> Comments ? OK ?
>
fix jasper@ comments:
* back old DISTNAME and related PKGNAME, WRKDIST,
instead of determine DISTFILES
* RUN_DEPENDS not include BUILD_DEPENDS
* use FAKE_FLAGS instead of adding a patch
--
Alexandr Shadchin
Index: Makefile
===
RCS file: /cvs/ports/graphics/asymptote/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile17 Nov 2010 08:05:12 - 1.4
+++ Makefile28 May 2011 14:27:06 -
@@ -3,7 +3,7 @@
COMMENT= powerful descriptive vector graphics language
BROKEN-sparc64=build stalls
-DISTNAME= asymptote-2.04.src
+DISTNAME= asymptote-2.10.src
PKGNAME= ${DISTNAME:S/.src//g}
CATEGORIES=graphics
@@ -18,12 +18,18 @@ PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=asymptote/}
EXTRACT_SUFX= .tgz
+MODULES= lang/python
+
WANTLIB += GL GLU c m ncurses pthread readline stdc++ z
-WANTLIB += gc glut sigsegv fftw3
+WANTLIB += gc glut gsl gslcblas sigsegv fftw3
+
+BUILD_DEPENDS= print/texlive/base
+RUN_DEPENDS= graphics/py-Imaging \
+ print/texlive/base \
+ ${MODPY_TKINTER_DEPENDS}
-BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= print/texlive/base
LIB_DEPENDS= devel/boehm-gc \
+ devel/gsl \
devel/libsigsegv \
graphics/freeglut \
math/fftw3
@@ -33,15 +39,20 @@ USE_GROFF = Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-gc=${LOCALBASE} \
+ --enable-fftw \
--enable-gl \
- --infodir=${PREFIX}/info
+ --enable-gsl
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -pthread" \
ac_cv_prog_kpsewhich="${LOCALBASE}/bin/kpsewhich"
+FAKE_FLAGS+=
exampledir="${WRKINST}${PREFIX}/share/examples/asymptote"
+
PORTHOME= ${WRKDIR}
-WRKDIST= ${WRKDIR}/${DISTNAME:S/.src//g}/
+MODPY_ADJ_FILES= GUI/*.py
+
+WRKDIST= ${WRKDIR}/${DISTNAME:S/.src//g}/
post-install:
mv ${PREFIX}/man/man1/xasy.1x ${PREFIX}/man/man1/xasy.1
Index: distinfo
===
RCS file: /cvs/ports/graphics/asymptote/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo31 Aug 2010 14:12:29 - 1.1.1.1
+++ distinfo28 May 2011 14:27:06 -
@@ -1,5 +1,5 @@
-MD5 (asymptote-2.04.src.tgz) = attddxS2YhUrb28Wwk9XUQ==
-RMD160 (asymptote-2.04.src.tgz) = XzXTSyWB8Fq/JMVsUAqCvdGC1qw=
-SHA1 (asymptote-2.04.src.tgz) = IDvntT3+tyIe/354e8Gorc91KxM=
-SHA256 (asymptote-2.04.src.tgz) = xZFmZZCSOsY7e9jApYZXR65xbKc7SwnwZjl/hTY1e04=
-SIZE (asymptote-2.04.src.tgz) = 1689205
+MD5 (asymptote-2.10.src.tgz) = d0Bnow5UMIoGGu0gCYwB2Q==
+RMD160 (asymptote-2.10.src.tgz) = iiFJR/91mZVrtcJ87hPbI6pisfI=
+SHA1 (asymptote-2.10.src.tgz) = RuFNP/13Ec7oODJRVgjybnMXKQY=
+SHA256 (asymptote-2.10.src.tgz) = ISjCoP3NJUiJ6KXesEl/Cov5QSFiCWDoEmvIfxT2XW0=
+SIZE (asymptote-2.10.src.tgz) = 1729028
Index: patches/patch-configure
===
RCS file: /cvs/ports/graphics/asymptote/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure
--- patches/patch-configure 31 Aug 2010 14:12:30 - 1.1.1.1
+++ patches/patch-configure 28 May 2011 14:27:06 -
@@ -2,13 +2,13 @@ $OpenBSD: patch-configure,v 1.1.1.1 2010
Remove $latexdir here, so it's possible to set it with kpsewhich(1), as
intended.
configure.orig Tue Aug 31 15:32:11 2010
-+++ configure Tue Aug 31 15:32:18 2010
-@@ -3896,7 +3896,6 @@ as_val=`eval 'as_val=${'$as_ac_File'}
-if test "x$as_val" = x""yes; then
- :
+--- configure.orig Fri May 27 11:32:57 2011
configure Sat May 28 18:08:32 2011
+@@ -3794,7 +3794,6 @@ $as_echo "$ac_res" >&6; }
+ if eval test \"x\$"$as_ac_File"\" = x"yes"; then :
+
else
- latexdir=/usr/share/texmf/tex/latex
as_ac_File=`$as_echo "ac_cv_file_$latexdir/base/latex.ltx" | $as_tr_sh`
- { $as_echo "$as_me:$LINENO: checking for $latexdir/base/latex.ltx" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for
$latexdir/base/latex.ltx" >&5
$as_echo_n "checking for $latexdir/base/latex.ltx... " >&6; }
Index: patches/patch-doc_asy
new feature: more powerful @pkgpath
Historically, @pkgpath has just been a simple string compare, which made some
things very awkward.
1/ matching the removal of a flavor while other flavors are in effect.
2/ matching multiple flavor combinations.
The following patch turns @pkgpath into a real object, so that flavors can
be ordered in any way, and adds the possibility of having optional parts,
e.g., [,flavor] or [,flavor1,flavor2]
so, case 1/ would be handled as:
@pkgpath ${BASE_PKGPATH},oldflavor
since pkgpaths are now ordering-independent
and case 2/ would become something like
@pkgpath dir[,f1][,f2][,f3],f4
where it used to be
@pkgpath dir,f4
@pkgpath dir,f1,f4
@pkgpath dir,f2,f4
@pkgpath dir,f1,f2,f4
@pkgpath dir,f3,f4
@pkgpath dir,f1,f3,f4
@pkgpath dir,f2,f3,f4
@pkgpath dir,f1,f2,f3,f4
testing and comments welcome. There's also a large set of unit
regression-testing in-tree.
Index: OpenBSD/PackingElement.pm
===
RCS file: /home/openbsd/cvs/src/usr.sbin/pkg_add/OpenBSD/PackingElement.pm,v
retrieving revision 1.195
diff -u -p -r1.195 PackingElement.pm
--- OpenBSD/PackingElement.pm 19 Mar 2011 16:56:05 - 1.195
+++ OpenBSD/PackingElement.pm 28 May 2011 13:42:43 -
@@ -893,7 +893,10 @@ sub new
$cdrom =~ s/^\'(.*)\'$/$1/;
$ftp =~ s/^\"(.*)\"$/$1/;
$ftp =~ s/^\'(.*)\'$/$1/;
- bless { subdir => $subdir, cdrom => $cdrom, ftp => $ftp}, $class;
+ bless { subdir => $subdir,
+ path => OpenBSD::PkgPath->new($subdir),
+ cdrom => $cdrom,
+ ftp => $ftp}, $class;
}
sub may_quote
@@ -909,8 +912,10 @@ sub may_quote
sub stringize
{
my $self = shift;
- return "subdir=".$self->{subdir}." cdrom=".may_quote($self->{cdrom}).
- " ftp=".may_quote($self->{ftp});
+ return join(' ',
+ "subdir=".$self->{subdir},
+ "cdrom=".may_quote($self->{cdrom}),
+ "ftp=".may_quote($self->{ftp}));
}
package OpenBSD::PackingElement::Name;
@@ -1028,6 +1033,13 @@ sub keyword() { "pkgpath" }
__PACKAGE__->register_with_factory;
sub category() { "pkgpath" }
+sub new
+{
+ my ($class, $fullpkgpath) = @_;
+ bless {name => $fullpkgpath,
+ path => OpenBSD::PkgPath::WithOpts->new($fullpkgpath)}, $class;
+}
+
package OpenBSD::PackingElement::Incompatibility;
our @ISA=qw(OpenBSD::PackingElement::Meta);
@@ -1844,6 +1856,91 @@ sub register_old_keyword
for my $k (qw(src display mtree ignore_inst dirrm pkgcfl pkgdep newdepend
libdepend ignore)) {
__PACKAGE__->register_old_keyword($k);
+}
+
+package OpenBSD::PkgPath;
+sub new
+{
+ my ($class, $fullpkgpath) = @_;
+ my ($dir, @mandatory) = split(/\,/, $fullpkgpath);
+ return bless {dir => $dir,
+ mandatory => {map {($_, 1)} @mandatory},
+ }, $class;
+}
+
+sub trim
+{
+ my ($self, $has, $from, $to_rm) = @_;
+ for my $f (keys %$to_rm) {
+ if ($has->{$f}) {
+ delete $from->{$f};
+ } else {
+ return 0;
+ }
+ }
+ return 1;
+}
+
+sub match2
+{
+ my ($self, $has, $h) = @_;
+ if (keys %$h) {
+ return 0;
+ } else {
+ return 1;
+ }
+}
+
+sub match
+{
+ my ($self, $other) = @_;
+ # make a copy of options
+ my %h = %{$other->{mandatory}};
+ if (!$self->trim($other->{mandatory}, \%h, $self->{mandatory})) {
+ return 0;
+ }
+ if ($self->match2($other->{mandatory}, \%h)) {
+ return 1;
+ } else {
+ return 0;
+ }
+}
+
+package OpenBSD::PkgPath::WithOpts;
+our @ISA = qw(OpenBSD::PkgPath);
+
+sub new
+{
+ my ($class, $fullpkgpath) = @_;
+ my @opts = ();
+ while ($fullpkgpath =~ s/\[\,(.*?)\]//) {
+ push(@opts, {map {($_, 1)} split(/\,/, $1) });
+ };
+ my $o = $class->SUPER::new($fullpkgpath);
+ if (@opts == 0) {
+ bless $o, "OpenBSD::PkgPath";
+ } else {
+ $o->{opts} = \@opts;
+ }
+ return $o;
+}
+
+sub match2
+{
+ my ($self, $has, $h) = @_;
+ if (!keys %$h) {
+ return 1;
+ }
+ for my $opts (@{$self->{opts}}) {
+ my %h2 = %$h;
+ if ($self->trim($has, \%h2, $opts)) {
+ $h = \%h2;
+ if (!keys %$h) {
+ return 1;
+ }
+ }
+ }
+ return 0;
}
1;
Index: OpenBSD/PackingList.pm
===
RCS file: /home/openbsd/cvs/src/usr.sbin/pkg_add/OpenBSD/PackingList.pm,v
retrieving revision 1.111
diff -u -p -r1.111 PackingList.pm
--- OpenBSD/PackingList.pm 24 Dec 2010 09:04:14 - 1.111
+++ OpenBSD/PackingList.pm 28 May 2011 09:24:11 -
@@ -49,9 +49,16 @@ package OpenBSD::Packing
UPDATE: graphics/asymptote
Hi,
This update package asymptote to the latest release 2.10.
Tested on amd64.
* enable gsl (or make flavor?)
* fix depends
* move share/doc/asymptote/examples in share/examples/asymptote
* add @exec and @unexec-delete in PLIST
Comments ? OK ?
--
Alexandr Shadchin
Index: Makefile
===
RCS file: /cvs/ports/graphics/asymptote/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile17 Nov 2010 08:05:12 - 1.4
+++ Makefile28 May 2011 13:31:47 -
@@ -3,8 +3,7 @@
COMMENT= powerful descriptive vector graphics language
BROKEN-sparc64=build stalls
-DISTNAME= asymptote-2.04.src
-PKGNAME= ${DISTNAME:S/.src//g}
+DISTNAME= asymptote-2.10
CATEGORIES=graphics
HOMEPAGE= http://asymptote.sourceforge.net/
@@ -16,14 +15,21 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=asymptote/}
+DISTFILES= ${DISTNAME}.src${EXTRACT_SUFX}
EXTRACT_SUFX= .tgz
+MODULES= lang/python
+
WANTLIB += GL GLU c m ncurses pthread readline stdc++ z
-WANTLIB += gc glut sigsegv fftw3
+WANTLIB += gc glut gsl gslcblas sigsegv fftw3
+
+BUILD_DEPENDS= print/texlive/base
+RUN_DEPENDS= graphics/py-Imaging \
+ ${MODPY_TKINTER_DEPENDS} \
+ ${BUILD_DEPENDS}
-BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= print/texlive/base
LIB_DEPENDS= devel/boehm-gc \
+ devel/gsl \
devel/libsigsegv \
graphics/freeglut \
math/fftw3
@@ -33,15 +39,16 @@ USE_GROFF = Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= --enable-gc=${LOCALBASE} \
+ --enable-fftw \
--enable-gl \
- --infodir=${PREFIX}/info
+ --enable-gsl
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}/lib -L${LOCALBASE}/lib -pthread" \
ac_cv_prog_kpsewhich="${LOCALBASE}/bin/kpsewhich"
PORTHOME= ${WRKDIR}
-WRKDIST= ${WRKDIR}/${DISTNAME:S/.src//g}/
+MODPY_ADJ_FILES = GUI/*.py
post-install:
mv ${PREFIX}/man/man1/xasy.1x ${PREFIX}/man/man1/xasy.1
Index: distinfo
===
RCS file: /cvs/ports/graphics/asymptote/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo31 Aug 2010 14:12:29 - 1.1.1.1
+++ distinfo28 May 2011 13:31:47 -
@@ -1,5 +1,5 @@
-MD5 (asymptote-2.04.src.tgz) = attddxS2YhUrb28Wwk9XUQ==
-RMD160 (asymptote-2.04.src.tgz) = XzXTSyWB8Fq/JMVsUAqCvdGC1qw=
-SHA1 (asymptote-2.04.src.tgz) = IDvntT3+tyIe/354e8Gorc91KxM=
-SHA256 (asymptote-2.04.src.tgz) = xZFmZZCSOsY7e9jApYZXR65xbKc7SwnwZjl/hTY1e04=
-SIZE (asymptote-2.04.src.tgz) = 1689205
+MD5 (asymptote-2.10.src.tgz) = d0Bnow5UMIoGGu0gCYwB2Q==
+RMD160 (asymptote-2.10.src.tgz) = iiFJR/91mZVrtcJ87hPbI6pisfI=
+SHA1 (asymptote-2.10.src.tgz) = RuFNP/13Ec7oODJRVgjybnMXKQY=
+SHA256 (asymptote-2.10.src.tgz) = ISjCoP3NJUiJ6KXesEl/Cov5QSFiCWDoEmvIfxT2XW0=
+SIZE (asymptote-2.10.src.tgz) = 1729028
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_in 28 May 2011 13:31:47 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.in.orig Tue Oct 19 07:08:41 2010
Makefile.inSat Nov 13 00:31:42 2010
+@@ -71,7 +71,7 @@ datadir = $(DESTDIR)@datadir@
+ asydir = $(datadir)/asymptote
+ GUIdir = $(asydir)/GUI
+ docdir = $(DESTDIR)@docdir@
+-exampledir = $(docdir)/examples
++exampledir = $(datadir)/examples/asymptote
+ animationsdir = $(exampledir)/animations
+ latexdir = $(DESTDIR)@latexdir@
+ contextdir = $(DESTDIR)@contextdir@
Index: patches/patch-configure
===
RCS file: /cvs/ports/graphics/asymptote/patches/patch-configure,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-configure
--- patches/patch-configure 31 Aug 2010 14:12:30 - 1.1.1.1
+++ patches/patch-configure 28 May 2011 13:31:47 -
@@ -2,13 +2,13 @@ $OpenBSD: patch-configure,v 1.1.1.1 2010
Remove $latexdir here, so it's possible to set it with kpsewhich(1), as
intended.
configure.orig Tue Aug 31 15:32:11 2010
-+++ configure Tue Aug 31 15:32:18 2010
-@@ -3896,7 +3896,6 @@ as_val=`eval 'as_val=${'$as_ac_File'}
-if test "x$as_val" = x""yes; then
- :
+--- configure.orig Fri May 27 11:32:57 2011
configure Sat May 28 18:08:32 2011
+@@ -3794,7 +3794,6 @@ $as_echo "$ac_res
Re: [Update] geo/mapserver
2011/5/28 Jasper Lievisse Adriaanse :
> On Sat, May 28, 2011 at 08:02:44AM +0800, wen heping wrote:
>> This one maybe better.
>>
>> wen
> What makes you think a REVISION line should stay when bumping the distname's
> version? It's wrong. Just zap all REVISION lines when doing an update, but
Here "better" has nothing about REVISION, here "better" I mean I add
the missing new patch patch-mapscript_php_Makefile_in which I missed
in previous diff file.
As the REVISION, in my previous email I state I am not sure whether
set REVISION=0 or remove that line, because some openbsd committer
told me I should set REVISION=0, while some others told me it should
be removed.
Now I believe REVISION line should be removed when update. I hope this
is the last answer.
wen
> keep any EPOCH lines.
>
>> Index: mapserver/Makefile
>> ===
>> RCS file: /cvs/ports/geo/mapserver/Makefile,v
>> retrieving revision 1.9
>> diff -u -p -u -r1.9 Makefile
>> --- mapserver/Makefile 11 Jan 2011 09:47:55 - 1.9
>> +++ mapserver/Makefile 27 May 2011 23:51:45 -
>> @@ -8,13 +8,13 @@ COMMENT-utils= mapserver utilities
>> COMMENT-php= PHP Mapscript extension
>> COMMENT-perl= Perl Mapscript binding
>>
>> -V = 5.6.5
>> +V = 6.0.0
>> DISTNAME= mapserver-${V}
>> PKGNAME-main= ${DISTNAME}
>> PKGNAME-utils= mapserver-utils-${V}
>> PKGNAME-php= php5-mapscript-${V}
>> PKGNAME-perl= p5-mapscript-${V}
>> -REVISION-main= 1
>> +REVISION-main= 0
>> REVISION-utils= 0
>>
>> CATEGORIES= geo www
>> @@ -76,7 +76,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/
>>
>> MAKE_ENV= CFLAGS+=-fPIC
>>
>> -UTILS= shp2img shp2pdf legend shptree shptreevis shptreetst scalebar \
>> +UTILS= shp2img legend shptree shptreevis shptreetst scalebar \
>> sortshp tile4ms msencrypt
>>
>> PREFIX-main= /var/www
>> @@ -95,7 +95,7 @@ do-install:
>> ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mapserver/perl
>>
>> ${INSTALL_PROGRAM} ${WRKSRC}/mapserv ${WRKINST}/${PREFIX-main}/cgi-bin
>> - ${INSTALL_DATA} ${WRKSRC}/mapscript/php3/php_mapscript.so \
>> + ${INSTALL_DATA} ${WRKSRC}/mapscript/php/php_mapscript.so \
>> ${WRKINST}/${PREFIX-php}/lib/php/modules/mapscript.so
>> echo "; Enable Mapscript extension module\nextension=mapscript.so" \
>> > ${WRKINST}/${PREFIX-php}/conf/php5.sample/mapscript.ini
>> @@ -103,7 +103,7 @@ do-install:
>> ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin/
>> .endfor
>> ${INSTALL_SCRIPT} ${WRKSRC}/mapserver-config ${PREFIX}/bin/
>> - ${INSTALL_DATA} ${WRKSRC}/mapscript/php3/examples/* \
>> + ${INSTALL_DATA} ${WRKSRC}/mapscript/php/examples/* \
>> ${PREFIX}/share/examples/mapserver/php
>> ${INSTALL_DATA} ${WRKSRC}/mapscript/perl/examples/* \
>> ${PREFIX}/share/examples/mapserver/perl
>> Index: mapserver/distinfo
>> ===
>> RCS file: /cvs/ports/geo/mapserver/distinfo,v
>> retrieving revision 1.6
>> diff -u -p -u -r1.6 distinfo
>> --- mapserver/distinfo 27 Jul 2010 08:57:38 - 1.6
>> +++ mapserver/distinfo 27 May 2011 23:51:45 -
>> @@ -1,5 +1,5 @@
>> -MD5 (mapserver-5.6.5.tar.gz) = M6u/J/qOO/LFMlfCGIpnsw==
>> -RMD160 (mapserver-5.6.5.tar.gz) = D+83rfqk9xzsBrrkG7xJSQR4YXQ=
>> -SHA1 (mapserver-5.6.5.tar.gz) = yz23CTzu+exa9kucKmY4LQlCmXI=
>> -SHA256 (mapserver-5.6.5.tar.gz) =
>> rKyv5hArHxhQlO/8RbWwpdO6ayGk2+IJyoSks9hXmMU=
>> -SIZE (mapserver-5.6.5.tar.gz) = 2314003
>> +MD5 (mapserver-6.0.0.tar.gz) = W8sab7SnQ+nwaUZvvfSrdg==
>> +RMD160 (mapserver-6.0.0.tar.gz) = syTfAYHiPPWvRvdor1n2WswT/54=
>> +SHA1 (mapserver-6.0.0.tar.gz) = S72O9WqhOJ3kyAtHduANtThSk2c=
>> +SHA256 (mapserver-6.0.0.tar.gz) =
>> knCTM2ZcR4T2mxjRqOeN2A+HpmtdSQ/Q5J7yumFr2a8=
>> +SIZE (mapserver-6.0.0.tar.gz) = 2435310
>> Index: mapserver/patches/patch-configure
>> ===
>> RCS file: /cvs/ports/geo/mapserver/patches/patch-configure,v
>> retrieving revision 1.3
>> diff -u -p -u -r1.3 patch-configure
>> --- mapserver/patches/patch-configure 21 Nov 2010 09:32:57 - 1.3
>> +++ mapserver/patches/patch-configure 27 May 2011 23:51:45 -
>> @@ -1,7 +1,7 @@
>> $OpenBSD: patch-configure,v 1.3 2010/11/21 09:32:57 landry Exp $
>> configure.orig Thu Jul 8 22:07:15 2010
>> -+++ configure Wed Nov 17 22:14:47 2010
>> -@@ -3360,7 +3360,7 @@ if test $ac_cv_lib_m_exp = yes; then
>> +--- configure.orig Wed Apr 27 09:06:17 2011
>> configure Thu May 26 19:59:16 2011
>> +@@ -3361,7 +3361,7 @@ if test $ac_cv_lib_m_exp = yes; then
>> XTRALIBS="$XTRALIBS -lm"
>> fi
>>
>> @@ -10,12 +10,12 @@ $OpenBSD: patch-configure,v 1.3 2010/11/
>>
>>
>> echo "$as_me:$LINENO: checking for __gxx_personality_v0 in -lstdc++" >&5
>> -@@ -9790,7 +979
Re: can't make opera work anymore
On Saturday 28 May 2011 15:56:44 frantisek holop wrote: > hi there, > > i'd like to ask my fellow opera users: can you run opera? > since the last linux emul changes i am an ex-opera user on openbsd. > > latest snapshot, bsd.sp, bsd.mp, old profile, new profile, proxy, no proxy, > no matter what i do, opera just hangs. > > as noone else is complaining, i guess others have no problems, > and i must me doing something wrong. > > could anyone share their positive experiences with me please? > > -f I've seen that too on i386. It made the whole computer hang. -- Antti Harri
ports patch to remove trailing whitespace
Hi David, > CVSROOT: /cvs > Module name: ports > Changes by: dco...@cvs.openbsd.org 2011/05/26 01:51:55 > > Modified files: > x11/gnome-mplayer: Makefile > Added files: > x11/gnome-mplayer/patches: patch-gnome-mplayer_1 > > Log message: > mandoc fixes; zap USE_GROFF Don't do that. http://www.openbsd.org/faq/ports/specialtopics.html#Mandoc "What about warnings? You might wonder about mandoc warnings, as opposed to mandoc errors. In a nutshell, the distinction is that errors may seriously impact the usefulness of the output, while warnings might at the worst cause minor formatting glitches, if at all. If a mandoc warning appears to be related to seriously garbled output, that's probably a bug in mandoc and should always be reported. That said, it is obvious that warnings are irrelevant for the decision whether to use or not to use mandoc for a given port. They are for manual authors, to help improve manual quality, not for porters. How can I help upstream? In case you are one of the port's upstream developers, or know they care about good quality of their manuals and gladly accept patches, it may make sense to use mandoc -Tlint to identify potential formatting issues and to produce patches to be submitted upstream. Usually, there is no need to put such patches into the ports tree." So, it is fine to feed patches of this style upstream, if they care, but removing trailing whitespace in a ports patch is just a make- work project causing pointless maintenance effort when the next update is due. Yours, Ingo
can't make opera work anymore
hi there, i'd like to ask my fellow opera users: can you run opera? since the last linux emul changes i am an ex-opera user on openbsd. latest snapshot, bsd.sp, bsd.mp, old profile, new profile, proxy, no proxy, no matter what i do, opera just hangs. as noone else is complaining, i guess others have no problems, and i must me doing something wrong. could anyone share their positive experiences with me please? -f -- my desk is a final proof of the chaos theory
Re: [Update] geo/mapserver
On Sat, May 28, 2011 at 08:02:44AM +0800, wen heping wrote:
> This one maybe better.
>
> wen
What makes you think a REVISION line should stay when bumping the distname's
version? It's wrong. Just zap all REVISION lines when doing an update, but
keep any EPOCH lines.
> Index: mapserver/Makefile
> ===
> RCS file: /cvs/ports/geo/mapserver/Makefile,v
> retrieving revision 1.9
> diff -u -p -u -r1.9 Makefile
> --- mapserver/Makefile11 Jan 2011 09:47:55 - 1.9
> +++ mapserver/Makefile27 May 2011 23:51:45 -
> @@ -8,13 +8,13 @@ COMMENT-utils= mapserver utilities
> COMMENT-php= PHP Mapscript extension
> COMMENT-perl=Perl Mapscript binding
>
> -V = 5.6.5
> +V = 6.0.0
> DISTNAME=mapserver-${V}
> PKGNAME-main=${DISTNAME}
> PKGNAME-utils= mapserver-utils-${V}
> PKGNAME-php= php5-mapscript-${V}
> PKGNAME-perl=p5-mapscript-${V}
> -REVISION-main= 1
> +REVISION-main= 0
> REVISION-utils= 0
>
> CATEGORIES= geo www
> @@ -76,7 +76,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/
>
> MAKE_ENV=CFLAGS+=-fPIC
>
> -UTILS= shp2img shp2pdf legend shptree shptreevis shptreetst scalebar \
> +UTILS= shp2img legend shptree shptreevis shptreetst scalebar \
> sortshp tile4ms msencrypt
>
> PREFIX-main= /var/www
> @@ -95,7 +95,7 @@ do-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mapserver/perl
>
> ${INSTALL_PROGRAM} ${WRKSRC}/mapserv ${WRKINST}/${PREFIX-main}/cgi-bin
> - ${INSTALL_DATA} ${WRKSRC}/mapscript/php3/php_mapscript.so \
> + ${INSTALL_DATA} ${WRKSRC}/mapscript/php/php_mapscript.so \
> ${WRKINST}/${PREFIX-php}/lib/php/modules/mapscript.so
> echo "; Enable Mapscript extension module\nextension=mapscript.so" \
> > ${WRKINST}/${PREFIX-php}/conf/php5.sample/mapscript.ini
> @@ -103,7 +103,7 @@ do-install:
> ${INSTALL_PROGRAM} ${WRKSRC}/${i} ${PREFIX}/bin/
> .endfor
> ${INSTALL_SCRIPT} ${WRKSRC}/mapserver-config ${PREFIX}/bin/
> - ${INSTALL_DATA} ${WRKSRC}/mapscript/php3/examples/* \
> + ${INSTALL_DATA} ${WRKSRC}/mapscript/php/examples/* \
> ${PREFIX}/share/examples/mapserver/php
> ${INSTALL_DATA} ${WRKSRC}/mapscript/perl/examples/* \
> ${PREFIX}/share/examples/mapserver/perl
> Index: mapserver/distinfo
> ===
> RCS file: /cvs/ports/geo/mapserver/distinfo,v
> retrieving revision 1.6
> diff -u -p -u -r1.6 distinfo
> --- mapserver/distinfo27 Jul 2010 08:57:38 - 1.6
> +++ mapserver/distinfo27 May 2011 23:51:45 -
> @@ -1,5 +1,5 @@
> -MD5 (mapserver-5.6.5.tar.gz) = M6u/J/qOO/LFMlfCGIpnsw==
> -RMD160 (mapserver-5.6.5.tar.gz) = D+83rfqk9xzsBrrkG7xJSQR4YXQ=
> -SHA1 (mapserver-5.6.5.tar.gz) = yz23CTzu+exa9kucKmY4LQlCmXI=
> -SHA256 (mapserver-5.6.5.tar.gz) =
> rKyv5hArHxhQlO/8RbWwpdO6ayGk2+IJyoSks9hXmMU=
> -SIZE (mapserver-5.6.5.tar.gz) = 2314003
> +MD5 (mapserver-6.0.0.tar.gz) = W8sab7SnQ+nwaUZvvfSrdg==
> +RMD160 (mapserver-6.0.0.tar.gz) = syTfAYHiPPWvRvdor1n2WswT/54=
> +SHA1 (mapserver-6.0.0.tar.gz) = S72O9WqhOJ3kyAtHduANtThSk2c=
> +SHA256 (mapserver-6.0.0.tar.gz) =
> knCTM2ZcR4T2mxjRqOeN2A+HpmtdSQ/Q5J7yumFr2a8=
> +SIZE (mapserver-6.0.0.tar.gz) = 2435310
> Index: mapserver/patches/patch-configure
> ===
> RCS file: /cvs/ports/geo/mapserver/patches/patch-configure,v
> retrieving revision 1.3
> diff -u -p -u -r1.3 patch-configure
> --- mapserver/patches/patch-configure 21 Nov 2010 09:32:57 - 1.3
> +++ mapserver/patches/patch-configure 27 May 2011 23:51:45 -
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-configure,v 1.3 2010/11/21 09:32:57 landry Exp $
> configure.orig Thu Jul 8 22:07:15 2010
> -+++ configureWed Nov 17 22:14:47 2010
> -@@ -3360,7 +3360,7 @@ if test $ac_cv_lib_m_exp = yes; then
> +--- configure.orig Wed Apr 27 09:06:17 2011
> configureThu May 26 19:59:16 2011
> +@@ -3361,7 +3361,7 @@ if test $ac_cv_lib_m_exp = yes; then
> XTRALIBS="$XTRALIBS -lm"
> fi
>
> @@ -10,12 +10,12 @@ $OpenBSD: patch-configure,v 1.3 2010/11/
>
>
> echo "$as_me:$LINENO: checking for __gxx_personality_v0 in -lstdc++" >&5
> -@@ -9790,7 +9790,7 @@ fi
> -
> - RGBA_PNG_ENABLED=$RGBA_PNG_ENABLED
> -
> --PNG_INC=$PNG_INC
> -+PNG_INC=-I$PNG_DIR/include/libpng
> -
> - PNG_LIB=$PNG_LIB
> +@@ -5363,7 +5363,7 @@ if test -n "$PNG_DIR" ; then
> + test -f $PNG_DIR/lib/libpng.a -o -f $PNG_DIR/lib/libpng.so -o -f
> $PNG_DIR/lib/libpng.sl -o -f $PNG_DIR/lib/libpng.dylib &&
> PNG_LIBDIR="$PNG_DIR/lib"
> + test -f $PNG_DIR/lib64/libpng.a -o -f $PNG_DIR/lib64/libpng.so -o -f
> $PNG_DIR/lib64/libpng.sl -o -f $PNG_DIR/libpng.dylib &&
> PNG_LIBDIR="$PNG_DIR/lib64"
> + test -f $PNG_DIR/libpng.a -o -f $PNG_DIR/libpng.so -o -f
> $PNG_DI
