Re: UPDATE: devel/subversion 1.5.4
Steven Mestdagh wrote:
hi,
Here is an update to subversion 1.5.4. I've added some more workarounds
to always find the python binary, and merged stuff from the previous
diffs that were sent.
Tested on amd64, `make regress' gives no failures.
Please test/comment/ok.
It passed all regression tests on my i386 box. I only found that the patch lacks the
(UN)MESSAGE files I added for ap2-subversion.
(http://marc.info/?l=openbsd-ports&m=122157221716865&w=2)
Brad Walker
Index: pkg/MESSAGE-ap2
===
RCS file: pkg/MESSAGE-ap2
diff -N pkg/MESSAGE-ap2
--- /dev/null1 Jan 1970 00:00:00 -
+++ pkg/MESSAGE-ap216 Sep 2008 12:54:28 -
@@ -0,0 +1,10 @@
+To finish the install of ap2-subversion, you need
+to enable the modules by adding the following line
+to your /etc/apache2/httpd2.conf file:
+
+ LoadModule dav_svn_module ${PREFIX}/lib/apache2/mod_dav_svn.so
+ LoadModule authz_svn_module ${PREFIX}/lib/apache2/mod_authz_svn.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.
Index: pkg/UNMESSAGE-ap2
===
RCS file: pkg/UNMESSAGE-ap2
diff -N pkg/UNMESSAGE-ap2
--- /dev/null1 Jan 1970 00:00:00 -
+++ pkg/UNMESSAGE-ap216 Sep 2008 12:54:28 -
@@ -0,0 +1,9 @@
+To completely deinstall the ap2-subversion package you
+need to perform these steps as root:
+
+ edit /etc/apache2/httpd2.conf
+ remove the lines: LoadModule dav_svn_module
+ LoadModule authz_svn_module
+
+Do not do this if you plan on re-installing the ap2-subversion
+package at some future time.
Re: UPDATE: svn-1.5.1
Stefan Sperling wrote:
On Sat, Sep 13, 2008 at 12:07:19PM -0600, Brad Walker wrote:
I'm running a slightly modified version of this (updated for 1.5.2).
Running Trac-0.11.1 segfaults for me on loading py-subversion.
Does any of these commands segfault anyone's machine?
import libsvn.wc
import svn.core
The bindings seem to be totally broken on OpenBSD.
See http://subversion.tigris.org/servlets/ReadMsg?listName=dev&msgNo=142053
I've attached a patch that solves the bindings issue and another issue
with building the apache v2.2 modules. It's also available @
http://bradmwalker.com/ports/subversion-1.5.2.diff
The port fixes SWIG bindings by regenerating all files, not just the
headers. swig-1.3.24p4 in -current ports creates bindings that don't seg
fault but they fail at least one of the python regression tests.
swig-1.3.36 creates functioning bindings that passed all tests. A patch
updating devel/swig to 1.3.36 can be found here:
http://bradmwalker.com/ports/swig-1.3.36.diff
Also the previous port/patches on ports@ allowed the Makefile + apxs2 to
add LoadModule directives to /var/apache/httpd2. This patch prevents
this with cONFIGURE_ARGS=+--disable-mod-activation and adds MESSAGE and
UNMESSAGE files for the ap2 subpackage.
The patch now requires gmake to regenerate swig bindings and
autoconf-2.62 for configuration.
In testing on i386 the port passed all tests. mod_dav_svn worked for me
and py-subversion worked in a Trac-0.11.1 installation.
Brad Walker
Index: Makefile
===
RCS file: /cvs/ports/devel/subversion/Makefile,v
retrieving revision 1.47
diff -u -d -r1.47 Makefile
--- Makefile 4 Jul 2008 19:57:06 - 1.47
+++ Makefile 16 Sep 2008 12:54:28 -
@@ -6,19 +6,19 @@
COMMENT-ruby= ruby interface to subversion
COMMENT-ap2= apache2 subversion modules
-VERSION= 1.4.4
+VERSION= 1.5.2
DISTNAME= subversion-${VERSION}
PKGNAME= ${DISTNAME}
-PKGNAME-main= ${DISTNAME}p0
-PKGNAME-perl= p5-SVN-${VERSION}p1
-PKGNAME-python= py-subversion-${VERSION}p3
-PKGNAME-ruby= ruby-subversion-${VERSION}p4
-PKGNAME-ap2= ap2-subversion-${VERSION}p0
+PKGNAME-main= ${DISTNAME}
+PKGNAME-perl= p5-SVN-${VERSION}
+PKGNAME-python= py-subversion-${VERSION}
+PKGNAME-ruby= ruby-subversion-${VERSION}
+PKGNAME-ap2= ap2-subversion-${VERSION}
-SO_VERSION= 1.0
+SO_VERSION= 1.1
SVN_LIBS= svn_client-1 svn_delta-1 svn_diff-1 svn_fs-1 \
- svn_fs_base-1 svn_fs_fs-1 svn_ra-1 svn_ra_dav-1 \
- svn_ra_local-1 svn_ra_svn-1 svn_repos-1 svn_subr-1 svn_wc-1
+ svn_fs_base-1 svn_fs_fs-1 svn_fs_util-1 svn_ra-1 svn_ra_neon-1 \
+ svn_ra_local-1 svn_ra_neon-1 svn_ra_svn-1 svn_repos-1 svn_subr-1 svn_wc-1
.for _lib in ${SVN_LIBS} svn_swig_perl-1 svn_swig_py-1 svn_swig_ruby-1
SHARED_LIBS+= ${_lib} ${SO_VERSION}
.endfor
@@ -27,7 +27,7 @@
HOMEPAGE= http://subversion.tigris.org/
-MAINTAINER= Sigfred Haversen <[EMAIL PROTECTED]>
+MAINTAINER= Stefan Sperling <[EMAIL PROTECTED]>
# BSD alike + Apache License 2.0
PERMIT_PACKAGE_CDROM= Yes
@@ -42,33 +42,48 @@
MODULES= devel/gettext
-WANTLIB= apr-1 expat db z
+WANTLIB= expat db z
-LIB_DEPENDS= neon.>=24:neon->=0.24.7:net/neon \
- aprutil-1::devel/apr-util
+LIB_DEPENDS= neon.>=26:neon->=0.26.2:net/neon \
+ apr-1::devel/apr \
+ aprutil-1::devel/apr-util \
+ sasl2.>=2::security/cyrus-sasl2
MULTI_PACKAGES= -main
-WANTLIB-main= ${WANTLIB} c crypto ssl
+WANTLIB-main= ${WANTLIB} c crypto iconv intl ssl
RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPENDS}
+CONTRIB_HOOK_SCRIPTS= case-insensitive.py pre-commit-check.py \
+ check-mime-type.pl pre-lock-require-needs-lock.py \
+ commit-block-joke.py remove-zombie-locks.py detect-merge-conflicts.sh \
+ syntax-check.sh
+# There's also 'enforcer', but it has its own subdir in contrib/hook-scripts/
+# So we handle it separately, see post-install
+
+TOOLS_HOOK_SCRIPTS= commit-access-control.cfg.example \
+ commit-access-control.pl svn2feed.py commit-access-control.pl.in \
+ svnperms.conf.example commit-email.pl svnperms.py commit-email.pl.in \
+ verify-po.py commit-email.rb
+# There's also 'mailer', but it has its own subdir in contrib/hook-scripts/
+# So we handle it separately, see post-install
+
.if !${FLAVOR:L:Mno_ap2}
MULTI_PACKAGES+= -ap2
-WANTLIB-ap2= ${WANTLIB} iconv aprutil-1 expat
+WANTLIB-ap2= ${WANTLIB} apr-1 aprutil-1 expat
LIB_DEPENDS-ap2= ${MODGETTEXT_LIB_DEPENDS}
. for _lib in svn_delta-1 svn_fs-1 svn_fs_base-1 svn_fs_fs-1 \
- svn_repos-1 svn_subr-1
+ svn_fs_util-1 svn_repos-1 svn_subr-1
LIB_DEPENDS-ap2+= ${_lib}.>=${SO_VERSION}:subversion-${VERSION}:devel/subversion,-main
+. endfor
BUILD_DEPENDS+= ::www/apache-httpd
RUN_DEPENDS-ap2= ::www/apache-httpd
-. endfor
.endif
.if !${FLAVOR:L:Mno_bindings}
MULTI_PACKAGES+=-perl -python -ruby
-SHARED_ONLY= Yes
-WANTLIB-perl= ${WANTLIB} aprutil-1
+WANTLIB-perl= ${WANTLIB} apr-1 aprutil-1
Re: UPDATE: svn-1.5.1
Stefan Sperling wrote: On Mon, Aug 25, 2008 at 12:15:33PM +0200, Stefan Sperling wrote: On Mon, Aug 25, 2008 at 10:14:34AM +0300, Valery Masiutsin wrote: Hello ! I was in need of subversion update to work with 1.5 repos, so i've made one. Status - everything builds and packages just fine, svn client works fine, tested on amd64. However language bindings, need more attention and clean-up. Comments are welcome. Hey Valery, I've been working on an update to the port, too. Maybe we can join forces? :) See attachment, or http://stsp.name/openbsd/ports/subversion-1.5.1-wip.diff I forgot to attach my patch, sorry. It's attached to this mail. Stefan I'm running a slightly modified version of this (updated for 1.5.2). Running Trac-0.11.1 segfaults for me on loading py-subversion. Does any of these commands segfault anyone's machine? import libsvn.wc import svn.core Brad Walker
Re: UPDATE: svn-1.5.1
On Mon, 2008-08-25 at 12:16 +0200, Stefan Sperling wrote: > > SO_VERSION=1.0 > SVN_LIBS= svn_client-1 svn_delta-1 svn_diff-1 svn_fs-1 \ > - svn_fs_base-1 svn_fs_fs-1 svn_ra-1 svn_ra_dav-1 \ > - svn_ra_local-1 svn_ra_svn-1 svn_repos-1 svn_subr-1 > svn_wc-1 > + svn_fs_base-1 svn_fs_fs-1 svn_fs_util-1 svn_ra-1 > svn_ra_neon-1 \ > + svn_ra_local-1 svn_ra_neon-1 svn_ra_svn-1 svn_repos-1 > svn_subr-1 svn_wc-1 SO_VERSION needs a minor version bump because 1.5's ABI backwards compatible but not forwards. http://subversion.tigris.org/svn_1.5_releasenotes.html#compatibility "Subversion 1.5 maintains API/ABI compatibility with earlier releases, by only adding new functions, never removing old ones. A program written to the 1.0, 1.1, 1.2, 1.3, or 1.4 API can both compile and run using 1.5 libraries. However, a program written for 1.5 cannot necessarily compile or run against older libraries." Brad Walker
Re: UPDATE: mozilla-firefox-3.0
On Tue, 2008-07-15 at 13:58 -0500, Marco Peereboom wrote: > * I'd also like to get the old icons back. The new ones are not only > ugly they are fuzzy as well. I also liked them better before when > they were the right size. The new version the icons are basically > touching the frame they are in (like X on tabs) -1 Firefox now integrates icons from the GTK theme and IMO is a huge improvement for GNOME users. I'm not opposed to a bundled, optional FF2 theme with the upstream theme as default. Something like Winestripe: https://addons.mozilla.org/en-US/firefox/addon/3479 Brad Walker
UPDATE: x11/gtk2-murrine-engine
The attached patch for x11/gtk2-murrine-engine updates upstream URLs and
my maintainer email address, fixes WANTLIB and adds four new Murrina
themes. Themes MurrinaBlue and MurrinaTango go well with the Tango icon
theme and default metacity theme. MurrinaElement's a Windows XP-ish
theme. MurrinaOransun is an orange theme.
I've tested this on amd64 and i386.
Brad Walker
Index: Makefile
===
RCS file: /cvs/ports/x11/gtk2-murrine-engine/Makefile,v
retrieving revision 1.3
diff -u -d -r1.3 Makefile
--- Makefile 1 Feb 2008 21:38:27 - 1.3
+++ Makefile 12 Jul 2008 04:53:16 -
@@ -6,12 +6,12 @@
VERSION= 0.53.1
DISTNAME= murrine-${VERSION}
-PKGNAME= gtk2-murrine-engine-${VERSION}p0
+PKGNAME= gtk2-murrine-engine-${VERSION}p1
CATEGORIES= x11
-HOMEPAGE= http://cimi.netsons.org/pages/murrine.php
+HOMEPAGE= http://cimitan.com/murrine/
-MAINTAINER= Brad Walker <[EMAIL PROTECTED]>
+MAINTAINER= Brad Walker <[EMAIL PROTECTED]>
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
@@ -19,19 +19,22 @@
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= http://cimi.netsons.org/media/download_gallery/
-MASTER_SITES0= http://cimi.netsons.org/media/download_gallery/murrine/
+MASTER_SITES= ${HOMEPAGE}files/
DIST_SUBDIR= ${DISTNAME}
-DISTFILES= ${DISTNAME}.tar.bz2:0 \
+DISTFILES= ${DISTNAME}.tar.bz2 \
MurrineThemePack.tar.bz2 \
+ MurrinaBlue.tar.bz2 \
+ MurrinaElement.tar.gz \
MurrinaFancyCandy.tar.bz2 \
+ MurrinaOransun.tar.gz \
+ MurrinaTango.tar.bz2 \
MurrinaVerdeOlivo.tar.bz2 \
MurrinaAquaIsh.tar.bz2 \
MurrinaGilouche.tar.bz2 \
MurrinaLoveGray.tar.bz2
WANTLIB= X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \
- Xcomposite Xdamage pcre \
+ Xcomposite Xdamage pcre pixman-1 \
Xrender cairo expat fontconfig freetype glitz m png z \
atk-1.0 gmodule-2.0 gobject-2.0 glib-2.0 pango-1.0 \
pangoft2-1.0 pangocairo-1.0
Index: distinfo
===
RCS file: /cvs/ports/x11/gtk2-murrine-engine/distinfo,v
retrieving revision 1.2
diff -u -d -r1.2 distinfo
--- distinfo 26 Jun 2007 09:35:15 - 1.2
+++ distinfo 12 Jul 2008 04:53:16 -
@@ -1,35 +1,55 @@
MD5 (murrine-0.53.1/MurrinaAquaIsh.tar.bz2) = 4YuxkXVu0beTQy9rx2B9tA==
+MD5 (murrine-0.53.1/MurrinaBlue.tar.bz2) = xCU0MIyNRaPJU1ceqU9QrA==
+MD5 (murrine-0.53.1/MurrinaElement.tar.gz) = AzSccbHg8rmd+Ru3W86Yxg==
MD5 (murrine-0.53.1/MurrinaFancyCandy.tar.bz2) = Wmbz3kFUegon+SWsjY2MRg==
MD5 (murrine-0.53.1/MurrinaGilouche.tar.bz2) = Zdjx8o+cjtFLFeyJTdC/wA==
MD5 (murrine-0.53.1/MurrinaLoveGray.tar.bz2) = Mc6fzlEUwc/kcdxhTeU5zA==
+MD5 (murrine-0.53.1/MurrinaOransun.tar.gz) = WXIeJNW1YAjuitMQBFaN6A==
+MD5 (murrine-0.53.1/MurrinaTango.tar.bz2) = Q6aEjMip7t7f+1Fs+wK2NQ==
MD5 (murrine-0.53.1/MurrinaVerdeOlivo.tar.bz2) = f7VdYTwxoUVanbbBIf/wuw==
MD5 (murrine-0.53.1/MurrineThemePack.tar.bz2) = QUATwi0fs5VKXD0JSZyAsg==
MD5 (murrine-0.53.1/murrine-0.53.1.tar.bz2) = CfAUWErlk7l5Xz9tsmAF2A==
RMD160 (murrine-0.53.1/MurrinaAquaIsh.tar.bz2) = u/adMGH7EbhirM94fjI93MOU1co=
+RMD160 (murrine-0.53.1/MurrinaBlue.tar.bz2) = ybxT1Sr1KN0+JkYw37nIjV9aa+0=
+RMD160 (murrine-0.53.1/MurrinaElement.tar.gz) = 8iQrE20A2u9IeJfo1y6m25DyXlM=
RMD160 (murrine-0.53.1/MurrinaFancyCandy.tar.bz2) = fSn2dPXvbyjhnRRV2keOEH2jA3Y=
RMD160 (murrine-0.53.1/MurrinaGilouche.tar.bz2) = VNv8gfq6Qyu/BdgnNWmFM8bSM+k=
RMD160 (murrine-0.53.1/MurrinaLoveGray.tar.bz2) = FeiwDI3M7uWpHzw/biFiuo1dZNE=
+RMD160 (murrine-0.53.1/MurrinaOransun.tar.gz) = lNZpRMKIjkEGKReTH869/uP/Jss=
+RMD160 (murrine-0.53.1/MurrinaTango.tar.bz2) = DpvWNoqgwLcOSILpj02WWIpKQsc=
RMD160 (murrine-0.53.1/MurrinaVerdeOlivo.tar.bz2) = uUNdA0XIttZMmvfqpR7sTg3l0o8=
RMD160 (murrine-0.53.1/MurrineThemePack.tar.bz2) = ecz8br8c9FpalyG0EcOdZLBlf64=
RMD160 (murrine-0.53.1/murrine-0.53.1.tar.bz2) = 3XpQfufOMjuIOCz0K6t/AYgfnDk=
SHA1 (murrine-0.53.1/MurrinaAquaIsh.tar.bz2) = v6YJlBO33hxzS5hdQHE7mX33Bgs=
+SHA1 (murrine-0.53.1/MurrinaBlue.tar.bz2) = HIExDttAfiQZT158MFQa/H60jGg=
+SHA1 (murrine-0.53.1/MurrinaElement.tar.gz) = fDIeqyTJ7kF7Djq6uqs60NTgpsM=
SHA1 (murrine-0.53.1/MurrinaFancyCandy.tar.bz2) = a5V83BnBE/pgirg7aQ1yt34MEDM=
SHA1 (murrine-0.53.1/MurrinaGilouche.tar.bz2) = C0cXUiqRFRHy915ZnakpKXrP4XQ=
SHA1 (murrine-0.53.1/MurrinaLoveGray.tar.bz2) = mbnQFzhPlNFg3WmprlqgYdHF7KM=
+SHA1 (murrine-0.53.1/MurrinaOransun.tar.gz) = UbtK0kx7QbCuBuMJkoLV6AB2wJE=
+SHA1 (murrine-0.53.1/MurrinaTango.tar.bz2) = oOGoTrMFNIUCccsLmjWk/dtK58Q=
SHA1 (murrine-0.53.1/MurrinaVerdeOlivo.tar.bz2) = JhYAJzZgc9bXePuc++a+9NgQm08=
SHA1 (murrine-0.53.1/MurrineThemePack.tar.bz2) = Z0cuwvmZzl5x27whzb4+INWl3sw=
SHA1 (murrine-0.53.1/murrine-0.53.1.tar.bz2) = EI4vpDwVJAb/DHvNr0hEE/171zU=
SHA256 (murrine-0.53.1/MurrinaAquaIsh.tar.bz2) = bYRkmt9C7/kPPktUtdQKipCqayRwt20vcs/YcJSWFH4=
+SHA256 (murrine-0.53.1/MurrinaBlue.tar.bz2) = YrMa71a8VMn4RGAWsPnDCIspFvsfxbhzM4VOFQy3W/s=
+SHA256 (murrine-0.53.1/Murri
Re: Emacs 22 port?
On Sat, 2008-06-14 at 22:25 +0200, Andreas Vögele wrote: > Eric Faurot writes: > > The default package stays with the athena tk. I just added the gtk flavor, > > and the no_x11 flavor remains, of course. > > Shouldn't the no_x11 port be built with the following options? > > --without-jpeg \ > --without-tiff \ > --without-gif \ > --without-png > > Otherwise, LIB_DEPENDS-main should be set accordingly. configure handles disabling that --without-x: # FLAVOR=no_x11 make configure ... Configured for `i386-unknown-openbsd4.3'. Where should the build process find the source code?/usr/ports/editors/emacs22/w-emacs-22.2-no_x11/emacs-22.2 What operating system and machine description files should Emacs use? `s/openbsd.h' and `m/intel386.h' What compiler should emacs be built with? cc -O2 -pipe Should Emacs use the GNU version of malloc? yes Should Emacs use a relocating allocator for buffers?yes Should Emacs use mmap(2) for buffer allocation? no What window system should Emacs use?none What toolkit should Emacs use? none Where do we find X Windows header files?NONE Where do we find X Windows libraries? NONE Does Emacs use -lXaw3d? no Does Emacs use -lXpm? no Does Emacs use -ljpeg? no Does Emacs use -ltiff? no Does Emacs use -lungif? no Does Emacs use -lpng? no Does Emacs use X toolkit scroll bars? no Brad Walker
Re: Emacs 22 port?
On Sat, 2008-06-14 at 11:52 +0200, Andreas Vögele wrote: > Here's yet another proposal. > > * The port attached to the end of this message is named "emacs" instead > of "emacs22". It conflicts with "emacs21". I think that there's no > need to support different Emacs versions in the ports tree. Naming > the port "emacs" eases package updates to newer Emacs versions. No problems here. > * The port isn't split into -main and -el. I don't see the point. > Users who are low on disk space can use mg oder jmacs, i.e. joe. Bandwidth's more of a problem than disk space. emacs-el weighs in at 10 +M. The emacs-el subpackage will rarely need a patch-level update, whereas the emacs-main package will probably need several. With separate packages users can update emacs without unnecessarily redownloading the files that would otherwise be in the -el package. This benefits both users and OpenBSD package mirrors. > * By default Emacs is built against GTK+ since GTK+ will be the default > toolkit in Emacs 23. There are two flavors: I agree that gtk should be the default going forward. > * no_x11: Don't build against any widget set. Don't build against > image libraries like jpeg and png which arent't of much use on a > text console. BTW, does anybody actually use the no_x11 flavor? > > * athena: Build against the Athena widget set instead of GTK+. This > flavor will provide minimal GUI support. For example, when Emacs 23 > is released the default flavor will support librsvg, dbus and all > the other bells and whistles that the upstream developers are > currently adding to Emacs. The athena flavor, on the other hand, > will be kept small. I agree with the above specifications of flavors (GTK with all the bells and whistles, athena for minimalist X). I don't think no_x11 should be dropped. It's useful on servers and the FLAVOR doesn't require much maintenance. Once emacs-22.2 goes live I'll install the no_x11 flavor on my home server. I created a separate (default) gtk2 flavor because that forces upgraders to make a decision. Otherwise they might be surprised upgrading from athena-default emacs-21.4.tgz and finding a ton of dependencies pulled in for gtk-default emacs-22.2.tgz. Brad Walker
Firefox 3
Mozilla announced that they will release Firefox 3.0 on Jun 17 2008. Is anyone else working on devel/xulrunner and www/mozilla-firefox updates using the latest release candidates? Brad Walker
Re: Emacs 22 port?
On Mon, 2008-04-14 at 21:42 +0200, Eric Faurot wrote:
> On Sun, 13 Apr 2008 14:35:57 -0700
> "Matthew Dempsky" <[EMAIL PROTECTED]> wrote:
>
> > Is anyone working on an Emacs 22 port? I thought I'd check before
> > making a redundant effort.
>
> This is a work-in-progress port of emacs 22.2 based on a post
> by Fulvio Ciriaco. Contributions are most welcome.
I've attached a patch for Emacs 22 diffed against Eric's tarball[1].
This patch incorporates Matthew Dempsky's gtk FLAVOR patch and plist
fixes[2] as well as an athena flavor. I also attempted to resolve the
problems Eric mentioned.
> There are a few issues I noticed:
>
> - it wants to put some game score stuf in /usr/local/var/games/emacs.
> I would zap that completely, or at least try to make it to /var/games./..
Adding --localstatedir=/var places the game score files
under /var/games/emacs, but then update-plist strips them.
> - there is a problem with chown commands failing during fake install.
The Makefile uses "find $${dest} -exec chown $${LOGNAME:-$$USERNAME} {}
';' ;\" in several places, causing the chown errors since ports doesn't
set LOGNAME or USERNAME. Adding 'LOGNAME="${SHAREOWN}"' to MAKE_ENV
quieted the chown errors.
All three flavors work for me on i386.
Brad Walker
[1] http://marc.info/?l=openbsd-ports&m=120820280419139&w=2
[2] http://marc.info/?l=openbsd-ports&m=120821303306133&w=2
diff -rud emacs22.orig/Makefile emacs22/Makefile
--- emacs22.orig/Makefile Fri Apr 11 15:11:35 2008
+++ emacs22/Makefile Mon Jun 9 22:01:24 2008
@@ -26,14 +26,13 @@
USE_GMAKE= Yes
-FLAVORS= no_x11
-FLAVOR?=
+FLAVORS= athena gtk2 no_x11
+FLAVOR?= gtk2
GCCARCH= ${MACHINE_ARCH}-unknown-openbsd${OPSYS_VER}
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS= ${GCCARCH} --with-pop
-CONFIGURE_ARGS+= --without-toolkit-scroll-bars
+CONFIGURE_ARGS= ${GCCARCH} --with-pop --localstatedir=/var
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include \
-I${LOCALBASE}/include/libpng" \
@@ -44,25 +43,48 @@
CONFIGURE_ENV+= CFLAGS="${CFLAGS} -fno-stack-protector"
.endif
-MAKE_ENV= INSTALL_EMACS="${INSTALL_SCRIPT}"
+MAKE_ENV= INSTALL_EMACS="${INSTALL_SCRIPT}" \
+ LOGNAME="${SHAREOWN}"
SUBST_VARS= GCCARCH VERSION
WANTLIB-main= c m ncurses ossaudio
-.if ${FLAVOR:L:Mno_x11}
-CONFIGURE_ARGS+= --with-x=no
-.else
-USE_X11=Yes
-LIB_DEPENDS-main= ungif.>=5::graphics/libungif \
- jpeg.>=62::graphics/jpeg \
+
+.if ${FLAVOR:L:Mno_x11} && !${FLAVOR:L:Mathena} && !${FLAVOR:L:Mgtk2}
+CONFIGURE_ARGS+=--without-x
+.elif ${FLAVOR:L:Mathena} && !${FLAVOR:L:Mno_x11} && !${FLAVOR:L:Mgtk2}
+CONFIGURE_ARGS+=--with-x-toolkit=athena --without-toolkit-scroll-bars
+USE_X11= Yes
+
+LIB_DEPENDS-main= jpeg.>=62::graphics/jpeg \
png.>=2::graphics/png \
- tiff.>=35::graphics/tiff
-WANTLIB-main+= ICE SM X11 Xaw Xext Xmu Xpm Xt z jpeg
+ tiff.>=35::graphics/tiff \
+ ungif.>=5::graphics/libungif
+WANTLIB-main+= ICE SM X11 Xaw Xext Xmu Xpm Xt z
+.elif ${FLAVOR:L:Mgtk2} && !${FLAVOR:L:Mno_x11} && !${FLAVOR:L:Mathena}
+CONFIGURE_ARGS+=--with-gtk
+USE_X11= Yes
+
+LIB_DEPENDS-main+= atk-1.0.>=2009::devel/atk \
+ cairo.>=7::graphics/cairo \
+ glib-2.0.>=1400,gmodule-2.0.>=1400,gobject-2.0.>=1400::devel/glib2 \
+ glitz.>=2::graphics/glitz \
+ gdk-x11-2.0.>=0.11,gdk_pixbuf-2.0.>=0.11,gtk-x11-2.0.>=0.11::x11/gtk+2 \
+ iconv.>=4::converters/libiconv \
+ intl.>=4::devel/gettext \
+ jpeg.>=62::graphics/jpeg \
+ pango-1.0.>=1400,pangocairo-1.0.>=1400,pangoft2-1.0.>=1400::devel/pango \
+ png.>=6::graphics/png \
+ tiff.>=38::graphics/tiff \
+ ungif.>=5::graphics/libungif
+WANTLIB-main+= ICE SM X11 Xdmcp Xext Xft Xpm Xrender Xau Xcomposite Xcursor \
+ Xdamage Xfixes Xi Xinerama Xrandr pixman-1 \
+ expat fontconfig freetype pthread z
+.else
+ERRORS= "Fatal: You must select one GUI interface: athena, gtk2 or no_x11"
.endif
-RUN_DEPENDS= :emacs-${VERSION}*:${BUILD_PKGPATH}
-RUN_DEPENDS-main=
-
-PKG_ARCH-el= *
+RUN_DEPENDS-el= :emacs-${VERSION}*:${BUILD_PKGPATH}
+PKG_ARCH-el= *
.include
diff -rud emacs22.orig/pkg/DESCR-main emacs22/pkg/DESCR-main
--- emacs22.orig/pkg/DESCR-main Sun Feb 10 03:12:07 2008
+++ emacs22/pkg/DESCR-main Mon Jun 9 10:29:34 2008
@@ -13,4 +13,6 @@
(Doctor :-) and many more.
Flavors:
+ athena - build with athena toolkit
+ gtk2 - build with gtk2 toolkit
no_x11 - build without X11 support
diff -rud emacs22.orig/pkg/PLIST-el emacs22/pkg/PLIST-el
--- emacs22.orig/pkg/PLIST-el Fri Apr 11 15:36:21 2008
+++ emacs22/pkg/PLIST-el Sun Jun 8 18:30:09 2008
@@ -690,6 +690,7 @@
share/emacs/${VERSION}/lisp/net/rcompile.el.gz
share/emacs/${VERSION}/lisp/net/rlog
Re: Emacs 22 port?
On Mon, 2008-04-14 at 15:38 -0700, Matthew Dempsky wrote: > On Mon, Apr 14, 2008 at 12:42 PM, Eric Faurot <[EMAIL PROTECTED]> wrote: > > This is a work-in-progress port of emacs 22.2 based on a post > > by Fulvio Ciriaco. Contributions are most welcome. > > Cool. > > patch below adds a gtk flavor for using the gtk toolkit instead of the > default one. I'm not sure about the LIB_DEPENDS part though; I just > put the major versions from the system I tested on and confirmed that > it works and passed "make lib-depends-check". Does anyone *really* need Athena toolkit support for Emacs 22? If so, Emacs 22 should have FLAVORS no_x11, gtk2 and athena, just like vim. If not, athena support should be dropped and non-no_x11 emacs22 should be built with gtk2. Brad Walker
Re: update of www/pear to 1.7.1. TESTS WANTED
On Tue, 2008-05-20 at 16:10 +0200, Robert Nagy wrote: > Hi folks, here is a diff for www/pear to update it > to the latest version. Please TEST it as much as you > can. THank you. Upstream released 1.7.2 on Sat May 17. The patch in do-install doesn't work for me (Config.php.rej attached): install ok: channel://pear.php.net/Archive_Tar-1.3.2 install ok: channel://pear.php.net/Console_Getopt-1.2.2 install ok: channel://pear.php.net/Structures_Graph-1.0.2 Hmm... Looks like a unified diff to me... The text leading up to this was: -- |$OpenBSD$ |--- lib/PEAR/Config.php.orig Tue May 20 15:51:26 2008 |+++ lib/PEAR/Config.phpTue May 20 15:56:35 2008 -- Patching file lib/PEAR/Config.php using Plan A... Hunk #1 failed at 84. Hunk #2 failed at 107. Hunk #3 failed at 121. Hunk #4 failed at 144. Hunk #5 failed at 160. Hunk #6 failed at 219. 6 out of 6 hunks failed--saving rejects to lib/PEAR/Config.php.rej done *** Error code 1 Stop in /usr/ports/www/pear (line 40 of Makefile). *** Error code 1 Stop in /usr/ports/www/pear (line 2193 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/www/pear (line 1417 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/www/pear (line 1937 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/www/pear (line 1467 of /usr/ports/infrastructure/mk/bsd.port.mk). # Brad Walker Config.php.rej Description: application/reject
Re: Update: net/transmission 1.20
On Sat, 2008-05-17 at 14:09 +, Christian Weisgerber wrote: > Brad Walker <[EMAIL PROTECTED]> wrote: > > > > This could use some testing for glaring problems, with and without > > > a GNOME desktop. > > > > The updated transmission-daemon reinitialized my ~/.transmission/. > > What do you mean by "reinitialized"? Settings and torrents were > removed? The torrents are copied to ~/.config/transmission/torrents, but `transmission-daemon -l' doesn't list them. ~/.config/transmission/daemon/ no longer contains files 'prefs.ini' or 'state'. `transmission-remote -a ~/.config/transmission/torrents/*' doesn't restore the torrent list. Brad Walker
Re: Update: net/transmission 1.20
On Thu, 2008-05-15 at 14:59 +, Christian Weisgerber wrote: > This could use some testing for glaring problems, with and without > a GNOME desktop. People may also want to check the translations; > the automated removal of the unsupported \' formatting character > may have messed something up there. The updated transmission-daemon reinitialized my ~/.transmission/. Is that expected behavior? Brad Walker
Re: Can't compile devel/glib2 on -current
t; Stop in /usr/ports/devel/glib2 (line 2098 > of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 > > Stop in /usr/ports/devel/glib2 (line 1398 > of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 > > Stop in /usr/ports/devel/glib2 (line 1896 > of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 > > Stop in /usr/ports/devel/glib2 (line 1428 > of /usr/ports/infrastructure/mk/bsd.port.mk). > > > > (I just past the end). > > I use a -current system (userland and kernel and xenocara were built > this morning. My /usr/src/ /usr/xenocara /usr/ports are up to date to > -current). > I rm -rf /usr/ports and re-checkout it: problem is the same. I cannot > take a snapshot package about it because snapshot packages are out of > date. > > Thanks for your help. > > - Nicolas. You need to uninstall the glib2-2.14.3 package before building the glib2-2.16.1 package. Brad Walker
Re: Question on vim-plugins
On Sat, 2007-12-15 at 09:03 +0530, Girish Venkatachalam wrote: > Dear friends and fellow porters, > > I wish to know how to go about porting the very excellent plugins > available for the vim editor to OpenBSD. > > Many of them rely on vim being compiled with certain features which our > FLAVOR ideology can handle. > > However this needs deep thought. > > Should they all go under editors/ or do we need a high level directory? > Perhaps this question is not that important. > > I need to know how to structure the porting activity. > > I don't use too many plugins myself but I am sure there are quite a few > useful ones. > > irssi and taglist plugin come to mind. > > Welcome vim buffs to contact me offlist. > > Many thanks and have a nice day! > > -Girish > also: %:s/vim/emacs/g brad walker
Re: UPDATE: gtk+2 and friends
On Sun, 2007-10-21 at 17:54 +0200, Jasper Lievisse Adriaanse wrote: > On Sat, Oct 20, 2007 at 07:17:32AM -0600, brad walker wrote: > > On Sat, 2007-10-20 at 12:18 +0200, Jasper Lievisse Adriaanse wrote: > > > so...did anyone test this yet? > > > > > > > After uninstalling the old version of glib, atk, pango, gtk2, and > > libglade2 I rebuilt everything with the new patches. Gnome, Firefox, > > Evolution, Gnumeric, Pidgin, Liferea, and Audacious work for me. I > > haven't tried gtk2mm and glib2mm. The desktop-file-utils patch from > > yesterday works, too. > > > > The only problem that I have found is that when idling a gnome-terminal > > 'gnome-pty-helper' uses 100% of a core on a Core 2 Duo 1.6ghz machine. > > Using vte-0.16.9 and gnome-terminal-2.18.1p0. A minor version bump to > > gnome-terminal didn't help, either. > i suppose you're running it in amd64 mode, right? dlg already notified > me, but i haven't found a solution to the problem yet.. Yeah, I forgot to mention it's amd64. I found a similar problem on the freebsd 2003 mailing list archives: http://lists.freebsd.org/pipermail/freebsd-gnome/2003-May/001051.html I also forgot to mention that gmpc-0.15.1 and ncmpc-20070917 (glib2) worked for me (on amd64). bmw
Re: UPDATE: gtk+2 and friends
On Sat, 2007-10-20 at 17:51 +0200, Simon Kuhnle wrote: > On Sat, Oct 20, 2007 at 12:18:43PM +0200, Jasper Lievisse Adriaanse wrote: > > so...did anyone test this yet? > > > > Yes, I did on i386. It took almost the whole day ;-) > > So, the patches applied and built. Then I rebuilt all the stuff for and > Firefox. Then I wanted to built gajim, built the stuff for it, and with > libglade2 I get errors (log attached). Try the libglade-2.6.2 patch Jasper posted to the list. bmw
Re: UPDATE: gtk+2 and friends
On Sat, 2007-10-20 at 12:18 +0200, Jasper Lievisse Adriaanse wrote: > so...did anyone test this yet? > After uninstalling the old version of glib, atk, pango, gtk2, and libglade2 I rebuilt everything with the new patches. Gnome, Firefox, Evolution, Gnumeric, Pidgin, Liferea, and Audacious work for me. I haven't tried gtk2mm and glib2mm. The desktop-file-utils patch from yesterday works, too. The only problem that I have found is that when idling a gnome-terminal 'gnome-pty-helper' uses 100% of a core on a Core 2 Duo 1.6ghz machine. Using vte-0.16.9 and gnome-terminal-2.18.1p0. A minor version bump to gnome-terminal didn't help, either. bmw
Re: [NEW] rxvt-unicode port
On Sun, 2007-07-15 at 18:41 +0200, Landry Breuil wrote: > 2007/7/15, Benoit Chesneau <[EMAIL PROTECTED]>: > > > > On 7/15/07, Landry Breuil <[EMAIL PROTECTED]> wrote: > > > > > With USE_SYSTRACE=yes, fails during make fake, it does nasty things in > > $HOME > > > apparently - maybe a @exec to add, and a makefile to patch. > > > > > > if test -x "/usr/bin/tic"; then if test -n "/usr/bin/tic"; then > > /usr/bin/tic > > > ./etc/rxvt-unicode.terminfo; fi; fi > > > systrace: deny user: root, prog: /usr/bin/tic, pid: 13110(0)[8898], > > policy: > > > /usr/bin/env, filters: 193, syscall: native-fswrite(136), filename: > > > /usr/share/terminfo > > > systrace: deny user: root, prog: /usr/bin/tic, pid: 13110(0)[8898], > > policy: > > > /usr/bin/env, filters: 193, syscall: native-fswrite(136), filename: > > /rxvt- > > > unicode-8.2_writes_to_HOME/.terminfo > > > "./etc/rxvt-unicode.terminfo", line 9, terminal 'rxvt-unicode': /rxvt- > > > unicode-8.2_writes_to_HOME/.terminfo: permission denied (errno 1) > > > *** Error code 1 > > > > > > Landry > > > > > > > Thanks. > > > > I change path of terminfo to /usr/local/share/terminfo. Here is the fixed > > port : > > > > http://babilu.metavers.net/openbsd/rxvt-unicode/obsd-rxvt_unicode_8.2_2.tar.gz > > > Builds, installs and seems to works fine here @i386 :) > > Landry It works great for me on amd64. bmw
UPDATE: gnome-vfs2-2.20p0 w/cdparanoia, samba SUBPACKAGES
Hello,
I realize that it's best to update Gnome to version 2.20 by going from
the base packages to applications in the dependency tree. gnome-vfs2
depends on gconf and ORBit, which don't yet have updates on the mailing
list. However, since this patch adds extra functionality to the current
port I thought it best to submit it. I've ran a similar port for v2.18.1
for several months without problems. It's just an update of the patch I
submitted 2007-08-31.
The NEWS shows a few error corrections in both the application and the
build process and a few translation updates. On amd64-current I
successfully transferred files over a password-protected SMB network
using this patch along with Jasper's recent GNOME updates from the
mailing list. Please test and comment.
Brad Walker
Index: Makefile
===
RCS file: /root/ports/x11/gnome/vfs2/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- Makefile 5 Jul 2007 22:50:11 - 1.24
+++ Makefile 18 Oct 2007 16:46:18 -
@@ -2,42 +2,61 @@
SHARED_ONLY= Yes
-COMMENT= GNOME Virtual File System
+COMMENT-main= GNOME Virtual File System
+COMMENT-cdda= cdparanoia module for gnome-vfs2
+COMMENT-smb= samba module for gnome-vfs2
GNOME_PROJECT= gnome-vfs
-GNOME_VERSION= 2.18.1
-PKGNAME= gnome-vfs2-${VERSION}p0
-SHARED_LIBS += gnomevfs-2 1800.1 # .1800.1
+GNOME_VERSION= 2.20.0
+PKGNAME-main= gnome-vfs2-${VERSION}p0
+PKGNAME-cdda= gnome-vfs2-cdda-${VERSION}p0
+PKGNAME-smb= gnome-vfs2-smb-${VERSION}p0
+MULTI_PACKAGES= -main -cdda -smb
+
+SHARED_LIBS += gnomevfs-2 2000.0 # .2000.0
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB += c crypto dbus-1 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
-WANTLIB += m pthread rpcsvc ssl stdc++ util z
+WANTLIB += crypto dbus-1 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
+WANTLIB += m ssl util z
MODULES= devel/gettext \
x11/gnome
BUILD_DEPENDS= :gnome-mime-data->=2.0.0:x11/gnome/mime-data
LIB_DEPENDS= dbus-glib-1.>=3::x11/dbus-glib \
- fam::sysutils/fam \
xml2.>=9::textproc/libxml \
gconf-2.>=5::devel/gconf2 \
- cdda_interface,cdda_paranoia::audio/cdparanoia \
- bz2.>=10::archivers/bzip2 \
ORBit-2.>=2::devel/ORBit2
RUN_DEPENDS= :gnome-mime-data->=2.0.0:x11/gnome/mime-data
+WANTLIB-main= ${WANTLIB} c pthread rpcsvc stdc++
+LIB_DEPENDS-main= ${LIB_DEPENDS} \
+ bz2.>=10::archivers/bzip2 \
+ fam::sysutils/fam
+RUN_DEPENDS-main= ${RUN_DEPENDS
+
+WANTLIB-smb= ${WANTLIB}
+LIB_DEPENDS-smb= ${LIB_DEPENDS} \
+ smbclient::net/samba \
+ gnomevfs-2.>=2000::x11/gnome/vfs2
+RUN_DEPENDS-smb= ${RUN_DEPENDS}
+
+WANTLIB-cdda= ${WANTLIB}
+LIB_DEPENDS-cdda= ${LIB_DEPENDS} \
+ cdda_interface,cdda_paranoia::audio/cdparanoia \
+ gnomevfs-2.>=2000::x11/gnome/vfs2
+RUN_DEPENDS-cdda= ${RUN_DEPENDS}
+
USE_X11= Yes
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/gnome-vfs2 \
--disable-schemas-install \
- --enable-openssl \
--enable-cdda \
--disable-avahi \
- --disable-howl \
- --disable-samba
+ --disable-howl
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
Index: distinfo
===
RCS file: /root/ports/x11/gnome/vfs2/distinfo,v
retrieving revision 1.14
diff -u -r1.14 distinfo
--- distinfo 30 May 2007 09:25:58 - 1.14
+++ distinfo 18 Oct 2007 16:04:06 -
@@ -1,5 +1,5 @@
-MD5 (gnome/gnome-vfs-2.18.1.tar.bz2) = v0ptlRgNBZgYk+XQIcZpXA==
-RMD160 (gnome/gnome-vfs-2.18.1.tar.bz2) = /y/Hp8R7haA9ZZZKitHX1YVpjz0=
-SHA1 (gnome/gnome-vfs-2.18.1.tar.bz2) = 6Tn+T+LnVRaubE1Hb4+0T1nsi9w=
-SHA256 (gnome/gnome-vfs-2.18.1.tar.bz2) = CY2SDLfUpQ4kXeqvq/2OBrhsiHcdVr5WdZfAnAkgf14=
-SIZE (gnome/gnome-vfs-2.18.1.tar.bz2) = 1916897
+MD5 (gnome/gnome-vfs-2.20.0.tar.bz2) = uf4KBm0OaT50oADlUzgjWw==
+RMD160 (gnome/gnome-vfs-2.20.0.tar.bz2) = iA4cGvywwiExrfrU5aWqNgXBNrs=
+SHA1 (gnome/gnome-vfs-2.20.0.tar.bz2) = POGVm4IPQg9n4Y5vnae8mofdQ0k=
+SHA256 (gnome/gnome-vfs-2.20.0.tar.bz2) = zZXsWkgIeZ8DPcudrzftOENsWU1AFOWASWf6nliT6R8=
+SIZE (gnome/gnome-vfs-2.20.0.tar.bz2) = 1918358
Index: pkg/DESCR
===
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- pkg/DESCR 7 Oct 2003 05:48:56 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,4 +0,0 @@
-This is the GNOME Virtual File System.
-
-GNOME VFS is currently used as one of the foundations of the Nautilus
-file manager.
Index: pkg/DESCR-cdda
===
RCS file: pkg/DESCR-cdda
diff -N pkg/DESCR-cdda
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/DESCR-cdda 18 Oct 2007 16:02:25 -
@@ -0,0 +1,2 @@
+This package provides the cdd
Re: UPDATE: gtk+2 and friends
Hello, glib2.diff applied cleanly to the -current ports tree. Unfortunately it didn't build for me. This system runs amd64#1414 from tuesday october 16th, 2007. Build excerpt: /usr/local/bin/libtool --mode=link cc -O2 -pipe -Wall -L/usr/local/lib -o libmoduletestplugin_b.la -rpath /usr/local/lib -Wl,-E -avoid-version -module -rpath /usr/local/lib libmoduletestplugin_b.lo ../gmodule/libgmodule-2.0.la ../glib/libglib-2.0.la -lintl -liconv rm -fr .libs/libmoduletestplugin_b.a .libs/libmoduletestplugin_b.la .libs/libmoduletestplugin_b.lai .libs/libmoduletestplugin_b.so cc -shared -fPIC -DPIC -o .libs/libmoduletestplugin_b.so .libs/libmoduletestplugin_b.o -L/usr/ports/devel/glib2/w-glib-2.14.1/glib-2.14.1/glib/.libs -L/usr/local/lib -liconv -lintl -L../glib/.libs -lglib-2.0 -L../gmodule/.libs -lgmodule-2.0 -Wl,-E ar cru .libs/libmoduletestplugin_b.a libmoduletestplugin_b.o ranlib .libs/libmoduletestplugin_b.a creating libmoduletestplugin_b.la (cd .libs && rm -f libmoduletestplugin_b.la && ln -s ../libmoduletestplugin_b.la libmoduletestplugin_b.la) /usr/local/bin/libtool --mode=link cc -O2 -pipe -Wall -L/usr/local/lib -o testglib testglib.o ../glib/libglib-2.0.la -lintl -liconv cc -O2 -pipe -Wall -o .libs/testglib testglib.o -L/usr/local/lib -L../glib/.libs -lglib-2.0 -lintl -liconv -Wl,-rpath,/usr/local/lib /usr/local/lib/libglib-2.0.so.1200.13: warning: vsprintf() is often misused, please use vsnprintf() testglib.o(.text+0x426a): In function `main': /usr/ports/devel/glib2/w-glib-2.14.1/glib-2.14.1/tests/testglib.c:1482: warning: strcpy() is almost always misused, please use strlcpy() /usr/local/lib/libglib-2.0.so.1200.13: warning: strcat() is almost always misused, please use strlcat() testglib.o(.text +0x17a7):/usr/ports/devel/glib2/w-glib-2.14.1/glib-2.14.1/tests/testglib.c:600: undefined reference to `g_get_user_special_dir' testglib.o(.text +0x17c7):/usr/ports/devel/glib2/w-glib-2.14.1/glib-2.14.1/tests/testglib.c:602: undefined reference to `g_get_user_special_dir' testglib.o(.text +0x17e7):/usr/ports/devel/glib2/w-glib-2.14.1/glib-2.14.1/tests/testglib.c:604: undefined reference to `g_get_user_special_dir' collect2: ld returned 1 exit status gmake[3]: *** [testglib] Error 1 gmake[3]: Leaving directory `/usr/ports/devel/glib2/w-glib-2.14.1/glib-2.14.1/tests' gmake[2]: *** [all-recursive] Error 1 gmake[2]: Leaving directory `/usr/ports/devel/glib2/w-glib-2.14.1/glib-2.14.1/tests' gmake[1]: *** [all-recursive] Error 1 gmake[1]: Leaving directory `/usr/ports/devel/glib2/w-glib-2.14.1/glib-2.14.1' gmake: *** [all] Error 2 *** Error code 2 Stop in /usr/ports/devel/glib2 (line 2063 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/devel/glib2 (line 1373 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/devel/glib2 (line 1861 of /usr/ports/infrastructure/mk/bsd.port.mk). *** Error code 1 Stop in /usr/ports/devel/glib2 (line 1421 of /usr/ports/infrastructure/mk/bsd.port.mk). On Tue, 2007-10-16 at 06:59 +0200, Jasper Lievisse Adriaanse wrote: > On Mon, Oct 15, 2007 at 11:15:56PM +0200, Jasper Lievisse Adriaanse wrote: > > hi, > > > > here's an update to take gtk+2 and friends to the next major release. > > > > please test and comment. > > breakage is expected, mainly due to the new tooltip implementation, > > please let me know if you experience it. (full build logs attached > > please). > > > > cheers, > > jasper > > > > changes: > > glib: > > GRegex, an implementation of Perl regular expressions based on PCRE, was > > added. GSequence, a list implemented using a balanced binary tree, was > > added. Support for xdg-user-dirs was added. All the bugfixes and > > enhancements from the 2.13 development branch were integrated. > > > > gtk: > > A completely new tooltip implementation was introduced. A new interface > > builder, GtkBuilder, was added. Keyboard navigation was improved. > > GtkScaleButton, GtkVolumeButton, and GtkRecentAction were added. Search > > functionality was added to the file chooser, supporting several > > backends. Many bugs were fixed. Translations were updated. > > > > > > -- > > "The good life is one inspired by love and guided by knowledge." > > -- Bertrand Russel > > > oops, send the wrong diffs. correct ones attached.
[patch] liferea revision bump and SHARED_LIBS fix
-current liferea wouldn't build for me on amd64. after adding a
SHARED_LIBS and the gpg stuff to dependencies it built.
Index: Makefile
===
RCS file: /root/ports/www/liferea/Makefile,v
retrieving revision 1.6
diff -u -d -r1.6 Makefile
--- Makefile 28 Aug 2007 21:41:10 - 1.6
+++ Makefile 8 Sep 2007 07:22:23 -
@@ -4,11 +4,13 @@
COMMENT= simple GTK desktop news aggregator
-DISTNAME= liferea-1.2.22
+DISTNAME= liferea-1.2.23
CATEGORIES= www x11
HOMEPAGE= http://liferea.sourceforge.net/
+SHARED_LIBS= linotiflibnotify 0.0
+
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
@@ -28,6 +30,8 @@
BUILD_DEPENDS= ::devel/xulrunner,-devel \
::textproc/p5-XML-Parser
LIB_DEPENDS= xulrunner/gtkembedmoz,xulrunner/xpcom,xulrunner/xul::devel/xulrunner,-main \
+ gcrypt.>=12::security/libgcrypt \
+ gpg-error.>=1::security/libgpg-error \
gconf-2.>=5::devel/gconf2 \
notify.>=2::devel/libnotify \
lua.>=5::lang/lua \
Index: distinfo
===
RCS file: /root/ports/www/liferea/distinfo,v
retrieving revision 1.4
diff -u -d -r1.4 distinfo
--- distinfo 28 Aug 2007 21:41:10 - 1.4
+++ distinfo 8 Sep 2007 06:47:32 -
@@ -1,5 +1,5 @@
-MD5 (liferea-1.2.22.tar.gz) = 52pEllHgsBkQEgfy9rDIvg==
-RMD160 (liferea-1.2.22.tar.gz) = WHMMmWkQYrQvpFqLD1VOSlNTjKM=
-SHA1 (liferea-1.2.22.tar.gz) = FMYIkCnwbZzrnkKAUR1jWiTmwm0=
-SHA256 (liferea-1.2.22.tar.gz) = YcI1fx41pUKrCQINuS8o8wA+RF0NSps4uBLqs6PvvlY=
-SIZE (liferea-1.2.22.tar.gz) = 1516302
+MD5 (liferea-1.2.23.tar.gz) = LZEMYPBjp9J01pgVylXQAg==
+RMD160 (liferea-1.2.23.tar.gz) = Jqnu4b12DB5/ej+967mIgEF7Jus=
+SHA1 (liferea-1.2.23.tar.gz) = JwogtZklzAg6sX8wKLrkopYlXfI=
+SHA256 (liferea-1.2.23.tar.gz) = E23uh8cVbX+yAjO2ull+GUvKr7zk8TK9OwAhSLKYKmc=
+SIZE (liferea-1.2.23.tar.gz) = 1517098
Index: pkg/PLIST
===
RCS file: /root/ports/www/liferea/pkg/PLIST,v
retrieving revision 1.2
diff -u -d -r1.2 PLIST
--- pkg/PLIST 4 Jul 2007 22:41:40 - 1.2
+++ pkg/PLIST 8 Sep 2007 06:36:27 -
@@ -8,14 +8,16 @@
lib/liferea/liblihtmlx.so
lib/liferea/liblinotiflibnotify.a
lib/liferea/liblinotiflibnotify.la
-lib/liferea/liblinotiflibnotify.so
[EMAIL PROTECTED] lib/liferea/liblinotiflibnotify.so.${LIBlinotiflibnotify_VERSION}
lib/liferea/liblinotifpopup.a
lib/liferea/liblinotifpopup.la
lib/liferea/liblinotifpopup.so
lib/liferea/libliscrlua.a
lib/liferea/libliscrlua.la
lib/liferea/libliscrlua.so
+man/cat3f/
@man man/man1/liferea.1
+man/man3f/
man/pl/
man/pl/man1/
@man man/pl/man1/liferea.1
Re: can't play FLAC on Audacious
On Fri, 2007-08-17 at 13:57 +, Christian Weisgerber wrote: > steven mestdagh <[EMAIL PROTECTED]> wrote: > > > > I don't seem to be able to play any FLAC files in Audacious anymore, > > > OpenBSD-current snapshot on 2007-08-09 installed. > > > > yes, when you look at the port's makefile, you will see that flac is > > disabled. there was some problem with it last time i looked. > > IIRC, audacious-plugins now requires the new FLAC 1.1.3+ API. > > Updating FLAC and moving all dependent ports over to the new API > is something I urgently need to tackle once the 4.2 release is out > of the way. > i submitted a bug report upstream a while ago. they say the next minor release will support flac using the system's installation. http://bugs-meta.atheme-project.org/view.php?id=993
Re: gnome-vfs2-2.18.p0: samba flavor and cdparanoia error
Marc Espie <[EMAIL PROTECTED]> writes: > On Thu, Jun 28, 2007 at 12:38:08AM -0600, Brad Walker wrote: >> hello, >> >> please test the patch and comment. i accessed windows file shares on >> i386 with this modification. > > This is a bad idea. gnome-vfs has a modular design, you can respect that > modular design. Namely, samba shouldn't be a FLAVOR, it should be a > separate SUBPACKAGE. here's gnome-vfs with samba and cdparanoia subpackages. i copied the subpackage names and DESCRs from pkgsrc. please test and comment. gnome-vfs2.patch.gz Description: Binary data
gnome-vfs2-2.18.p0: samba flavor and cdparanoia error
hello,
please test the patch and comment. i accessed windows file shares on
i386 with this modification.
also, the port before and after this patch gives me problems with
--enable-cdda. the configure script says it's not recommended. here's the error:
checking cdda_interface.h usability... yes
checking cdda_interface.h presence... yes
checking for cdda_interface.h... yes
checking cdda_paranoia.h usability... no
checking cdda_paranoia.h presence... yes
configure: WARNING: cdda_paranoia.h: present but cannot be compiled
configure: WARNING: cdda_paranoia.h: check for missing prerequisite headers?
configure: WARNING: cdda_paranoia.h: see the Autoconf documentation
configure: WARNING: cdda_paranoia.h: section "Present But Cannot Be
Compiled"
configure: WARNING: cdda_paranoia.h: proceeding with the preprocessor's result
configure: WARNING: cdda_paranoia.h: in the future, the compiler will take
precedence
configure: WARNING: ## -- ##
configure: WARNING: ## Report this to the AC_PACKAGE_NAME lists. ##
configure: WARNING: ## -- ##
checking for cdda_paranoia.h... yes
...
Gnome VFS configuration summary:
IPv6 support:yes
SSL support: yes
Avahi support: no
Howl support:no
HAL support:no
Enable gnome-vfs-daemon: yes
SELinux support:no
File ACL backends:
Gtk Doc: no
FS monitor backends: fam
Samba method:no
CDDA method: yes
Enable profiler: no
-brad walker
diff -rup vfs2.orig/Makefile vfs2/Makefile
--- vfs2.orig/Makefile Wed Jun 27 22:53:35 2007
+++ vfs2/Makefile Thu Jun 28 00:20:26 2007
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.23 2007/06/11 13:12:51 martynas Exp $
+# $OpenBSD: $
SHARED_ONLY= Yes
@@ -44,9 +44,17 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--enable-cdda \
--disable-avahi \
--disable-howl \
- --disable-samba
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+
+FLAVORS= samba
+FLAVOR?=
+
+.if ${FLAVOR:L:Msamba}
+LIB_DEPENDS+= smbclient::net/samba
+.else
+CONFIGURE_ARGS+= --disable-samba
+.endif
pre-build:
perl -pi -e "s,/usr/local,${LOCALBASE},g" ${WRKSRC}/libgnomevfs/xdgmime.c
diff -rup vfs2.orig/pkg/DESCR vfs2/pkg/DESCR
--- vfs2.orig/pkg/DESCR Wed Jun 27 22:53:35 2007
+++ vfs2/pkg/DESCR Wed Jun 27 23:50:27 2007
@@ -2,3 +2,7 @@ This is the GNOME Virtual File System.
GNOME VFS is currently used as one of the foundations of the Nautilus
file manager.
+
+Available flavors:
+
+samba Enable file sharing via SMB (Windows)
diff -rup vfs2.orig/pkg/PLIST vfs2/pkg/PLIST
--- vfs2.orig/pkg/PLIST Wed Jun 27 22:53:35 2007
+++ vfs2/pkg/PLIST Wed Jun 27 23:23:23 2007
@@ -99,6 +99,9 @@ lib/gnome-vfs-2.0/modules/libnntp.so
lib/gnome-vfs-2.0/modules/libsftp.a
lib/gnome-vfs-2.0/modules/libsftp.la
lib/gnome-vfs-2.0/modules/libsftp.so
+lib/gnome-vfs-2.0/modules/libsmb.a
+lib/gnome-vfs-2.0/modules/libsmb.la
+lib/gnome-vfs-2.0/modules/libsmb.so
lib/gnome-vfs-2.0/modules/libtar.a
lib/gnome-vfs-2.0/modules/libtar.la
lib/gnome-vfs-2.0/modules/libtar.so
@@ -122,6 +125,8 @@ share/examples/gnome-vfs2/gnome-vfs-2.0/modules/cdda-m
@sample ${SYSCONFDIR}/gnome/gnome-vfs-2.0/modules/cdda-module.conf
share/examples/gnome-vfs2/gnome-vfs-2.0/modules/default-modules.conf
@sample ${SYSCONFDIR}/gnome/gnome-vfs-2.0/modules/default-modules.conf
+share/examples/gnome-vfs2/gnome-vfs-2.0/modules/smb-module.conf
[EMAIL PROTECTED] ${SYSCONFDIR}/gnome/gnome-vfs-2.0/modules/smb-module.conf
share/examples/gnome-vfs2/gnome-vfs-2.0/modules/ssl-modules.conf
@sample ${SYSCONFDIR}/gnome/gnome-vfs-2.0/modules/ssl-modules.conf
share/gtk-doc/html/gnome-vfs-2.0/
@@ -229,14 +234,10 @@ share/locale/ku/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/li/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/lt/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/lv/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/mg/
-share/locale/mg/LC_MESSAGES/
share/locale/mg/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/mk/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ml/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/mn/LC_MESSAGES/gnome-vfs-2.0.mo
-share/locale/mr/
-share/locale/mr/LC_MESSAGES/
share/locale/mr/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/ms/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/nb/LC_MESSAGES/gnome-vfs-2.0.mo
@@ -272,6 +273,7 @@ share/locale/zh_HK/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/zh_TW/LC_MESSAGES/gnome-vfs-2.0.mo
share/locale/zu/LC_MESSAGES/gnome-vfs-2.0.mo
@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/gnome-vfs2/*.schemas > /dev/null
+share/nls/pl_PL.ISO_8859-2/
[NEW] x11/gtk2-murrine-engine
hello, i've attached my first port, for the gtk2 engine "murrine". the engine is licensed under the gpl-v2, and i'm waiting for the author to comment on the licensing of the themes. please test and comment. ?'s: do i need 'MODULES= devel/gettext'? what's with the empty nls directory in PLIST? are the LIB_DEPENDS versions correct for gtk+-2.8+? is there a safer way to install the themes in the post-install target? thanks, -brad walker gtk2-murrine-engine.tar Description: x11/gtk2.murrine-engine port
