Re: [update] minetest
On Wed, Sep 26, 2012 at 12:11:06AM +0200, Anders Trobäck wrote: > Hi, > > an update of games/minetest! > > What say you? Did you make sure that github generated tarballs with stable checksums ? iirc, it doesnt. Also, you dont need the .orig patch in the diff, this is confusing. minetest_game will need a @conflict marker against minetest-<=0.4.1 and probably a hint in DESCR that _game is needed if you dont plan to play online. I'll handle all that.. Landry
【09/26/11:25 】【早乙女様からの連絡先交換希望】
早乙女和樹様より【連絡先交換希望】の連絡が届いております。 ●● ★業界NO1実績サイト★ ●● ★☆★会員数NO1★☆★ ●● ★2012年出会い率1位★ ●● この度サイトの正会員である【早乙女様】の連絡先（アドレス＆電話番号）を受取る事が出来ます。 ▼早乙女様のプロフィール▼（閲覧無料） http://www.panther-w.biz/j/101_kazuki.php?mno=39118&mid=21153911815SapMiSmEYyD1XWlcufHq9wTjxnp1 ▲ 上記より早乙女様にメールを送る事が出来ます。 サイトではトラブル防止の為にサイトの【正会員様】しか個人情報の（アドレス等電話番号など）交換は出来ません。 ※お試し会員様の場合はアドレスや電話番号などの個人情報は【※※※】となってしまいます。 しかし早乙女様同様、お客様も同じ会員状態、正会員になって頂けましたら早乙女様とアドレス等連絡先を交換をして頂けます。同じ会員状態になる為には【条件】を満たす必要がございます。早乙女様同様に【正会員】の状態となる為の【条件】は【5000円】のポイントを購入するだけで【正会員】となれます。 ※今回の件で早乙女様はもちろんサイトの他の会員様とも【個人情報】の交換が可能となります。 ※会員数は100万人を越えておりますので、最高優遇会員様の理想の出会いや目的をサイトでも応援させて頂きます。 恋愛関係はもちろんセレブの方や普段では知り会う事が出来ない多くの会員様達が多数最高優遇会員様をお待ちしています。 ※正会員になる為のお手続明日の【21時】まで※ ↓正会員優遇サービス↓ ●豪華抽選会等有り● 最新パソコンや液晶テレビ、旅行券など、ブランド物などが獲得出来る抽選会が定期的に行われています。 ●オフ会有り● 業界NO1サイトだからこそオフ会等も会員様同士で行われています。セレブの方や同じ趣味をお持ちの方など、様々な方とお会いする事が出来ます。 このようなサービス以外に正会員様だからこそ受けれるサービスも多数ございます。是非正会員となって頂きサービスをお受けくださいませ。 ●【09/26】【本日限定豪華特典進呈】● 最高優遇会員様が今回の件を利用して、早乙女様と連絡先を交換して頂きましたら【出会い応援特典】としてサイトより下記豪華特典を【完全無料】で進呈いたします。 ●サイト完全無料利用 ●サイトからの特典→500万円分 以上がサイトからの【完全無料】で受取れます。 ●※ポイント購入方法※● 下記よりログイン後各種決済から【5000円】を購入頂く事が出来ますのでページ参照の上ご決済くださいませ。 ▼ログイン▼ http://www.panther-w.biz/j/mmenu.php?mno=39118&mid=21153911815SapMiSmEYyD1XWlcufHq9wTjxnp1 ※銀行振り込み等クレジット各種決済がご利用になれます。 ※銀行振り込みに決済を希望される際は【cont...@panther-w.biz】までメールにて【口座情報を教えてください】と、ご連絡頂ければ即お教えいたしますので、ご連絡させて頂いた口座にお振り込みの方をお願い申し上げます。 振り込み名義人は【39118】でお願い申し上げます。 【5000円】のポイントを購入が完了いたしましたら【cont...@panther-w.biz】までメールにて【正会員昇格希望】とご連絡頂けましたら、即正会員となる事が出来ますので、サイトからの手続完了の連絡をお待ちくださいませ。
Re: net/snort update to 2.9.3.1
On Mon, Sep 24, 2012 at 12:42:19PM -0400, Adam Jeanguenat wrote: >I've also given this some testing on -current i386 and have no issues > to report. Great work. > >Looking at http://lteo.net/stuff/snort-2.9.3.1.diff2, I noticed the > use of the auto-generated download IDs as the MASTER_SITES for daq and > snort. I've run into problems before when committing those IDs to > documentation, as I've seen them change within the same snort/daq > release. > >To make life easier, Sourcefire provides a URL that works without > respect to the automatically-incremented ID number for every file upload > to snort.org: > > http://www.snort.org/snort-downloads/cli > >Attached is a patch for net/snort/Makefile, (to be applied after > snort-2.9.3.1.diff2), and a corresponding patch for net/daq/Makefile. > These should make future maintenance a bit easier. > >I tested them both by starting fresh and following the instructions > here in the above URL, then applied both of the patches after > snort-2.9.3.1.diff2, then did a `make` in net/snort. With lteo's patch > daq is built automatically via WANTLIB, so it's not necessary to build > it separately first. > >Any thoughts? Hi Adam, Thank you for letting us know about the better download URL. For now, I have gone ahead and committed Markus's original diff to make it easier to discuss changes to the Snort port going forward. About your diff, it looks good, but introducing VERSION is generally only needed if DISTNAME and PKGNAME are different (for an example, please look at productivity/taskwarrior/Makefile). I have modified your diff to match against the latest CVS checkout of the DAQ and Snort ports, and confirmed that the downloaded distfiles from that URL match the original checksums. Markus: are you OK with this diff? Thanks, Lawrence Index: daq/Makefile === RCS file: /cvs/ports/net/daq/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- daq/Makefile26 Sep 2012 01:40:32 - 1.1.1.1 +++ daq/Makefile26 Sep 2012 02:37:46 - @@ -2,12 +2,8 @@ COMMENT = data acquisition library for snort -# Original URL http://www.snort.org/downloads/1850 redirects to a -# time-limited Amazon S3 url. This would mean a bad distfile name. -# The following hack allows it to work but XXX if updating, the -# MASTER_SITES URL will need to be adjusted, not just DISTNAME. DISTNAME = daq-1.1.1 -MASTER_SITES = http://www.snort.org/downloads/1850?/ +MASTER_SITES = http://www.snort.org/dl/snort-current/ CATEGORIES = net Index: snort/Makefile === RCS file: /cvs/ports/net/snort/Makefile,v retrieving revision 1.68 diff -u -p -r1.68 Makefile --- snort/Makefile 26 Sep 2012 02:11:05 - 1.68 +++ snort/Makefile 26 Sep 2012 02:37:46 - @@ -4,12 +4,8 @@ SHARED_ONLY = Yes COMMENT = highly flexible sniffer/NIDS -# Original URL http://dl.snort.org/downloads/1862 redirects to a -# time-limited Amazon S3 url. This would mean a bad distfile name. -# The following hack allows it to work but XXX if updating, the -# MASTER_SITES URL will need to be adjusted, not just DISTNAME. DISTNAME = snort-2.9.3.1 -MASTER_SITES = http://www.snort.org/downloads/1862?/ +MASTER_SITES = http://www.snort.org/dl/snort-current/ CATEGORIES = net security
[パラコミュ]美山様より新着メッセージ
[最高優遇会員]様宛に[美山]様よりメッセージが届いております ∞--∞--∞--∞--∞ ≪新着メッセージ≫ ∞--∞--∞--∞--∞ ▼こちらより 『はじめまして！美山と申します。パラコミュはまだできたてのサイトのようで、知り合いの会社の社長に紹介してもらい登録しました。特別優遇されている会員は最高優遇会員さんしかまだいないようなので、初めてということもあり、サポートの方にご紹介していただきました。どうぞ宜しくお願い致します。私のプロフィールを見ていただければ分かると思うのですが、出会いはいくつあっても困るものではないと思いますので、おひまになった頃合いで構いませんので、一度ご連絡いただければ幸いです。もしそこから発展できるようであれば、楽しい出会いを実現したいです。』 ▼美山様へ返信/PR http://www.para-comu.me/j/miyama.php?mno=39264&mid=1306392641z3r1YeSrGQYfrGIcWFzoBSm2Fa4XH ∞--∞--∞--∞--∞ [配信停止] http://www.para-comu.me/j/taikai.php?mno=39264&mid=1306392641z3r1YeSrGQYfrGIcWFzoBSm2Fa4XH ∞--∞--∞--∞--∞ ▼専用ページ http://www.para-comu.me/j/mmenu.php?mno=39264&mid=1306392641z3r1YeSrGQYfrGIcWFzoBSm2Fa4XH ▼問い合わせ cont...@para-comu.me [パラコミュ]18禁
[update] devel/libevent2
update libevent to 2.0.20 Index: Makefile === RCS file: /cvs/ports/devel/libevent2/Makefile,v retrieving revision 1.4 diff -N -u -p Makefile --- Makefile13 May 2012 13:50:17 - 1.4 +++ Makefile26 Sep 2012 01:05:42 - @@ -2,7 +2,7 @@ COMMENT= event notification library -V= 2.0.19 +V= 2.0.20 DISTNAME= libevent-$V-stable PKGNAME= libevent-$V CATEGORIES=devel Index: distinfo === RCS file: /cvs/ports/devel/libevent2/distinfo,v retrieving revision 1.4 diff -N -u -p distinfo --- distinfo13 May 2012 13:50:17 - 1.4 +++ distinfo26 Sep 2012 01:05:42 - @@ -1,5 +1,2 @@ -MD5 (libevent-2.0.19-stable.tar.gz) = kREVeXafRgVbCkOPXMWVcg== -RMD160 (libevent-2.0.19-stable.tar.gz) = sr35vqSxpBUOG2d1VM7Yn/Ia1ck= -SHA1 (libevent-2.0.19-stable.tar.gz) = KMEJGQNFzlRprdjPP0XF3Vf+KoU= -SHA256 (libevent-2.0.19-stable.tar.gz) = FZH7QRpnh2pRSjPfVLhUF7MeAYAChLzGiU/EEMPq6iE= -SIZE (libevent-2.0.19-stable.tar.gz) = 842961 +SHA256 (libevent-2.0.20-stable.tar.gz) = EGmKDmq7PKALHJ6M/dxmkzvMTJx4tWAKcGTEw++caiQ= +SIZE (libevent-2.0.20-stable.tar.gz) = 845446
Re: NEW: net/ngircd
On 2012/09/16 14:05, Federico Schwindt wrote: > Hi, > > Attached is a port of ngircd, a lightweight irc server. I've been > running it for a few days and I'm quite happy. > Comments? OK? > > f.- Works for me (though with trivial traffic and no linked servers) on macppc with SSL. OK though if you don't mind I'd rather patch the sample config to suggest a dedicated chroot directory rather than /var/empty, seeing as config files and any SSL keys used need to be there in order for reload to work, and it's better if those aren't in the system shared /var/empty dir. (Maybe even worth setting up the package so that it chroots by default, though this is easy enough for the user and probably unnecessary hassle in the package).
Re: asterisk update
On 2012/09/19 10:50, Stuart Henderson wrote: > if you're using asterisk, especially with appkonference or asterisk-g729, > please give this update to 10.x a spin and report back. (diff also touches > appkonference and g729 which will need rebuilding too). > > diff is 180K so it's on http. > > curl http://junkpile.org/ast10.diff | patch -d /usr/ports/telephony -Ep0 > New version, http://junkpile.org/ast10.diff.2, generated after the sound-file changes. I've also tweaked some sample configs, notably correcting the text in sip.conf dealing with IPv6 which is incorrect for OpenBSD as we don't support mapped IPv4 connections on v6 sockets, and Asterisk doesn't support binding to multiple sockets.
Re: NEW: sysutils/multitime
On 2012/09/25 21:42, Laurence Tratt wrote:
> I've put a port for sysutils/multitime into openbsd-wip [1]. From the DESCR:
>
> Unix's 'time' utility is a simple and often effective way of measuring how
> long a command takes to run ('wall time'). Unfortunately, running a command
> once can give misleading timings: the process may create a cache on its
> first
> execution, running faster subsequently; other processes may cause the
> command
> to be starved of CPU or IO time; etc. It is common to see people run 'time'
> several times and take whichever values they feel most comfortable with.
> Inevitably, this causes problems.
>
> multitime is, in essence, a simple extension to time which runs a command
> multiple times and prints the timing means, standard deviations, mins,
> medians, and maxes having done so. This can give a much better understanding
> of the command's performance.
>
> As well its more advanced features, multitime also has the advantage that it
> can be used as a drop-in replacement for /usr/bin/time. More at
>
Re: New: fonts/adobe-source-code-pro
On Wed, Sep 26, 2012 at 12:49:07AM +0200, Antoine Jacoutot wrote: > On Tue, Sep 25, 2012 at 11:49:10PM +0200, Juan Francisco Cantero Hurtado > wrote: > > On Tue, Sep 25, 2012 at 08:21:10AM -0600, Aaron Bieber wrote: > > > On Tue, Sep 25, 2012 at 01:29:35AM +0200, Juan Francisco Cantero Hurtado > > > wrote: > > > > Adobe announced today "Source Code Pro", the version monospaced of their > > > > font Source Sans Pro: > > > > http://blogs.adobe.com/typblography/2012/09/source-code-pro.html > > > > > > > > This port is just a quick modification of the port of Source Sans in > > > > case someone is interested :) > > > > > > Looks like you forgot to add @fontdir to the plist. > > > > I deliberately didn't add the @fontdir because the other adobe font > > doesn't have @fontdir in the PLIST :) > > Fixed in tree. Thanks! -- Juan Francisco Cantero Hurtado http://juanfra.info
UPDATE: devel/p5-BSD-stat
Hi,
I have updated BSD::stat to 1.33 which gives us the new functions
utimes() and lutimes(). Unfortunately lutimes() is specific to
FreeBSD. So I emulated it with OpenBSD utimensat() and added a
test.
ok?
bluhm
Index: devel/p5-BSD-stat/Makefile
===
RCS file: /data/mirror/openbsd/cvs/ports/devel/p5-BSD-stat/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- devel/p5-BSD-stat/Makefile 30 Aug 2012 21:16:14 - 1.12
+++ devel/p5-BSD-stat/Makefile 25 Sep 2012 21:38:27 -
@@ -4,8 +4,7 @@ SHARED_ONLY = Yes
COMMENT = stat() with BSD 4.4 extentions
-DISTNAME = BSD-stat-1.21
-REVISION = 5
+DISTNAME = BSD-stat-1.33
CATEGORIES = devel
@@ -14,7 +13,7 @@ MAINTAINER = Alexander Bluhm
+ #include
+-#include
+ #include
++#include
++#include
+
+ /*
+ * Perl prior to 5.6.0 lacks newSVuv()
+@@ -137,12 +138,21 @@ xs_utimes(double atime, double mtime, char *path){
+
+ static int
+ xs_lutimes(double atime, double mtime, char *path){
++#ifdef __OpenBSD__
++struct timespec times[2];
++times[0].tv_sec = (int)atime;
++times[0].tv_nsec = (int)((atime - times[0].tv_sec) * 1e9);
++times[1].tv_sec = (int)mtime;
++times[1].tv_nsec = (int)((mtime - times[1].tv_sec) * 1e9);
++int err = utimensat(AT_FDCWD, path, times, AT_SYMLINK_NOFOLLOW);
++#else
+ struct timeval times[2];
+ times[0].tv_sec = (int)atime;
+ times[0].tv_usec = (int)((atime - times[0].tv_sec) * 1e6);
+ times[1].tv_sec = (int)mtime;
+ times[1].tv_usec = (int)((mtime - times[1].tv_sec) * 1e6);
+ int err = lutimes(path, times);
++#endif
+ return setbang(err);
+ }
+
Index: devel/p5-BSD-stat/patches/patch-t_utimes_t
===
RCS file: devel/p5-BSD-stat/patches/patch-t_utimes_t
diff -N devel/p5-BSD-stat/patches/patch-t_utimes_t
--- /dev/null 1 Jan 1970 00:00:00 -
+++ devel/p5-BSD-stat/patches/patch-t_utimes_t 25 Sep 2012 22:28:11 -
@@ -0,0 +1,27 @@
+$OpenBSD$
+--- t/utimes.t.origTue Aug 21 12:06:22 2012
t/utimes.t Wed Sep 26 00:28:08 2012
+@@ -5,7 +5,7 @@
+ use strict;
+ use warnings;
+ use BSD::stat;
+-use Test::More tests => 5;
++use Test::More tests => 8;
+ use File::Spec;
+
+ my $target = File::Spec->catfile('t', "test$$");
+@@ -20,8 +20,13 @@ $st = stat($wfh);
+ close $wfh;
+
+ symlink $target, $symlink or die "symlink $target, $symlink : $!";
+-ok lutimes(0, 0, $symlink), "lutimes($when, $when, $symlink)";
++ok lutimes(0, 0, $symlink), "lutimes(0, 0, $symlink)";
+ is lstat($symlink)->mtime, 0, "lutimes() does touch $symlink";
+ is lstat($target)->mtime, 1234567890, "lutimes() leaves $target";
++
++$when = 1234.5678;
++ok lutimes($when, $when, $symlink), "lutimes($when, $when, $symlink)";
++is lstat($symlink)->mtime, 1234, "lutimes() wrong sec on $symlink";
++is lstat($symlink)->mtimensec, 56780, "lutimes() wrong nsec on $symlink";
+
+ unlink($target, $symlink) == 2 or die "unlink($target, $symlink):$!";
Re: New: fonts/adobe-source-code-pro
On Tue, Sep 25, 2012 at 11:49:10PM +0200, Juan Francisco Cantero Hurtado wrote: > On Tue, Sep 25, 2012 at 08:21:10AM -0600, Aaron Bieber wrote: > > On Tue, Sep 25, 2012 at 01:29:35AM +0200, Juan Francisco Cantero Hurtado > > wrote: > > > Adobe announced today "Source Code Pro", the version monospaced of their > > > font Source Sans Pro: > > > http://blogs.adobe.com/typblography/2012/09/source-code-pro.html > > > > > > This port is just a quick modification of the port of Source Sans in > > > case someone is interested :) > > > > Looks like you forgot to add @fontdir to the plist. > > I deliberately didn't add the @fontdir because the other adobe font > doesn't have @fontdir in the PLIST :) Fixed in tree. -- Antoine
[update] fonts/adobe-source-sans-pro
Hola,
This change adds @fontdir to fonts/adobe-source-sans-pro. Bumped
REVISION whilst here.
Looking for 2 OKs
Cheers,
Aaron
Index: Makefile
===
RCS file: /cvs/ports/fonts/adobe-source-sans-pro/Makefile,v
retrieving revision 1.1
diff -N -u -p Makefile
--- Makefile19 Aug 2012 14:35:33 - 1.1
+++ Makefile25 Sep 2012 22:19:23 -
@@ -8,6 +8,8 @@ PKGNAME = adobe-source-sans-pro-${VERSION}
CATEGORIES = fonts x11
EXTRACT_SUFX = .zip
+REVISION=0
+
HOMEPAGE = http://sourceforge.net/projects/sourcesans.adobe/
# OFL http://scripts.sil.org/OFL
Index: pkg/PLIST
===
RCS file: /cvs/ports/fonts/adobe-source-sans-pro/pkg/PLIST,v
retrieving revision 1.1
diff -N -u -p pkg/PLIST
--- pkg/PLIST 19 Aug 2012 14:35:33 - 1.1
+++ pkg/PLIST 25 Sep 2012 22:19:23 -
@@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1 2012/08/19 14:35:33 matthieu Exp $
lib/X11/fonts/
-lib/X11/fonts/adobe-source-sans-pro/
+@fontdir lib/X11/fonts/adobe-source-sans-pro/
lib/X11/fonts/adobe-source-sans-pro/SourceSansPro-Black.ttf
lib/X11/fonts/adobe-source-sans-pro/SourceSansPro-BlackIt.ttf
lib/X11/fonts/adobe-source-sans-pro/SourceSansPro-Bold.ttf
Re: graphics/clutter/mx configure
On Tue, Sep 25, 2012 at 05:57:34PM -0400, RD Thrush wrote:
> configure fails:
>
> cd /usr/obj/amd64/ports/mx-1.4.7/clutter-project-mx-32cb530/ && env
> AUTOCONF_VERSION=2.69 AUTOMAKE_VERSION=1.12 autogen.sh
> env: autogen.sh: No such file or directory
> *** Error code 127 in target pre-configure
>
> The following fixes it for me:
>
> Index: Makefile
> ===
> RCS file: /usr/ports/graphics/clutter/mx/Makefile,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 Makefile
> --- Makefile25 Sep 2012 14:45:31 - 1.5
> +++ Makefile25 Sep 2012 21:44:54 -
> @@ -44,7 +44,7 @@ AUTOCONF_VERSION= 2.69
>
> pre-configure:
> cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
> - AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autogen.sh
> + AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
>
> .include
Yes this is correct and what it should be.
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
[update] minetest
Hi,
an update of games/minetest!
What say you?
\\andersdiff -uNr --exclude=CVS minetest.orig/Makefile minetest/Makefile
--- minetest.orig/Makefile Tue Sep 25 23:48:42 2012
+++ minetest/Makefile Tue Sep 25 22:27:03 2012
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2012/08/07 13:39:54 landry Exp $
COMMENT = infinite-world block sandbox game
-DISTNAME = minetest-0.4.1
+DISTNAME = minetest-0.4.3
CATEGORIES = games x11
HOMEPAGE = http://www.minetest.net/
@@ -12,18 +12,16 @@
PERMIT_DISTFILES_CDROM = Yes
PERMIT_DISTFILES_FTP = Yes
-DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
- minetest-game-0.4.1${EXTRACT_SUFX}
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
-#https://github.com/celeron55/minetest_game/tarball/0.4.1
-#https://github.com/celeron55/minetest/tarball/0.4.1
-MASTER_SITES = http://rhaalovely.net/stuff/
+MASTER_SITES = https://github.com/celeron55/minetest/tarball/stable-0.4/
-WRKDIST= ${WRKDIR}/celeron55-minetest-e3ddbe8/
+WRKDIST= ${WRKDIR}/celeron55-minetest-9696ed3/
MODULES = devel/cmake \
devel/gettext
-CONFIGURE_ARGS = -DENABLE_GETTEXT=ON
+CONFIGURE_ARGS = -DENABLE_GETTEXT=ON \
+ -DRUN_IN_PLACE=0
RUN_DEPENDS= devel/desktop-file-utils \
x11/gtk+2,-guic
@@ -34,10 +32,5 @@
WANTLIB += GL GLU ICE SM X11 Xext Xxf86vm bz2 c jpeg m ogg openal
WANTLIB += png pthread sqlite3 stdc++ vorbis vorbisfile z
-
-post-install:
- mv ${WRKDIR}/celeron55-minetest_game-6ba4f01/ \
- ${PREFIX}/share/minetest/games/minetest_game
- chown -R ${SHAREOWN}:${SHAREGRP} ${PREFIX}/share/minetest/games/minetest_game
.include
diff -uNr --exclude=CVS minetest.orig/distinfo minetest/distinfo
--- minetest.orig/distinfo Tue Sep 25 23:48:42 2012
+++ minetest/distinfo Tue Sep 25 22:27:03 2012
@@ -1,4 +1,2 @@
-SHA256 (minetest-0.4.1.tar.gz) = +6ox5n9GsmNq38afSFSDdplBYg/XNCz9iaziJ4t93lc=
-SHA256 (minetest-game-0.4.1.tar.gz) = ywjLpGcie4ZXozNIok+EIJ4WLAVrqDhZh9ntaIY16fo=
-SIZE (minetest-0.4.1.tar.gz) = 2060872
-SIZE (minetest-game-0.4.1.tar.gz) = 255562
+SHA256 (minetest-0.4.3.tar.gz) = iZN4ujtpK/jaJpjaO/kbHea724v42TtO1FI9QoG7l3s=
+SIZE (minetest-0.4.3.tar.gz) = 2080827
diff -uNr --exclude=CVS minetest.orig/patches/patch-CMakeLists_txt minetest/patches/patch-CMakeLists_txt
--- minetest.orig/patches/patch-CMakeLists_txt Tue Sep 25 23:48:42 2012
+++ minetest/patches/patch-CMakeLists_txt Tue Sep 25 22:27:03 2012
@@ -1,12 +1,12 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2012/08/07 13:39:54 landry Exp $
CMakeLists.txt.orig Fri Jul 20 17:23:37 2012
-+++ CMakeLists.txt Fri Jul 20 17:23:55 2012
+$OpenBSD$
+--- CMakeLists.txt.orig Sun Sep 23 01:57:36 2012
CMakeLists.txt Sun Sep 23 01:58:00 2012
@@ -81,7 +81,7 @@ elseif(UNIX) # Linux, BSD etc
- set(SHAREDIR "share/${PROJECT_NAME}")
- set(BINDIR "bin")
- set(DOCDIR "share/doc/${PROJECT_NAME}")
-- set(MANDIR "share/man")
-+ set(MANDIR "man")
+ set(SHAREDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}")
+ set(BINDIR "${CMAKE_INSTALL_PREFIX}/bin")
+ set(DOCDIR "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}")
+- set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man")
++ set(MANDIR "${CMAKE_INSTALL_PREFIX}/man")
set(EXAMPLE_CONF_DIR ${DOCDIR})
- set(XDG_APPS_DIR "share/applications")
- set(ICONDIR "share/icons")
+ set(XDG_APPS_DIR "${CMAKE_INSTALL_PREFIX}/share/applications")
+ set(ICONDIR "${CMAKE_INSTALL_PREFIX}/share/icons")
diff -uNr --exclude=CVS minetest.orig/patches/patch-src_porting_cpp minetest/patches/patch-src_porting_cpp
--- minetest.orig/patches/patch-src_porting_cpp Tue Sep 25 23:48:42 2012
+++ minetest/patches/patch-src_porting_cpp Tue Sep 25 22:27:03 2012
@@ -1,15 +1,12 @@
-$OpenBSD: patch-src_porting_cpp,v 1.1.1.1 2012/08/07 13:39:54 landry Exp $
src/porting.cpp.orig Wed Jun 6 23:40:04 2012
-+++ src/porting.cpp Fri Jul 20 19:05:55 2012
-@@ -295,9 +295,9 @@ void initializePaths()
+$OpenBSD$
+--- src/porting.cpp.orig Tue Sep 25 21:54:06 2012
src/porting.cpp Tue Sep 25 21:55:13 2012
+@@ -318,7 +318,7 @@ void initializePaths()
path_user = std::string(getenv("HOME")) + "/Library/Application Support/" + PROJECT_NAME;
- #elif defined(__FreeBSD__)
+ #elif defined(__FreeBSD__) || defined (__OpenBSD__)
-- path_share = std::string(INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
-+ path_share = std::string(CMAKE_INSTALL_PREFIX) + "/share/" + PROJECT_NAME;
+ path_share = STATIC_SHAREDIR;
path_user = std::string(getenv("HOME")) + "/." + PROJECT_NAME;
-
- #endif
diff -uNr --exclude=CVS minetest.orig/patches/patch-src_porting_cpp.orig minetest/patches/patch-src_porting_cpp.orig
--- minetest.orig/patches/patch-src_porting_cpp.orig Thu Jan 1 01:00:00 1970
+++ minetest/patches/patch-src_porting_cpp.orig Tue Sep 25 22:27:03 2012
@@ -0,0 +1,39 @@
+$OpenBSD$
+--- src/porting.cpp.orig Tue Sep 25 21:30:33 2012
src/porting.cpp Tue Sep 25 21:36:06 2012
+@@ -126,8 +126,8 @@ void signal_handler_init(void)
+ */
+
+ // Default to RUN_IN_PLACE style relative paths
+-std::string path_share = "..";
+-std::string
[new] minetest_game
Hi, I did a split of the mintest port because you don't need the minetest_game for instance if you only are going to play online. This is my first OpenBSD port so be nice!:-) A update of minetest are in a separate mail. What do you think about this? \\anders minetest_game.tgz Description: application/compressed-tar
graphics/clutter/mx configure
configure fails:
cd /usr/obj/amd64/ports/mx-1.4.7/clutter-project-mx-32cb530/ && env
AUTOCONF_VERSION=2.69 AUTOMAKE_VERSION=1.12 autogen.sh
env: autogen.sh: No such file or directory
*** Error code 127 in target pre-configure
The following fixes it for me:
Index: Makefile
===
RCS file: /usr/ports/graphics/clutter/mx/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile25 Sep 2012 14:45:31 - 1.5
+++ Makefile25 Sep 2012 21:44:54 -
@@ -44,7 +44,7 @@ AUTOCONF_VERSION= 2.69
pre-configure:
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
- AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autogen.sh
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} ./autogen.sh
.include
Re: New: fonts/adobe-source-code-pro
On Tue, Sep 25, 2012 at 08:21:10AM -0600, Aaron Bieber wrote: > On Tue, Sep 25, 2012 at 01:29:35AM +0200, Juan Francisco Cantero Hurtado > wrote: > > Adobe announced today "Source Code Pro", the version monospaced of their > > font Source Sans Pro: > > http://blogs.adobe.com/typblography/2012/09/source-code-pro.html > > > > This port is just a quick modification of the port of Source Sans in > > case someone is interested :) > > Looks like you forgot to add @fontdir to the plist. I deliberately didn't add the @fontdir because the other adobe font doesn't have @fontdir in the PLIST :) -- Juan Francisco Cantero Hurtado http://juanfra.info
UPDATE: security/nikto to 2.1.5
Hi Nigel,
An update for nikto-2.1.5.
full changelog at:
http://cirt.net/nikto2
comments, ok ?
Index: Makefile
===
RCS file: /cvs/ports/security/nikto/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile7 Sep 2011 13:21:11 - 1.20
+++ Makefile25 Sep 2012 20:48:13 -
@@ -2,9 +2,8 @@
COMMENT = web and CGI vulnerability scanner with SSL support
-DISTNAME = nikto-2.1.4
+DISTNAME = nikto-2.1.5
EPOCH =0
-REVISION = 0
CATEGORIES = security www
HOMEPAGE = http://www.cirt.net/nikto2
@@ -25,7 +24,6 @@ EXTRACT_SUFX =.tar.bz2
RUN_DEPENDS = security/p5-Net_SSLeay
NO_BUILD = Yes
-USE_GROFF =Yes
NO_REGRESS = Yes
PKG_ARCH = *
@@ -36,6 +34,7 @@ pre-configure:
${WRKSRC}/nikto.conf
do-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/nikto/databases
${INSTALL_DATA_DIR} ${PREFIX}/share/nikto/plugins
${INSTALL_DATA_DIR} ${PREFIX}/share/nikto/templates
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/nikto
@@ -45,6 +44,7 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/nikto.conf \
${PREFIX}/share/examples/nikto/nikto.conf
+ ${INSTALL_DATA} ${WRKSRC}/databases/* ${PREFIX}/share/nikto/databases
${INSTALL_DATA} ${WRKSRC}/plugins/* ${PREFIX}/share/nikto/plugins
${INSTALL_DATA} ${WRKSRC}/templates/* ${PREFIX}/share/nikto/templates
Index: distinfo
===
RCS file: /cvs/ports/security/nikto/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo27 Mar 2011 16:41:37 - 1.14
+++ distinfo25 Sep 2012 20:48:13 -
@@ -1,5 +1,2 @@
-MD5 (nikto-2.1.4.tar.bz2) = DVjZyie584e2ATDhJduGhw==
-RMD160 (nikto-2.1.4.tar.bz2) = rbiEHSKlHX+fjwybjkOqlCVU2kM=
-SHA1 (nikto-2.1.4.tar.bz2) = 0284XasENSM2wJt+V2SWproYSEo=
-SHA256 (nikto-2.1.4.tar.bz2) = mvkw/qPxJOJi0OY5dyRLa9GeInSfTe+oGLtNmxB61gM=
-SIZE (nikto-2.1.4.tar.bz2) = 288160
+SHA256 (nikto-2.1.5.tar.bz2) = ZbmcH97BTR1efLyWT3D84WLL7FCu6HjhUA4tIt8HmzQ=
+SIZE (nikto-2.1.5.tar.bz2) = 311580
Index: patches/patch-nikto_pl
===
RCS file: /cvs/ports/security/nikto/patches/patch-nikto_pl,v
retrieving revision 1.5
diff -u -p -r1.5 patch-nikto_pl
--- patches/patch-nikto_pl 27 Mar 2011 16:41:37 - 1.5
+++ patches/patch-nikto_pl 25 Sep 2012 20:48:13 -
@@ -1,12 +1,12 @@
$OpenBSD: patch-nikto_pl,v 1.5 2011/03/27 16:41:37 jasper Exp $
nikto.pl.orig Fri Feb 18 23:53:23 2011
-+++ nikto.pl Fri Mar 11 16:55:57 2011
-@@ -313,7 +313,7 @@ sub setup_dirs {
+--- nikto.pl.orig Mon Sep 10 05:22:36 2012
nikto.pl Tue Sep 25 14:13:34 2012
+@@ -333,7 +333,7 @@ sub setup_dirs {
$CONFIGFILE{'TEMPLATEDIR'} = "$CONFIGFILE{'EXECDIR'}/templates";
}
unless (defined $CONFIGFILE{'DOCUMENTDIR'}) {
-$CONFIGFILE{'DOCUMENTDIR'} = "$CONFIGFILE{'EXECDIR'}/docs";
+$CONFIGFILE{'DOCUMENTDIR'} = "$CONFIGFILE{'DOCDIR'}/docs";
}
- return;
- }
+ unless (defined $CONFIGFILE{'DBDIR'}) {
+ $CONFIGFILE{'DBDIR'} = "$CONFIGFILE{'EXECDIR'}/databases";
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/nikto/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -r1.12 PLIST
--- pkg/PLIST 27 Mar 2011 16:41:37 - 1.12
+++ pkg/PLIST 25 Sep 2012 20:48:13 -
@@ -2,7 +2,6 @@
bin/nikto
@man man/man1/nikto.1
share/doc/nikto/
-@comment no checksum
share/doc/nikto/CHANGES.txt
share/doc/nikto/nikto.dtd
share/doc/nikto/nikto_manual.html
@@ -10,34 +9,42 @@ share/examples/nikto/
share/examples/nikto/nikto.conf
@sample ${SYSCONFDIR}/nikto.conf
share/nikto/
-share/nikto/plugins/
-share/nikto/plugins/LW2.pm
+share/nikto/databases/
+@comment no checksum
+share/nikto/databases/db_404_strings
+@comment no checksum
+share/nikto/databases/db_content_search
+@comment no checksum
+share/nikto/databases/db_dictionary
+@comment no checksum
+share/nikto/databases/db_embedded
@comment no checksum
-share/nikto/plugins/db_404_strings
+share/nikto/databases/db_favicon
@comment no checksum
-share/nikto/plugins/db_content_search
+share/nikto/databases/db_headers
@comment no checksum
-share/nikto/plugins/db_embedded
+share/nikto/databases/db_httpoptions
@comment no checksum
-share/nikto/plugins/db_favicon
+share/nikto/databases/db_multiple_index
@comment no checksum
-share/nikto/plugins/db_headers
+share/nikto/databases/db_outdated
@comment no checksum
-share/nikto/plugins/db_httpoptions
+share/nikto/databases/db_parked_strings
@comment no checksum
-share/nikto/plugins/db_multiple_index
+share/nikto/databases/db_realms
@comment no checksum
-share/nikto/plugins/db_outdated
+share/nikto/databases/db_server_msgs
@comment no checksum
-share/nikto/plugins/db_realms
+share/nikto/d
Re: cmake: build shared libraries without soname
On Tue, Sep 25, 2012 at 10:31 PM, Nigel Taylor
wrote:
> On 09/24/12 15:14, David Coppa wrote:
>>
>> Hi,
>>
>> The following diff lets cmake build shared libraries without soname,
>> which is compliant to our policy for shared libraries.
>>
>> This should go in a bulk build.
>> I already know for example that net/libproxy is failing with this,
>> but I already have patches ready for it...
>>
>> Let me know about other eventual failures caused by this patch.
>>
>> Thanks!
>> David
>>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/devel/cmake/Makefile,v
>> retrieving revision 1.64
>> diff -u -p -r1.64 Makefile
>> --- Makefile 31 Aug 2012 12:28:31 - 1.64
>> +++ Makefile 24 Sep 2012 14:06:42 -
>> @@ -7,6 +7,7 @@ HOMEPAGE =http://www.cmake.org/
>> CATEGORIES = devel
>> COMMENT =portable build system
>> DISTNAME = cmake-2.8.9
>> +REVISION = 0
>> MASTER_SITES = ${HOMEPAGE}files/v2.8/
>>
>> MAINTAINER = David Coppa
>> Index: patches/patch-Source_cmComputeLinkInformation_cxx
>> ===
>> RCS file: patches/patch-Source_cmComputeLinkInformation_cxx
>> diff -N patches/patch-Source_cmComputeLinkInformation_cxx
>> --- /dev/null 1 Jan 1970 00:00:00 -
>> +++ patches/patch-Source_cmComputeLinkInformation_cxx 24 Sep 2012 14:06:43
>> -
>> @@ -0,0 +1,68 @@
>> +$OpenBSD$
>> +--- Source/cmComputeLinkInformation.cxx.orig Thu Aug 9 20:15:19 2012
>> Source/cmComputeLinkInformation.cxx Tue Aug 28 14:27:03 2012
>> +@@ -1059,12 +1059,18 @@ void
>> cmComputeLinkInformation::AddTargetItem(std::stri
>> + this->SharedLibrariesLinked.insert(target);
>> + }
>> +
>> +- // Handle case of an imported shared library with no soname.
>> +- if(this->NoSONameUsesPath &&
>> +- target->IsImportedSharedLibWithoutSOName(this->Config))
>> ++ if(this->OpenBSD)
>> + {
>> + this->AddSharedLibNoSOName(item);
>> + return;
>> ++} else {
>> ++// Handle case of an imported shared library with no soname.
>> ++if(this->NoSONameUsesPath &&
>> ++ target->IsImportedSharedLibWithoutSOName(this->Config))
>> ++ {
>> ++ this->AddSharedLibNoSOName(item);
>> ++ return;
>> ++ }
>> + }
>> +
>> + // If this platform wants a flag before the full path, add it.
>> +@@ -1389,23 +1395,29 @@ void
>> cmComputeLinkInformation::AddFrameworkPath(std::s
>> +
>> //
>> + bool cmComputeLinkInformation::CheckSharedLibNoSOName(std::string const&
>> item)
>> + {
>> +- // This platform will use the path to a library as its soname if the
>> +- // library is given via path and was not built with an soname. If
>> +- // this is a shared library that might be the case.
>> +- std::string file = cmSystemTools::GetFilenameName(item);
>> +- if(this->ExtractSharedLibraryName.find(file))
>> ++ if(this->OpenBSD)
>> + {
>> +-// If we can guess the soname fairly reliably then assume the
>> +-// library has one. Otherwise assume the library has no builtin
>> +-// soname.
>> +-std::string soname;
>> +-if(!cmSystemTools::GuessLibrarySOName(item, soname))
>> ++this->AddSharedLibNoSOName(item);
>> ++return true;
>> ++} else {
>> ++// This platform will use the path to a library as its soname if the
>> ++// library is given via path and was not built with an soname. If
>> ++// this is a shared library that might be the case.
>> ++std::string file = cmSystemTools::GetFilenameName(item);
>> ++if(this->ExtractSharedLibraryName.find(file))
>> + {
>> +- this->AddSharedLibNoSOName(item);
>> +- return true;
>> ++ // If we can guess the soname fairly reliably then assume the
>> ++ // library has one. Otherwise assume the library has no builtin
>> ++ // soname.
>> ++ std::string soname;
>> ++ if(!cmSystemTools::GuessLibrarySOName(item, soname))
>> ++{
>> ++this->AddSharedLibNoSOName(item);
>> ++return true;
>> ++}
>> + }
>> ++return false;
>> + }
>> +- return false;
>> + }
>> +
>> +
>> //
>> Index: patches/patch-Source_cmTarget_cxx
>> ===
>> RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmTarget_cxx,v
>> retrieving revision 1.13
>> diff -u -p -r1.13 patch-Source_cmTarget_cxx
>> --- patches/patch-Source_cmTarget_cxx 31 Aug 2012 12:28:31 - 1.13
>> +++ patches/patch-Source_cmTarget_cxx 24 Sep 2012 14:06:43 -
>> @@ -1,7 +1,24 @@
>> $OpenBSD: patch-Source_cmTarget_cxx,v 1.13 2012/08/31 12:28:31 dcoppa Exp $
>> --- Source/cmTarget.cxx.orig Thu Aug 9 20:15:19 2012
>> -+++ Source/cmTarget.cxx Thu Aug 23 11:25:48 2012
>> -@@ -3380,9 +3380,43 @@ void cmTarget::GetLibraryNames(std:
NEW: sysutils/multitime
I've put a port for sysutils/multitime into openbsd-wip [1]. From the DESCR:
Unix's 'time' utility is a simple and often effective way of measuring how
long a command takes to run ('wall time'). Unfortunately, running a command
once can give misleading timings: the process may create a cache on its first
execution, running faster subsequently; other processes may cause the command
to be starved of CPU or IO time; etc. It is common to see people run 'time'
several times and take whichever values they feel most comfortable with.
Inevitably, this causes problems.
multitime is, in essence, a simple extension to time which runs a command
multiple times and prints the timing means, standard deviations, mins,
medians, and maxes having done so. This can give a much better understanding
of the command's performance.
As well its more advanced features, multitime also has the advantage that it
can be used as a drop-in replacement for /usr/bin/time. More at
Re: cmake: build shared libraries without soname
On 09/24/12 15:14, David Coppa wrote:
>
> Hi,
>
> The following diff lets cmake build shared libraries without soname,
> which is compliant to our policy for shared libraries.
>
> This should go in a bulk build.
> I already know for example that net/libproxy is failing with this,
> but I already have patches ready for it...
>
> Let me know about other eventual failures caused by this patch.
>
> Thanks!
> David
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/cmake/Makefile,v
> retrieving revision 1.64
> diff -u -p -r1.64 Makefile
> --- Makefile 31 Aug 2012 12:28:31 - 1.64
> +++ Makefile 24 Sep 2012 14:06:42 -
> @@ -7,6 +7,7 @@ HOMEPAGE =http://www.cmake.org/
> CATEGORIES = devel
> COMMENT =portable build system
> DISTNAME = cmake-2.8.9
> +REVISION = 0
> MASTER_SITES = ${HOMEPAGE}files/v2.8/
>
> MAINTAINER = David Coppa
> Index: patches/patch-Source_cmComputeLinkInformation_cxx
> ===
> RCS file: patches/patch-Source_cmComputeLinkInformation_cxx
> diff -N patches/patch-Source_cmComputeLinkInformation_cxx
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-Source_cmComputeLinkInformation_cxx 24 Sep 2012 14:06:43
> -
> @@ -0,0 +1,68 @@
> +$OpenBSD$
> +--- Source/cmComputeLinkInformation.cxx.orig Thu Aug 9 20:15:19 2012
> Source/cmComputeLinkInformation.cxx Tue Aug 28 14:27:03 2012
> +@@ -1059,12 +1059,18 @@ void
> cmComputeLinkInformation::AddTargetItem(std::stri
> + this->SharedLibrariesLinked.insert(target);
> + }
> +
> +- // Handle case of an imported shared library with no soname.
> +- if(this->NoSONameUsesPath &&
> +- target->IsImportedSharedLibWithoutSOName(this->Config))
> ++ if(this->OpenBSD)
> + {
> + this->AddSharedLibNoSOName(item);
> + return;
> ++} else {
> ++// Handle case of an imported shared library with no soname.
> ++if(this->NoSONameUsesPath &&
> ++ target->IsImportedSharedLibWithoutSOName(this->Config))
> ++ {
> ++ this->AddSharedLibNoSOName(item);
> ++ return;
> ++ }
> + }
> +
> + // If this platform wants a flag before the full path, add it.
> +@@ -1389,23 +1395,29 @@ void
> cmComputeLinkInformation::AddFrameworkPath(std::s
> +
> //
> + bool cmComputeLinkInformation::CheckSharedLibNoSOName(std::string const&
> item)
> + {
> +- // This platform will use the path to a library as its soname if the
> +- // library is given via path and was not built with an soname. If
> +- // this is a shared library that might be the case.
> +- std::string file = cmSystemTools::GetFilenameName(item);
> +- if(this->ExtractSharedLibraryName.find(file))
> ++ if(this->OpenBSD)
> + {
> +-// If we can guess the soname fairly reliably then assume the
> +-// library has one. Otherwise assume the library has no builtin
> +-// soname.
> +-std::string soname;
> +-if(!cmSystemTools::GuessLibrarySOName(item, soname))
> ++this->AddSharedLibNoSOName(item);
> ++return true;
> ++} else {
> ++// This platform will use the path to a library as its soname if the
> ++// library is given via path and was not built with an soname. If
> ++// this is a shared library that might be the case.
> ++std::string file = cmSystemTools::GetFilenameName(item);
> ++if(this->ExtractSharedLibraryName.find(file))
> + {
> +- this->AddSharedLibNoSOName(item);
> +- return true;
> ++ // If we can guess the soname fairly reliably then assume the
> ++ // library has one. Otherwise assume the library has no builtin
> ++ // soname.
> ++ std::string soname;
> ++ if(!cmSystemTools::GuessLibrarySOName(item, soname))
> ++{
> ++this->AddSharedLibNoSOName(item);
> ++return true;
> ++}
> + }
> ++return false;
> + }
> +- return false;
> + }
> +
> +
> //
> Index: patches/patch-Source_cmTarget_cxx
> ===
> RCS file: /cvs/ports/devel/cmake/patches/patch-Source_cmTarget_cxx,v
> retrieving revision 1.13
> diff -u -p -r1.13 patch-Source_cmTarget_cxx
> --- patches/patch-Source_cmTarget_cxx 31 Aug 2012 12:28:31 - 1.13
> +++ patches/patch-Source_cmTarget_cxx 24 Sep 2012 14:06:43 -
> @@ -1,7 +1,24 @@
> $OpenBSD: patch-Source_cmTarget_cxx,v 1.13 2012/08/31 12:28:31 dcoppa Exp $
> --- Source/cmTarget.cxx.orig Thu Aug 9 20:15:19 2012
> -+++ Source/cmTarget.cxx Thu Aug 23 11:25:48 2012
> -@@ -3380,9 +3380,43 @@ void cmTarget::GetLibraryNames(std::string& name,
> Source/cmTarget.cxx Mon Aug 27 15:07:12 2012
> +@@ -3022,12 +3022,16 @@ std::string cmTarget::GetPDBName(const char* config)
> +
> //---
php ap2 flavour
We don't currently build apache2 PHP modules in bulk builds,
giovanni@ was asking about enabling this, I pointed out that the
various modules (and fpm/fastcgi) also get built again as
flavoured subpackages which seems wrong.
Wondering if anyone has comments on doing this...
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile.inc
--- Makefile.inc23 Aug 2012 19:19:17 - 1.32
+++ Makefile.inc25 Sep 2012 20:17:01 -
@@ -346,6 +346,9 @@ DESCR-${i}= ${.CURDIR}/../files/DESCR-$
MESSAGE-${i}= ${.CURDIR}/../files/MESSAGE-ext
UNMESSAGE-${i}=${.CURDIR}/../files/UNMESSAGE-ext
PKGNAME-${i}= php-${i}-${V}
+# don't build separate plugins for -ap2
+FULLPKGNAME-${i}= php-${i}-${V}${FLAVOR_EXT:S/-ap2//}
+FULLPKGPATH-${i}= ${PKGPATH},-${i}${FLAVOR_EXT:S/-ap2//:S/-/,/g}
.if ${V:M5.2*}
PKGSPEC-${i}= php-${i}->=5.2,<5.3
.else if ${V:M5.3*}
Index: 5.2/Makefile
===
RCS file: /cvs/ports/lang/php/5.2/Makefile,v
retrieving revision 1.30
diff -u -p -r1.30 Makefile
--- 5.2/Makefile23 Aug 2012 19:19:17 - 1.30
+++ 5.2/Makefile25 Sep 2012 20:17:01 -
@@ -40,4 +40,9 @@ CONFIGURE_ARGS+=--with-sybase-ct
LIB_DEPENDS-sybase_ct= databases/freetds
WANTLIB-sybase_ct= c ct pthread
+.include
+.if ${FLAVOR:L:Map2}
+BUILD_PACKAGES := ${BUILD_PACKAGES:N-fastcgi}
+.endif
+
.include
Index: 5.3/Makefile
===
RCS file: /cvs/ports/lang/php/5.3/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- 5.3/Makefile25 Sep 2012 20:16:08 - 1.40
+++ 5.3/Makefile25 Sep 2012 20:17:01 -
@@ -29,4 +29,9 @@ CONFIGURE_ARGS+= --enable-pcntl=shared
LIB_DEPENDS-pcntl=
WANTLIB-pcntl= c pthread
+.include
+.if ${FLAVOR:L:Map2}
+BUILD_PACKAGES := ${BUILD_PACKAGES:N-fpm:N-fastcgi}
+.endif
+
.include
Re: SECURITY patch for security/libotr
On Sun, 19 Aug 2012 15:53:03 +0200, Pascal Stumpf wrote:
> On Sun, 12 Aug 2012 22:41:44 +0200, Pascal Stumpf wrote:
> > On Sun, 12 Aug 2012 15:56:12 -0400, Brad Smith wrote:
> > > On Sun, Aug 12, 2012 at 09:37:41PM +0200, Pascal Stumpf wrote:
> > > > Fix for CVE-2012-3461 (multiple heap overflows), tested so far with
> > > > climm on amd64.
> > > >
> > > > Also, taking maintainer for this.
> > >
> > > The first patch in the diff should be removed.
> >
> > As you wish ...
> >
>
> They just released a new version, containing the security fixes.
> Remove the $FreeBSD$ line while here.
>
ping?
> Index: Makefile
> ===
> RCS file: /cvs/ports/security/libotr/Makefile,v
> retrieving revision 1.14
> diff -u -p -r1.14 Makefile
> --- Makefile 4 Apr 2012 06:45:27 - 1.14
> +++ Makefile 19 Aug 2012 13:52:41 -
> @@ -1,17 +1,17 @@
> # $OpenBSD: Makefile,v 1.14 2012/04/04 06:45:27 ajacoutot Exp $
> -# $FreeBSD: Makefile,v 1.2 2005/04/21 14:22:54 pav Exp $
>
> COMMENT= portable OTR messaging library and toolkit
>
> -DISTNAME=libotr-3.2.0
> +DISTNAME=libotr-3.2.1
> CATEGORIES= security
> -REVISION=0
>
> SHARED_LIBS += otr 3.2 # 4.0
>
> HOMEPAGE=http://www.cypherpunks.ca/otr/
>
> MASTER_SITES=${HOMEPAGE}
> +
> +MAINTAINER = Pascal Stumpf
>
> # GPLv2
> PERMIT_PACKAGE_CDROM=Yes
> Index: distinfo
> ===
> RCS file: /cvs/ports/security/libotr/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo 18 Jul 2008 13:21:22 - 1.6
> +++ distinfo 19 Aug 2012 13:52:41 -
> @@ -1,5 +1,2 @@
> -MD5 (libotr-3.2.0.tar.gz) = +roC5g9k5JKDiSm+InL4OQ==
> -RMD160 (libotr-3.2.0.tar.gz) = k39RJBXrO4LVcwsar75dVfTxU9o=
> -SHA1 (libotr-3.2.0.tar.gz) = 5eELjdr1mwraYEbRVtBDHNJ5Dbk=
> -SHA256 (libotr-3.2.0.tar.gz) = 2DudIONuKkpV5TNvFdHSGNYnvAr3r5Tjg1vci22LZpM=
> -SIZE (libotr-3.2.0.tar.gz) = 430299
> +SHA256 (libotr-3.2.1.tar.gz) = 1CjqpYSYS6oJRQzKB3QuCsj8YkAfOhxVbjAlAjNpzfQ=
> +SIZE (libotr-3.2.1.tar.gz) = 414684
drupal 6 vs 7 and views
I've just did a few experiments with views 3 under drupal6. So far, not so good. Turns out the update issues are totally real. Most specifically, views3 for drupal6 "loses" the pagination parameters. You can restore them manually in some cases, but if you have lots of views, this can be a chore. If you are using views for user reference, or node reference, it seems this is a total loss though: I've been left stranded with lists of 10 entries, with no apparent way to get back to the full list :( Fortunately, going back to views2 manually does work... but this does look like a major showstopper for migrating sites from d6 to d7... Pity.
Re: UPDATE: cherokee 1.2.101
On Tue, Sep 25, 2012 at 03:32:43AM -0400, Brad Smith wrote:
> Here is the update for cherokee 1.2.101 again. I cannot seem to
> reproduce any issues with stopping cherokee as had been mentioned
> on the list in the past. It would be great if someone else can
> test this as well to confirm that.
I'll have a look by the end of the week.
>
>
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/www/cherokee/Makefile,v
> retrieving revision 1.35
> diff -u -p -r1.35 Makefile
> --- Makefile 24 Sep 2012 06:51:59 - 1.35
> +++ Makefile 25 Sep 2012 05:37:26 -
> @@ -2,14 +2,14 @@
>
> SHARED_ONLY= Yes
>
> -COMMENT-main = fast, flexible and easy to configure Web Server
> +COMMENT-main = fast, flexible and easy to configure web server
> COMMENT-geoip = GeoIP module for Cherokee web server
> COMMENT-ldap = LDAP module for Cherokee web server
> COMMENT-mysql = MySQL module for Cherokee web server
> COMMENT-streaming = Streaming module for Cherokee web server
>
> -DIR =1.0
> -VERSION =${DIR}.14
> +DIR =1.2
> +VERSION =${DIR}.101
> DISTNAME = cherokee-${VERSION}
>
> PKGNAME-main = ${DISTNAME}
> @@ -18,12 +18,6 @@ PKGNAME-mysql =cherokee-mysql-${VERSION
> PKGNAME-geoip = cherokee-geoip-${VERSION}
> PKGNAME-streaming = cherokee-streaming-${VERSION}
>
> -REVISION-main = 9
> -REVISION-geoip = 4
> -REVISION-ldap = 5
> -REVISION-mysql = 4
> -REVISION-streaming = 7
> -
> SHARED_LIBS =cherokee-base 0.0 \
> cherokee-client 0.0 \
> cherokee-server 0.0
> @@ -47,7 +41,8 @@ MASTER_SITES = ${HOMEPAGE}download/${DIR
>
> MULTI_PACKAGES =-main -ldap -mysql -geoip -streaming
>
> -MODULES =lang/python lang/php
> +MODULES =lang/php \
> + lang/python
>
> BUILD_DEPENDS = textproc/py-docutils \
> lang/php/${MODPHP_VERSION},-fastcgi
> @@ -73,14 +68,15 @@ RUN_DEPENDS-mysql = ${BASE_PKGPATH}
> LIB_DEPENDS-streaming = graphics/ffmpeg \
> archivers/bzip2
> WANTLIB-streaming += avcodec avformat avutil bz2 crypto m gsm
> -WANTLIB-streaming += mp3lame ogg orc-0.4 schroedinger-1.0 speex
> -WANTLIB-streaming += theoradec theoraenc vorbis vorbisenc vpx
> -WANTLIB-streaming += x264 z pthread xvidcore
> +WANTLIB-streaming += mp3lame ogg orc-0.4 pthread schroedinger-1.0
> +WANTLIB-streaming += speex theoradec theoraenc vorbis vorbisenc vpx
> +WANTLIB-streaming += x264 xvidcore z
> RUN_DEPENDS-streaming = ${BASE_PKGPATH}
>
> +USE_GROFF = Yes
> +USE_GMAKE = Yes
> USE_LIBTOOL =Yes
> LIBTOOL_FLAGS = --tag=disable-static
> -USE_GROFF = Yes
>
> FAKE_FLAGS = cherokeeconfdir="${PREFIX}/share/examples/cherokee/etc" \
> cherokeewwwdir="${PREFIX}/share/examples/cherokee/www" \
> @@ -89,37 +85,39 @@ FAKE_FLAGS = cherokeeconfdir="${PREFIX}/
> CONFIGURE_STYLE =gnu
> CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
> LDFLAGS="-L${LOCALBASE}/lib" \
> - PHPCGI="${LOCALBASE}/bin/php-fastcgi-${MODPHP_VERSION}"
> \
> - ac_cv_func_getgrnam_r=no \
> ac_cv_header_execinfo_h=no
> CONFIGURE_ARGS = ${CONFIGURE_SHARED} \
> --disable-static \
> + --enable-tmpdir=/tmp \
> --sysconfdir=${SYSCONFDIR} \
> + --with-cgiroot=/var/cherokee/cgi-bin \
> --with-wwwroot=/var/cherokee \
> --with-wwwuser=_cherokee \
> --with-wwwgroup=_cherokee \
> --disable-nls \
> --disable-pam \
> + --with-ffmpeg \
> --with-geoip \
> --with-ldap \
> --with-mysql \
> - --with-ffmpeg
> +
> --with-php=${LOCALBASE}/bin/php-fastcgi-${MODPHP_VERSION} \
> + --with-python=${MODPY_BIN}
>
> .ifdef DEBUG
> CFLAGS +=-O0 -g3
> CONFIGURE_ARGS +=--enable-trace
> .endif
>
> -MODPY_ADJ_FILES= admin/CTK/CTK-run.pre admin/upgrade_config.py \
> +MODPY_ADJ_FILES=admin/CTK/CTK-run.pre admin/upgrade_config.py \
> cherokee/cherokee-admin-launcher \
> cherokee/cherokee-tweak doc/test_images.py \
> - gitlog2changelog.py po/po_stats.py svnlog2changelog.py \
> - admin/server.py qa/run-tests.py contrib/tracelor.py
> + po/po_stats.py admin/server.py qa/run-tests.py \
> + contrib/tracelor.py
>
> LANGUAGES = en es de nl sv_SE zh_CN fr pt_BR pl ca it gl
>
> pre-configure:
> - ${SUBST_CMD} ${WRKSRC}/cherokee/main_admin.c
> + @${SUBST_CMD} ${WRKSRC}/cherokee/main_admin.c
>
> post-install:
> cd ${PREFIX}
Re: UPDATE: msmtp-1.4.29
On Tue, Sep 25, 2012 at 4:25 PM, Gleydson Soares wrote: > > here's a bugfix update to the latest msmtp version 1.4.29 > > Version 1.4.29: > - Fix bugs in msmtp_read_addresses(), including a crash. > - Removed autotools files that are automatically copied by 'autoreconf -i' > from repository. > - Properly require an argument to --passwordeval. Fixes a crash when none is > given. > - Replace old service name "ssmtp" with current one: "smtps". > > OK? Works fine for me with my usual setup. OK ciao, david
UPDATE: msmtp-1.4.29
here's a bugfix update to the latest msmtp version 1.4.29 Version 1.4.29: - Fix bugs in msmtp_read_addresses(), including a crash. - Removed autotools files that are automatically copied by 'autoreconf -i' from repository. - Properly require an argument to --passwordeval. Fixes a crash when none is given. - Replace old service name "ssmtp" with current one: "smtps". OK? Index: Makefile === RCS file: /cvs/ports/mail/msmtp/Makefile,v retrieving revision 1.33 diff -u -p -r1.33 Makefile --- Makefile14 May 2012 13:47:20 - 1.33 +++ Makefile25 Sep 2012 14:14:11 - @@ -2,7 +2,7 @@ COMMENT = SMTP plugin for MUAs -DISTNAME = msmtp-1.4.28 +DISTNAME = msmtp-1.4.29 CATEGORIES = mail HOMEPAGE = http://msmtp.sourceforge.net/ Index: distinfo === RCS file: /cvs/ports/mail/msmtp/distinfo,v retrieving revision 1.21 diff -u -p -r1.21 distinfo --- distinfo14 May 2012 13:47:20 - 1.21 +++ distinfo25 Sep 2012 14:14:11 - @@ -1,5 +1,2 @@ -MD5 (msmtp-1.4.28.tar.bz2) = FHQEeNydH1Lsl6QV4zc/xw== -RMD160 (msmtp-1.4.28.tar.bz2) = ZR7QLgXUlm/iSwNnq7fVzxzzzxI= -SHA1 (msmtp-1.4.28.tar.bz2) = P9RLMOj0rgcbKlogXWAH80ZfqXA= -SHA256 (msmtp-1.4.28.tar.bz2) = 3g595uc8zkoN9XvYMWd6wOK4L2OVMUtsUIydLRjNxSo= -SIZE (msmtp-1.4.28.tar.bz2) = 302778 +SHA256 (msmtp-1.4.29.tar.bz2) = YfT7oMGymZQtj2L0epXScTt5U9DOun9s1GPdI2i5NXc= +SIZE (msmtp-1.4.29.tar.bz2) = 303220
Re: New: fonts/adobe-source-code-pro
On Tue, Sep 25, 2012 at 01:29:35AM +0200, Juan Francisco Cantero Hurtado wrote: > Adobe announced today "Source Code Pro", the version monospaced of their > font Source Sans Pro: > http://blogs.adobe.com/typblography/2012/09/source-code-pro.html > > This port is just a quick modification of the port of Source Sans in > case someone is interested :) Looks like you forgot to add @fontdir to the plist. > > -- > Juan Francisco Cantero Hurtado http://juanfra.info
Re: NEW: net/gophernicus
On Fri, Sep 21, 2012 at 09:52:37PM +0100, Stuart Henderson wrote: > On 2012/09/21 16:19, Brian Callahan wrote: [--snip-edd--] > > Attached is a new tgz that moves back to the release branch (1.3, no > > changes needed to the port) and moves the gid and uid to 704, since > > 703 is now reserved. > > Fine with me, OK sthen@ if someone wants to commit it, or > does someone want to give me an OK so I can? This is okay by me as well, with the same observation as last time that running plist permutes some entries around (@mode and @readme) which I dislike.
UPDATE: Samba 3.6.8 OPENBSD_5_2
Here's an update for the OPENBSD_5_2 branch for Samba 3.6.8. Includes Brad's fix for file descriptor leakage in the utmp code. Ian McWilliam samba-3.6.8-OPENBSD_5_2.diff Description: Binary data
Re: UPDATE: Samba 3.6.8
On 24/09/2012, at 5:01 PM, Brad Smith wrote:
> Here is an update to Samba 3.6.8 and a fix for potential fd leaks upon errors
> within the utmp code.
>
>
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/net/samba/Makefile,v
> retrieving revision 1.170
> diff -u -p -r1.170 Makefile
> --- Makefile 4 Sep 2012 10:00:20 - 1.170
> +++ Makefile 19 Sep 2012 01:56:37 -
> @@ -5,7 +5,7 @@ SHARED_ONLY= Yes
> COMMENT-main= SMB and CIFS client and server for UNIX
> COMMENT-docs= additional documentation and examples for Samba
>
> -DISTNAME=samba-3.6.7
> +DISTNAME=samba-3.6.8
> PKGNAME-main= ${DISTNAME}
> FULLPKGNAME-docs= ${DISTNAME:S/-/-docs-/}
> FULLPKGPATH-docs= net/samba,-docs
> @@ -59,7 +59,7 @@ USE_GMAKE= Yes
> USE_GROFF=Yes
> #SEPARATE_BUILD= Yes
> CONFIGURE_STYLE= gnu
> -AUTOCONF_VERSION=2.63
> +AUTOCONF_VERSION=2.68
>
> CONFIGURE_ARGS= --disable-fam \
> --libdir="${PREFIX}/lib/samba" \
> Index: distinfo
> ===
> RCS file: /home/cvs/ports/net/samba/distinfo,v
> retrieving revision 1.33
> diff -u -p -r1.33 distinfo
> --- distinfo 4 Sep 2012 10:00:20 - 1.33
> +++ distinfo 19 Sep 2012 01:50:16 -
> @@ -1,2 +1,2 @@
> -SHA256 (samba-3.6.7.tar.gz) = uFig8BG6f+VUiBucfmyxyct/rOIu2Ghg9WD8rsxO1Mo=
> -SIZE (samba-3.6.7.tar.gz) = 34067900
> +SHA256 (samba-3.6.8.tar.gz) = T1oXGo2QLGtPgi7YdcUeuDORltnM8OzX9lIclms1FN4=
> +SIZE (samba-3.6.8.tar.gz) = 34070798
> Index: patches/patch-source3_configure_in
> ===
> RCS file: /home/cvs/ports/net/samba/patches/patch-source3_configure_in,v
> retrieving revision 1.4
> diff -u -p -r1.4 patch-source3_configure_in
> --- patches/patch-source3_configure_in4 Sep 2012 10:00:20 -
> 1.4
> +++ patches/patch-source3_configure_in19 Sep 2012 01:53:01 -
> @@ -1,55 +1,7 @@
> $OpenBSD: patch-source3_configure_in,v 1.4 2012/09/04 10:00:20 sthen Exp $
> source3/configure.in.origThu Aug 30 15:48:05 2012
> -+++ source3/configure.in Thu Aug 30 15:48:02 2012
> -@@ -753,23 +753,38 @@ AC_CHECK_HEADERS(linux/falloc.h)
> -
> - dnl check for OS implementation of md5 conformant to rfc1321
> - AC_CHECK_HEADERS(md5.h)
> -+
> -+samba_cv_md5lib=none
> -+
> - if test x"$ac_cv_header_md5_h" = x"yes"; then
> - AC_DEFINE(HAVE_MD5_H, 1,
> - [Whether md5.h is available.])
> --AC_CHECK_LIB(md5, MD5Update,
> --[
> --LIBS="${LIBS} -lmd5"
> --CRYPTO_MD5_OBJ=
> --AC_DEFINE(HAVE_LIBMD5, 1,
> --[Whether libmd5 conformant to rfc1321 is available.])],
> --[
> --CRYPTO_MD5_OBJ="../lib/crypto/md5.o"])
> -+AC_CHECK_LIB(md5, MD5Update, [samba_cv_md5lib=md5])
> -+fi
> -+
> -+if test x"$ac_cv_header_md5_h" = x"yes" -a \
> -+x"$samba_cv_md5lib" = x"none" ; then
> -+AC_CHECK_LIB(md, MD5Update, [samba_cv_md5lib=md])
> -+fi
> -+
> -+if test x"$ac_cv_header_md5_h" = x"yes" -a \
> -+x"$samba_cv_md5lib" = x"none" ; then
> -+AC_CHECK_LIB(c, MD5Update, [samba_cv_md5lib=""])
> -+fi
> -+
> -+if test x"$samba_cv_md5lib" != x"none" ; then
> -+if test x"$samba_cv_md5lib" != x ; then
> -+LIBS="${LIBS} -l${samba_cv_md5lib}"
> -+fi
> -+CRYPTO_MD5_OBJ=
> -+AC_DEFINE(HAVE_LIBMD5, 1,
> -+[Whether libmd5 conformant to rfc1321 is available.])
> - else
> - CRYPTO_MD5_OBJ="../lib/crypto/md5.o"
> - fi
> -+
> - AC_SUBST(CRYPTO_MD5_OBJ)
> -
> --
> - AC_CHECK_HEADERS(rpcsvc/yp_prot.h,,,[[
> - #if HAVE_RPC_RPC_H
> - #include
> -@@ -853,9 +868,15 @@ if test x$enable_cups != xno; then
> +--- source3/configure.in.origFri Sep 14 04:12:09 2012
> source3/configure.in Tue Sep 18 21:51:47 2012
> +@@ -869,9 +869,15 @@ if test x$enable_cups != xno; then
>
> if test "x$CUPS_CONFIG" != x; then
>
> @@ -65,7 +17,7 @@ $OpenBSD: patch-source3_configure_in,v 1
>
> if test x"$ac_cv_header_cups_cups_h" = xyes -a \
> x"$ac_cv_header_cups_language_h" = xyes; then
> -@@ -863,18 +884,19 @@ if test x$enable_cups != xno; then
> +@@ -879,18 +885,19 @@ if test x$enable_cups != xno; then
> # underlinked. With cups-config --libs we pull in
> unwanted and unneeded
> # dendencies including thread libraries - use
> cups-config only if really
> # required.
> @@ -89,7 +41,7 @@ $OpenBSD: patch-source3_configure_in,v 1
> PRINT_LIBS=$ac_save_PRINT_LIBS
> fi
>
> -@@ -1659,8 +1681,7 @@ DSO_EXPORTS=""
> +@@ -1675,8 +1682,7 @@ DSO_EXPORTS=""
> ;;
> *openbsd*) BLDSHARED="true"
> LDSHFLAGS="-shared"
UPDATE: cherokee 1.2.101
Here is the update for cherokee 1.2.101 again. I cannot seem to
reproduce any issues with stopping cherokee as had been mentioned
on the list in the past. It would be great if someone else can
test this as well to confirm that.
Index: Makefile
===
RCS file: /home/cvs/ports/www/cherokee/Makefile,v
retrieving revision 1.35
diff -u -p -r1.35 Makefile
--- Makefile24 Sep 2012 06:51:59 - 1.35
+++ Makefile25 Sep 2012 05:37:26 -
@@ -2,14 +2,14 @@
SHARED_ONLY= Yes
-COMMENT-main = fast, flexible and easy to configure Web Server
+COMMENT-main = fast, flexible and easy to configure web server
COMMENT-geoip =GeoIP module for Cherokee web server
COMMENT-ldap = LDAP module for Cherokee web server
COMMENT-mysql =MySQL module for Cherokee web server
COMMENT-streaming = Streaming module for Cherokee web server
-DIR = 1.0
-VERSION = ${DIR}.14
+DIR = 1.2
+VERSION = ${DIR}.101
DISTNAME = cherokee-${VERSION}
PKGNAME-main = ${DISTNAME}
@@ -18,12 +18,6 @@ PKGNAME-mysql = cherokee-mysql-${VERSION
PKGNAME-geoip =cherokee-geoip-${VERSION}
PKGNAME-streaming = cherokee-streaming-${VERSION}
-REVISION-main =9
-REVISION-geoip = 4
-REVISION-ldap =5
-REVISION-mysql = 4
-REVISION-streaming = 7
-
SHARED_LIBS = cherokee-base 0.0 \
cherokee-client 0.0 \
cherokee-server 0.0
@@ -47,7 +41,8 @@ MASTER_SITES =${HOMEPAGE}download/${DIR
MULTI_PACKAGES =-main -ldap -mysql -geoip -streaming
-MODULES = lang/python lang/php
+MODULES = lang/php \
+ lang/python
BUILD_DEPENDS =textproc/py-docutils \
lang/php/${MODPHP_VERSION},-fastcgi
@@ -73,14 +68,15 @@ RUN_DEPENDS-mysql = ${BASE_PKGPATH}
LIB_DEPENDS-streaming =graphics/ffmpeg \
archivers/bzip2
WANTLIB-streaming += avcodec avformat avutil bz2 crypto m gsm
-WANTLIB-streaming += mp3lame ogg orc-0.4 schroedinger-1.0 speex
-WANTLIB-streaming += theoradec theoraenc vorbis vorbisenc vpx
-WANTLIB-streaming += x264 z pthread xvidcore
+WANTLIB-streaming += mp3lame ogg orc-0.4 pthread schroedinger-1.0
+WANTLIB-streaming += speex theoradec theoraenc vorbis vorbisenc vpx
+WANTLIB-streaming += x264 xvidcore z
RUN_DEPENDS-streaming = ${BASE_PKGPATH}
+USE_GROFF =Yes
+USE_GMAKE =Yes
USE_LIBTOOL = Yes
LIBTOOL_FLAGS =--tag=disable-static
-USE_GROFF =Yes
FAKE_FLAGS = cherokeeconfdir="${PREFIX}/share/examples/cherokee/etc" \
cherokeewwwdir="${PREFIX}/share/examples/cherokee/www" \
@@ -89,37 +85,39 @@ FAKE_FLAGS =cherokeeconfdir="${PREFIX}/
CONFIGURE_STYLE = gnu
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
- PHPCGI="${LOCALBASE}/bin/php-fastcgi-${MODPHP_VERSION}"
\
- ac_cv_func_getgrnam_r=no \
ac_cv_header_execinfo_h=no
CONFIGURE_ARGS = ${CONFIGURE_SHARED} \
--disable-static \
+ --enable-tmpdir=/tmp \
--sysconfdir=${SYSCONFDIR} \
+ --with-cgiroot=/var/cherokee/cgi-bin \
--with-wwwroot=/var/cherokee \
--with-wwwuser=_cherokee \
--with-wwwgroup=_cherokee \
--disable-nls \
--disable-pam \
+ --with-ffmpeg \
--with-geoip \
--with-ldap \
--with-mysql \
- --with-ffmpeg
+
--with-php=${LOCALBASE}/bin/php-fastcgi-${MODPHP_VERSION} \
+ --with-python=${MODPY_BIN}
.ifdef DEBUG
CFLAGS += -O0 -g3
CONFIGURE_ARGS += --enable-trace
.endif
-MODPY_ADJ_FILES= admin/CTK/CTK-run.pre admin/upgrade_config.py \
+MODPY_ADJ_FILES=admin/CTK/CTK-run.pre admin/upgrade_config.py \
cherokee/cherokee-admin-launcher \
cherokee/cherokee-tweak doc/test_images.py \
- gitlog2changelog.py po/po_stats.py svnlog2changelog.py \
- admin/server.py qa/run-tests.py contrib/tracelor.py
+ po/po_stats.py admin/server.py qa/run-tests.py \
+ contrib/tracelor.py
LANGUAGES =en es de nl sv_SE zh_CN fr pt_BR pl ca it gl
pre-configure:
- ${SUBST_CMD} ${WRKSRC}/cherokee/main_admin.c
+ @${SUBST_CMD} ${WRKSRC}/cherokee/main_admin.c
post-install:
cd ${PREFIX}/share/cherokee/admin && find . -name "*.py" | \
@@ -130,5 +128,6 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/po/admin/$i.gmo \
${PREFIX}/share/locale/$i/LC_MESSAGES/cherokee.mo
.endfor
+ @find ${PREFIX}/lib/cherokee -name '*.la' -print | xargs r
