CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: l...@cvs.openbsd.org2010/04/19 00:43:36 Modified files: sysutils/toprump: Makefile distinfo Log message: update to toprump-0.13.4: bug fix release ok sthen@ landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2010/04/19 02:16:17 Modified files: archivers/libtar: Makefile archivers/libtar/patches: patch-lib_Makefile_in Log message: PREFIX - TRUEPREFIX
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2010/04/19 03:21:31 Modified files: databases/sqlports: Makefile databases/pkglocatedb: Makefile Log message: fix, should build correctly even if SUBDIR is defined
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: step...@cvs.openbsd.org 2010/04/19 03:21:10 Modified files: www/drupal6/masquerade: Makefile Added files: www/drupal6/masquerade/patches: patch-masquerade_install Log message: - add db descriptions so that the schema module can parse them, see http://drupal.org/node/588694 - bump PKG_NAME prodded and ok espie@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2010/04/19 03:36:30 Modified files: x11/qt4: Makefile distinfo x11/qt4/patches: patch-configure patch-qmake_generators_unix_unixmake2_cpp patch-qmake_generators_unix_unixmake_cpp patch-src_3rdparty_webkit_JavaScriptCore_runtime_Collector_cpp patch-src_corelib_global_qglobal_h patch-src_corelib_io_qfsfileengine_unix_cpp patch-src_plugins_imageformats_mng_mng_pro patch-src_plugins_sqldrivers_sqldrivers_pro x11/qt4/pkg: PFRAG.GCC4-examples PFRAG.GCC4-shared-main PFRAG.shared-main PLIST-examples PLIST-html PLIST-main Added files: x11/qt4/patches: patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_AlwaysInline_h patch-src_3rdparty_javascriptcore_JavaScriptCore_wtf_Threading_h patch-src_corelib_kernel_qmetaobject_cpp patch-src_corelib_statemachine_qabstractstate_p_h patch-src_gui_itemviews_qlistview_cpp patch-src_plugins_graphicssystems_trace_qgraphicssystem_trace_cpp patch-src_xmlpatterns_schema_qxsdparticlechecker_cpp Log message: update to 4.6.2. things work apart from eventsview...
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2010/04/19 03:37:49 Modified files: devel/py-sip : Makefile distinfo Log message: update required to deal with qt4 (maintainer did not reply to requests ?)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org 2010/04/19 03:51:30
Modified files:
x11/py-qt4 : Makefile distinfo
x11/py-qt4/patches: patch-configure_py
x11/py-qt4/pkg : PLIST-docs PLIST-main
Log message:
update for qt 4.6.2.
While at it, patch configure to substitute $(LOCALBASE) and ${LOCALBASE}
in Makefile fragments that were never intended to run as shell-scripts
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: step...@cvs.openbsd.org 2010/04/19 04:08:37 ports/www/drupal6/ldap_integration/patches Update of /cvs/ports/www/drupal6/ldap_integration/patches In directory cvs.openbsd.org:/tmp/cvs-serv31862/patches Log Message: Directory /cvs/ports/www/drupal6/ldap_integration/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2010/04/19 04:57:16 Modified files: x11/farsi-bfonts-ttf: Makefile distinfo x11/farsi-bfonts-ttf/pkg: PLIST Log message: Add more fonts.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2010/04/19 07:55:56 Modified files: x11/tint : Makefile distinfo x11/tint/pkg : PLIST Added files: x11/tint/patches: patch-sample_tint2rc patch-src_Makefile_in patch-src_battery_battery_c patch-src_battery_battery_h Removed files: x11/tint/patches: patch-src_Makefile Log message: Update to tint2-0.9. Now includes working battery monitor. OK dcoppa_p@ and st...@.
Re: CVS: cvs.openbsd.org: ports
On 2010/04/19 03:21, Marc Espie wrote: CVSROOT: /cvs Module name: ports Changes by: es...@cvs.openbsd.org 2010/04/19 03:21:31 Modified files: databases/sqlports: Makefile databases/pkglocatedb: Makefile Log message: fix, should build correctly even if SUBDIR is defined thanks Antti Harri for reporting the problem with pkglocatedb.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2010/04/19 08:14:34 Modified files: devel/py-sip : Makefile distinfo x11/py-qt4 : Makefile distinfo x11/py-qt4/patches: patch-configure_py Log message: damn riverbank ! can't they keep distfiles for a few weeks ? update again, hoping those don't vanish tomorrow...
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: step...@cvs.openbsd.org 2010/04/19 08:15:01 Modified files: www/drupal6/ldap_integration: Makefile Added files: www/drupal6/ldap_integration/patches: patch-ldapauth_install Log message: - add db descriptions, see http://drupal.org/node/775182 - bump PKGNAME prodded by espie@, ok landry@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: fg...@cvs.openbsd.org 2010/04/19 11:30:54 Modified files: www/py-jinja2 : Makefile distinfo www/py-jinja2/pkg: PLIST Log message: Update to 2.4. maintainer ok.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2010/04/19 17:44:55 Log message: Import oolite, 3d space combat/trading game in the style of elite. tweaked by and ok aja Status: Vendor Tag: nicm Release Tags: nicm_20100420 N ports/games/oolite/Makefile N ports/games/oolite/distinfo N ports/games/oolite/pkg/PLIST N ports/games/oolite/pkg/DESCR N ports/games/oolite/pkg/MESSAGE N ports/games/oolite/patches/patch-deps_Cross-platform-deps_SpiderMonkey_js_src_config_Linux_All_mk N ports/games/oolite/patches/patch-deps_Cross-platform-deps_SpiderMonkey_js_src_config_mk N ports/games/oolite/patches/patch-Makefile N ports/games/oolite/patches/patch-GNUmakefile N ports/games/oolite/patches/patch-src_Core_GameController_h N ports/games/oolite/patches/patch-src_SDL_MyOpenGLView_m N ports/games/oolite/patches/patch-src_Core_ResourceManager_m N ports/games/oolite/patches/patch-GNUmakefile_postamble N ports/games/oolite/patches/patch-src_Core_OOLogOutputHandler_m N ports/games/oolite/patches/patch-src_Core_GameController_m N ports/games/oolite/patches/patch-src_Core_OOCacheManager_m N ports/games/oolite/patches/patch-src_Core_OOLogHeader_m N ports/games/oolite/patches/patch-src_Core_Entities_PlayerEntity_m N ports/games/oolite/patches/patch-src_Core_Debug_OODebugTCPConsoleClient_m N ports/games/oolite/patches/patch-src_Core_OXPVerifier_OOCheckRequiresPListVerifierStage_m N ports/games/oolite/patches/patch-src_Core_Scripting_OOJSOolite_m No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: n...@cvs.openbsd.org2010/04/19 17:47:12 Modified files: games : Makefile Log message: +oolite.
sndio for emulators/snes9x
I enabled using a separate thread for sounds by default. it's
possible that the audio block size would be large enough that X
events would be blocked for too long and timeout, returning an
error. but having the sound handled in a different thread this
does not happen.
imo, seems to overall work better than when it was using audio(4).
please test.
--
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org
Index: Makefile
===
RCS file: /cvs/ports/emulators/snes9x/Makefile,v
retrieving revision 1.10
diff -N -u -p Makefile
--- Makefile10 Aug 2009 06:31:09 - 1.10
+++ Makefile19 Apr 2010 06:22:18 -
@@ -3,7 +3,7 @@
COMMENT= emulates the Super Nintendo Entertainment System
DISTNAME= snes9x-1.51-src
-PKGNAME= ${DISTNAME:S/-src//}p0
+PKGNAME= ${DISTNAME:S/-src//}p1
CATEGORIES=emulators games
HOMEPAGE= http://www.snes9x.com/
@@ -14,7 +14,8 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM=No
PERMIT_DISTFILES_FTP= Yes
-WANTLIB+= X11 Xext Xxf86dga Xxf86vm c m pthread pthread-stubs stdc++ xcb z
+WANTLIB+= X11 Xext Xxf86dga Xxf86vm c m pthread pthread-stubs sndio \
+ stdc++ xcb z
MASTER_SITES= http://vincent.grigorieff.free.fr/snes9x/ \
http://files.ipherswipsite.com/snes9x/
@@ -31,8 +32,8 @@ AUTOCONF_VERSION= 2.59
USE_X11= Yes
USE_GMAKE= Yes
CONFIGURE_STYLE=autoconf no-autoheader
-CONFIGURE_ENV= OPTFLAGS=${CXXFLAGS} -I${LOCALBASE}/include/libpng \
- LIBS=-L${LOCALBASE}/lib
+CONFIGURE_ENV= OPTFLAGS=${CXXFLAGS} -I${LOCALBASE}/include/libpng
-DUSE_SNDIO \
+ LIBS=-L${LOCALBASE}/lib -lsndio
NO_REGRESS=Yes
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N -u -p patches/patch-Makefile_in
--- /dev/null 19 Apr 2010 00:22:18 -
+++ patches/patch-Makefile_in 19 Apr 2010 06:22:18 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- Makefile.in.orig Thu Jan 14 18:00:24 2010
Makefile.inThu Jan 14 18:00:42 2010
+@@ -133,7 +133,7 @@ endif
+
+ ifdef THREAD_SOUND
+ CPUDEFINES += -DUSE_THREADS
+-EXTRALIBS += -lpthread
++EXTRALIBS += -pthread
+ endif
+
+ ifdef GLIDE
Index: patches/patch-snes9x_cpp
===
RCS file: patches/patch-snes9x_cpp
diff -N -u -p patches/patch-snes9x_cpp
--- /dev/null 19 Apr 2010 00:22:18 -
+++ patches/patch-snes9x_cpp19 Apr 2010 06:22:18 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- snes9x.cpp.origSun Apr 18 22:15:16 2010
snes9x.cpp Sun Apr 18 22:16:04 2010
+@@ -1160,7 +1160,7 @@ void S9xLoadConfigFiles(char **argv, int argc){
+ Settings.InterpolatedSound = TRUE;
+ }
+ #ifdef USE_THREADS
+-Settings.ThreadSound=conf.GetBool(Sound::ThreadSound, false);
++Settings.ThreadSound=conf.GetBool(Sound::ThreadSound, true);
+ #endif
+ if(conf.Exists(Sound::AltDecode)){
+ Settings.AltSampleDecode=conf.GetInt(Sound::AltDecode, 1);
Index: patches/patch-soundux_h
===
RCS file: /cvs/ports/emulators/snes9x/patches/patch-soundux_h,v
retrieving revision 1.1
diff -N -u -p patches/patch-soundux_h
--- patches/patch-soundux_h 9 Sep 2007 15:17:06 - 1.1
+++ patches/patch-soundux_h 19 Apr 2010 06:22:18 -
@@ -1,12 +1,23 @@
$OpenBSD: patch-soundux_h,v 1.1 2007/09/09 15:17:06 fgsch Exp $
soundux.h.orig Thu Sep 6 13:10:15 2007
-+++ soundux.h Thu Sep 6 13:10:30 2007
-@@ -220,7 +220,7 @@ typedef struct {
+--- soundux.h.orig Sat Apr 28 17:51:22 2007
soundux.h Thu Jan 14 12:02:20 2010
+@@ -206,6 +206,9 @@ enum
+ #define ENV_MAX 0x7FF
+ #define ENV_SHIFT 4
+
++#ifdef USE_SNDIO
++#include sndio.h
++#endif
+ #ifdef __sgi
+ #include audio.h
+ #endif /* __sgi */
+@@ -220,6 +223,9 @@ typedef struct {
int stereo;
// stereo or mono
bool8 sixteen_bit;// 16bit or
8bit sample
bool8 encoded;// **
port specific
--#ifdef __sun
-+#if defined(__sun) || defined(__OpenBSD__)
++#ifdef USE_SNDIO
++ struct sio_hdl *hdl; // ** port
specific
++#endif
+ #ifdef __sun
int last_eof;
// ** port specific
#endif
- #ifdef __sgi
Index: patches/patch-unix_unix_cpp
===
RCS file: /cvs/ports/emulators/snes9x/patches/patch-unix_unix_cpp,v
retrieving revision 1.1
diff -N -u -p patches/patch-unix_unix_cpp
--- patches/patch-unix_unix_cpp 9 Sep 2007 15:17:06 - 1.1
+++ patches/patch-unix_unix_cpp 19 Apr 2010 06:22:18 -
@@ -1,27 +1,19 @@
Re: mail/courier-imap
On 04/19/10 07:17, Uwe Dippel wrote:
Giovanni Bechisgiovanniat openbsd.org writes:
Thanks for spotting this, attached is a diff for Courier-imap 4.6.0
(which fixes man pages as well) and one for 4.7.0 (I will commit this
update soon).
Cheers
Giovanni
Thanks. But here all files are shown inline, and I can't for my life
make out which is which.
Is there any location from where I could download the file(s),
to simply drop into my stable ports tree of 4.6, and do
some 'make make install'?
Here is the patch for courier-imap-4.6.
Cheers
Giovanni
Index: Makefile
===
RCS file: /cvs/ports/mail/courier-imap/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- Makefile26 Feb 2010 18:55:21 - 1.57
+++ Makefile30 Mar 2010 09:31:33 -
@@ -6,7 +6,7 @@ COMMENT-pop3= pop3 server for maildir f
V= 4.6.0
DISTNAME= courier-imap-${V}
PKGNAME-main= ${DISTNAME}
-FULLPKGNAME-pop3= courier-pop3-${V}p0
+FULLPKGNAME-pop3= courier-pop3-${V}p1
FULLPKGPATH-pop3= mail/courier-imap,-pop3
CATEGORIES=mail
Index: patches/patch-imap_courierpop3d_8_in
===
RCS file: patches/patch-imap_courierpop3d_8_in
diff -N patches/patch-imap_courierpop3d_8_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-imap_courierpop3d_8_in30 Mar 2010 09:31:33 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- imap/courierpop3d.8.in.origFri Jan 8 20:00:30 2010
imap/courierpop3d.8.in Fri Jan 8 20:01:00 2010
+@@ -27,7 +27,6 @@
+ .de SH-xref
+ .ie n \{\
+ .\}
+-.toupper \\$*
+ .el \{\
+ \\$*
+ .\}
+@@ -56,9 +55,6 @@
+ .ft B
+ .ne (2v + 1u)
+ .ie n \{\
+-.\ if n (TTY output), use uppercase
+-.toupper \\$*
+-.\}
+ .el \{\
+ .nr an-break-flag 0
+ .\ if not n (not TTY), use normal case (not uppercase)
Index: patches/patch-imap_imapd_8_in
===
RCS file: patches/patch-imap_imapd_8_in
diff -N patches/patch-imap_imapd_8_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-imap_imapd_8_in 30 Mar 2010 09:31:33 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- imap/imapd.8.in.orig Fri Jan 8 20:00:17 2010
imap/imapd.8.inFri Jan 8 20:00:46 2010
+@@ -27,7 +27,6 @@
+ .de SH-xref
+ .ie n \{\
+ .\}
+-.toupper \\$*
+ .el \{\
+ \\$*
+ .\}
+@@ -56,9 +55,6 @@
+ .ft B
+ .ne (2v + 1u)
+ .ie n \{\
+-.\ if n (TTY output), use uppercase
+-.toupper \\$*
+-.\}
+ .el \{\
+ .nr an-break-flag 0
+ .\ if not n (not TTY), use normal case (not uppercase)
Index: patches/patch-maildir_configure
===
RCS file: patches/patch-maildir_configure
diff -N patches/patch-maildir_configure
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-maildir_configure 30 Mar 2010 09:31:33 -
@@ -0,0 +1,28 @@
+$OpenBSD$
+--- maildir/configure.orig Sun Nov 22 15:45:17 2009
maildir/configure Tue Mar 30 11:23:32 2010
+@@ -18366,7 +18366,6 @@ if test ${ac_cv_lib_fam_FAMOpen+set} = set; then
+ $as_echo_n (cached) 6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS=-lfam $LIBS
+ cat conftest.$ac_ext _ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -18430,7 +18429,7 @@ if test x$ac_cv_lib_fam_FAMOpen = xyes; then
+ LIBFAM=-lfam
+
+ cat confdefs.h _ACEOF
+-#define HAVE_FAM 1
++#define HAVE_FAM 0
+ _ACEOF
+
+
+@@ -18593,7 +18592,6 @@ fi
+
+
+
+-echo $LIBFAM maildir.libdeps
+
+ { $as_echo $as_me:$LINENO: checking for missing gethostname prototype 5
+ $as_echo_n checking for missing gethostname prototype... 6; }
Index: patches/patch-maildir_maildiracl_1_in
===
RCS file: patches/patch-maildir_maildiracl_1_in
diff -N patches/patch-maildir_maildiracl_1_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-maildir_maildiracl_1_in 30 Mar 2010 09:31:33 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- maildir/maildiracl.1.in.orig Fri Jan 8 19:57:10 2010
maildir/maildiracl.1.inFri Jan 8 19:59:39 2010
+@@ -27,7 +27,6 @@
+ .de SH-xref
+ .ie n \{\
+ .\}
+-.toupper \\$*
+ .el \{\
+ \\$*
+ .\}
+@@ -56,9 +55,6 @@
+ .ft B
+ .ne (2v + 1u)
+ .ie n \{\
+-.\ if n (TTY output), use uppercase
+-.toupper \\$*
+-.\}
+ .el \{\
+ .nr an-break-flag 0
+ .\ if not n (not TTY), use normal case (not uppercase)
Index: patches/patch-maildir_maildirmake_1_in
===
RCS file: patches/patch-maildir_maildirmake_1_in
diff -N patches/patch-maildir_maildirmake_1_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-maildir_maildirmake_1_in 30 Mar 2010 09:31:33 -
@@ -0,0 +1,21 @@
+$OpenBSD$
+--- maildir/maildirmake.1.in.orig Fri Jan 8 19:57:25 2010
maildir/maildirmake.1.in Fri Jan 8 19:59:58 2010
+@@ -27,7 +27,6 @@
+ .de
Re: emulators/uae flavors
On Mon, Mar 22, 2010 at 12:43:36AM +, Jacob Meuser wrote:
On Sun, Mar 21, 2010 at 08:29:12PM +, Federico G. Schwindt wrote:
On Sun, Mar 21, 2010 at 10:31:34AM +, Jacob Meuser wrote:
On Fri, Jan 15, 2010 at 03:08:01AM +, Jacob Meuser wrote:
is there any reason to not enable SDL sound always and get rid of the
flavor? reading the commit messages leads me to believe sound doesn't
work in the non-flavored package.
no replies, so I guess there's no reason not to use SDL by default
and disable audio(4)?
if audio works fine with sdl, i don't see any reason not to.
ok?
untested but looks correct. one comment below:
I haven't tested it either, but, why would the SDL flavor exist if it
doesn't work, and why would the commit messages say native audio
doesn't work?
so, has anyone tested this yet?
reading the SDL and audio(4) backends, I'm pretty sure SDL will not
only work on more hardware, but is more correct. the audio(4)
backend doesn't check what format is actually being used, but the
SDL one does (and SDL does conversions, and since SDL already uses
sndio(7), it can support pretty much everything via aucat).
--
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org
Index: Makefile
===
RCS file: /cvs/ports/emulators/uae/Makefile,v
retrieving revision 1.17
diff -N -u -p Makefile
--- Makefile10 Aug 2009 06:31:09 - 1.17
+++ Makefile21 Mar 2010 10:26:26 -
@@ -2,7 +2,7 @@
COMMENT= UAE amiga emulator
DISTNAME= uae-0.8.25
-PKGNAME= ${DISTNAME}p4
+PKGNAME= ${DISTNAME}p5
CATEGORIES=emulators x11
HOMEPAGE= http://uae.coresystems.de/
@@ -22,19 +22,14 @@ WANTLIB=ICE SM X11 Xau Xcursor Xdmcp Xext Xfixes Xi X
MASTER_SITES= ftp://ftp.coresystems.de/pub/uae/sources/develop/
MODULES= devel/gettext
-LIB_DEPENDS+= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
+LIB_DEPENDS+= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2 \
+ SDL::devel/sdl
USE_X11= Yes
CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS+= --enable-dga --enable-vidmode
-
-FLAVORS= sdl
-FLAVOR?=
-
-.if ${FLAVOR:L:Msdl}
-CONFIGURE_ARGS+= --with-sdl-sound
-LIB_DEPENDS+= SDL::devel/sdl
-.endif
+CONFIGURE_ARGS+= --enable-dga --enable-vidmode \
+ --with-sdl-sound
+CONFIGURE_ENV= ac_cv_header_sys_audioio_h=no
NO_REGRESS=Yes
Index: pkg/DESCR
===
RCS file: /cvs/ports/emulators/uae/pkg/DESCR,v
retrieving revision 1.3
diff -N -u -p pkg/DESCR
--- pkg/DESCR 8 Oct 2007 18:49:54 - 1.3
+++ pkg/DESCR 21 Mar 2010 10:26:26 -
@@ -4,7 +4,3 @@ to do this. The hardware of an Amiga is emulated accur
software is tricked into thinking it is running on the real thing, with
your computer's display, keyboard, harddisk and mouse taking the parts of
their emulated counterparts.
-
-Available flavors:
-
- sdl: use SDL for sound and low-level functions
Index: pkg/PLIST
===
RCS file: /cvs/ports/emulators/uae/pkg/PLIST,v
retrieving revision 1.3
diff -N -u -p pkg/PLIST
--- pkg/PLIST 15 Sep 2004 00:42:04 - 1.3
+++ pkg/PLIST 21 Mar 2010 10:26:26 -
@@ -1,6 +1,8 @@
@comment $OpenBSD: PLIST,v 1.3 2004/09/15 00:42:04 espie Exp $
-bin/readdisk
-bin/uae
+...@pkgpath emulators/uae,sdl
+...@pkgpath emulators/uae
+...@bin bin/readdisk
+...@bin bin/uae
share/uae/
share/uae/COMPATIBILITY
share/uae/CREDITS
Re: emulators/uae flavors
On Mon, Apr 19, 2010 at 07:15:19AM +, Jacob Meuser wrote: On Mon, Mar 22, 2010 at 12:43:36AM +, Jacob Meuser wrote: On Sun, Mar 21, 2010 at 08:29:12PM +, Federico G. Schwindt wrote: On Sun, Mar 21, 2010 at 10:31:34AM +, Jacob Meuser wrote: On Fri, Jan 15, 2010 at 03:08:01AM +, Jacob Meuser wrote: is there any reason to not enable SDL sound always and get rid of the flavor? reading the commit messages leads me to believe sound doesn't work in the non-flavored package. no replies, so I guess there's no reason not to use SDL by default and disable audio(4)? if audio works fine with sdl, i don't see any reason not to. ok? untested but looks correct. one comment below: I haven't tested it either, but, why would the SDL flavor exist if it doesn't work, and why would the commit messages say native audio doesn't work? so, has anyone tested this yet? reading the SDL and audio(4) backends, I'm pretty sure SDL will not only work on more hardware, but is more correct. the audio(4) backend doesn't check what format is actually being used, but the SDL one does (and SDL does conversions, and since SDL already uses sndio(7), it can support pretty much everything via aucat). for what its worth i've been working on a port of e-uae for about a year now which uses sdl already plus impliments all the cpu emulation enhancements from winuae. it runs great, nice and fast full speed emulation on my laptop but iirc i had issues getting it to cooperate with the ports system. if interested i'll dig it up, and even since we don't like more than one tool for the job if we had a port for e-uae i don't think there would be a need for vanilla uae anymore as everything i tested (game disk images, workbench various releases, kickstart rom 1/2/3 etc) all work great in e-uae. regards, -ryan
Re: UPDATE: tint2
On Mon, Apr 19, 2010 at 12:45:09AM +0100, Edd Barrett wrote: On Sun, Apr 18, 2010 at 10:19:03AM -0700, Ryan Freeman wrote: the only quirk i noticed (this with xcompmgr running, thinkpad t41p with firegl t2 using radeon driver with dri etc etc) that the tint2 systray draws funny, just a corruption of colours instead of any icon or identifiable object at all. i'll have to check without xcompmgr running in a bit here. otherwise all good! :) Im not really sure about xcompmgr, it bus errors on my sparc64 :\ tested without xcompmgr and it displays the tray just fine, so lets not blame tint2 for something as rather testy as compositing ;) -ryan -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
non-sndio ports
here's an update on what non-sndio using ports are left. this may be missing a few that also have sndio support. currently xmms and jack build audio(4) backends, but they will both be gone soon. if you know of a port that uses audio(4) or ossaudio(3) and isn't listed here, let me know. if you have tested or would like to test any of the patches sent or WIPs let me know too. audio(4) users: portnotes ---+-- audio/audacious-plugins also has sndio backend audio/gqmpegmixer only audio/tracker patches sent to MAINTAINER audio/xmms-fmradio mixer only comms/gmfsk patches sent to ports@ emulators/frodo patches sent to MAINTAINER emulators/fuse patches to use libao sent to ports@ emulators/snes9xpatches sent to ports@ emulators/uae patches to use SDL sent to ports@ emulators/xmame WIP games/crossfire-client patches sent to ports@ (we don't ship the sound files) graphics/xanim lang/squeak net/bluetooth-tools uses O_ASYNC libevent signal handling net/ices2 WIP net/ntp exposes device fd; ulaw only; currently inaccurate wrt latency sysutils/xstatbar mixer only x11/emiclockpatches sent to ports@ x11/kde/multimedia3 mpeglib, not sure if it's actually used or not ossaudio(3) users: portnotes ---+-- audio/ac3decexample player audio/aumix mixer only audio/cmu-sphinx3 audio/cmu-sphinxbase audio/festival/core audio/liba52example player audio/libdcaexample player audio/mixer.app mixer only audio/mppencexample player audio/nosefart audio/shell-fm also builds libao support audio/sidplay audio/tosha audio/waveplay will be removed? audio/wmix mixer audio/wmmixer mixer audio/xmix mixer audio/xmmix mixer comms/gpsk31 comms/tlf devel/jdk/1.5 exposes device filehandle devel/jdk/1.6 patches sent to MAINTAINER editors/emacs21 editors/emacs22 emulators/qemu emulators/wine games/allegro patches sent to ports@ games/quake2also builds SDL support graphics/ffmpeg graphics/flash graphics/fxtv graphics/synaesthesia math/freemat multimedia/avidemux multimedia/gstreamer-0.10/plugins-good mixer? multimedia/libquicktime example player multimedia/recordmydesktop/base sysutils/cdrtools example player: cdda2wav can output to audio device sysutils/conky sysutils/gkrellm/plugins/volume mixer sysutils/tpb x11/kde/multimedia3 mixer only x11/kde4/multimedia x11/kmplayerport marked as BROKEN x11/wxWidgets x11/xawtv example player - basic player to demonstrate/test decoding library mixer only - only uses mixer elements of audio(4) or ossaudio(3) -- jake...@sdf.lonestar.org SDF Public Access UNIX System - http://sdf.lonestar.org
Re: non-sndio ports
On Mon, 19 Apr 2010, Jacob Meuser wrote: ... multimedia/gstreamer-0.10/plugins-good mixer? Yes, oss support is enabled only because we need mixer capability. multimedia/libquicktime example player multimedia/recordmydesktop/base sysutils/cdrtools example player: cdda2wav can output to audio device sysutils/conky sysutils/gkrellm/plugins/volume mixer sysutils/tpb x11/kde/multimedia3 mixer only x11/kde4/multimedia x11/kmplayer port marked as BROKEN x11/wxWidgets x11/xawtv example player - basic player to demonstrate/test decoding library mixer only - only uses mixer elements of audio(4) or ossaudio(3) -- Antoine
Re: UPODATE: x11/openbox
Hello, On Sun, Apr 18, 2010 at 7:15 AM, Benoit Lecocq b...@arcane-labs.net wrote: Following my diff last week, this diff updates openbox to the latest release 3.4.11.1, a bugfix release. This is working in sparc64, but: -SHARED_LIBS += obparser9.1 # .21.6 -SHARED_LIBS += obrender9.1 # .21.6 +SHARED_LIBS += obparser9.1 # .21.7 +SHARED_LIBS += obrender9.1 # .21.7 Upstream bumped a minor version (21.6 - 21.7)? Therefore so should we? -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: UPODATE: x11/openbox
On Mon, 19 Apr 2010, Edd Barrett wrote: Hello, On Sun, Apr 18, 2010 at 7:15 AM, Benoit Lecocq b...@arcane-labs.net wrote: Following my diff last week, this diff updates openbox to the latest release 3.4.11.1, a bugfix release. This is working in sparc64, but: -SHARED_LIBS += obparser9.1 # .21.6 -SHARED_LIBS += obrender9.1 # .21.6 +SHARED_LIBS += obparser9.1 # .21.7 +SHARED_LIBS += obrender9.1 # .21.7 Upstream bumped a minor version (21.6 - 21.7)? Therefore so should we? No. We want to control SHARED_LIBS _because_ we do not want to blindly follow upstream. -- Antoine
Mani Malekmohammadi left a message for you...
Mani Malekmohammadi left a message for you... Its sender and content will be shown only to you and you can delete it at any time. You can instantly reply to it, using the message exchange system. To find out what was written to you, just follow this link: http://eu1.badoo.is/0152223301/in/5ZWTl5vC5rU/?lang_id=3 Some more patiently waiting folks: Amir (Tehran, Iran) Minu (Tehran, Iran) Mahya (Tehran, Iran) http://eu1.badoo.is/0152223301/in/5ZWTl5vC5rU/?lang_id=3 If clicking the links in this message does not work, copy and paste them into the address bar of your browser. This email is a part of delivering a message sent by Mani Malekmohammadi on the system. If you received this email by mistake, please just ignore it. After a short time the message will be removed from the system. Have fun! The Badoo.is Team You have received this email, because a Badoo.is member has left a message for you on Badoo.is. This is a post-only mailing. Replies to this message are not monitored or answered. If you don't want to receive any more messages from Badoo.is, please notify us: http://eu1.badoo.is/impersonation.phtml?lang_id=3mail_code=61email=ports%40openbsd.orgsecret=invite_id=580487user_id=152223301
Re: [new] talloc
On 19/04/2010, at 8:55 PM, Stuart Henderson wrote: On 2010/04/18 19:52, Brad wrote: On Sunday 18 April 2010 18:46:08 Ian McWilliam wrote: On 19/04/2010 6:01 AM, Stuart Henderson wrote: On 2010/04/18 17:48, Sebastian Liem wrote: Landry wrote: On Sun, Apr 18, 2010 at 02:47:42PM +0200, Sebastian Liem wrote: I used MAKE_FLAGS instead of patching the Makefile is that ok? Yes if it works, but you still need SHARED_LIBS in port Makefile so that the shared lib is correctly registered in PLIST and in package db. Done. New version is attached. Stuart wrote: This is going to cause problems with the samba update. Howcome? I didn't see samba installing any shared libs and I could build net/samba without problems. What's the samba update. It's the update to 3.4.x (or 3.5.x) floating around in ports@ ml archive, which should soon replace the outdated version we have in-tree. Ah, I see. Can't samba build depend on talloc and not build it itself? I think considering where libtalloc comes from, it seems to make more sense to have it built by the samba port, possibly placed into a subpackage so something needing talloc can pull in just that package rather than the whole of samba. There are a couple of relatively small things that need doing to get the 3.5.1 port ready (if anyone knows how to get CONFIGURE_STYLE=autoconf working with it, that would be handy..) also Ian has been looking at 3.5.2 and trying to get around more of the all the world's linux problems that keep cropping up. Forget trying to get CONFIGURE_STYLE=autoconf working with the samba port. The samba guys have left out m4 macro files which are referenced by the configure cruft and it'll become patch hell to make it all work. I wish I could work out the voodoo magic involved between samba 3.5.x releases. Ian McWilliam Then get the Makefile fixed upstream so a proper distfile will be rolled with the missing m4 macro files. Upstream's distfile is ok. 3.5.1 or 3.5.2? 3.5.2 starts out with # configuration script generated by Autoconf, you may include it under generated by GNU Autoconf 2.63. Invocation command line was configured by $0, generated by GNU Autoconf 2.63, Running autoconf-2.61 in /usr/ports/pobj/samba-3.5.2/samba-3.5.2/source3 m4: configure.in at line 23: include(pkg.m4): No such file or directory autom4te-2.61: /usr/bin/m4 failed with exit status: 1 and digging further there are other things missing. Looking again at configure.in samba does have specific support for external tdb/talloc so I have reconsidered, I'll try and update tdb and work 3.5.1 and talloc into shape.. Was thinking about doing it that way too. Ian McWilliam
Re: UPODATE: x11/openbox
On 2010/04/19 12:34, Matthieu Herrb wrote: On Mon, Apr 19, 2010 at 12:17:19PM +0200, Antoine Jacoutot wrote: On Mon, 19 Apr 2010, Edd Barrett wrote: Hello, On Sun, Apr 18, 2010 at 7:15 AM, Benoit Lecocq b...@arcane-labs.net wrote: Following my diff last week, this diff updates openbox to the latest release 3.4.11.1, a bugfix release. This is working in sparc64, but: -SHARED_LIBS += obparser9.1 # .21.6 -SHARED_LIBS += obrender9.1 # .21.6 +SHARED_LIBS += obparser9.1 # .21.7 +SHARED_LIBS += obrender9.1 # .21.7 Upstream bumped a minor version (21.6 - 21.7)? Therefore so should we? No. We want to control SHARED_LIBS _because_ we do not want to blindly follow upstream. Well, at least for X libs, I always make sure that the shared lib revision that OpenBSD uses is = to the shared lib version provided by the foreign package. (leading to useless bumps from time to time). Otherwise bad stuff happens when I manually install the foreign package for some kind of testing. This kind of stuff normally should only bother developpers, but it's cheap enough to make sure no one will ever get hurt. For X that makes sense, but for ports development it isn't really useful to test things outside of the ports infrastructure.
Re: UPDATE: VLC 1.0.5
On Mon, Apr 19, 2010 at 03:01:19PM +0200, David Coppa wrote: There's also a commit on upstream git that can solve this issue: http://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=modules/misc/inhibit.c;h=ef76c8b39ed181b3d272d619ef50bee250ffd0cd;hp=5e880bdd9452b87f9b3f3f346822f5fe77f2998d;hb=1074e9dad6b8a645928f9b85c4450af96efea53f;hpb=6385ba4565e2bb4b165adce015a9cd408391ce59 But my poor sparc64 machine is too slow to compile this beast in a reasonable time. So, if someone can try the above patch, I'd be happy. I'll do this! -- Best Regards Edd Barrett http://www.theunixzoo.co.uk
Re: samba 3.51, tdb, talloc
On 2010/04/19 17:12, Stuart Henderson wrote: I've got it working by manually changing the build order but haven't worked out how to fix in the Makefile yet so there will be at least one more round of this diff. hmm...okay, I'm a bit out of my depth of ld(1) knowledge now but sometime after 3.4.6, Samba started using -Wl,--as-needed in LDFLAGS which triggered this problem. Either removing -Wl,--as-needed or including $(TERMLDFLAGS) $(TERMLIBS) before $(LDFLAGS) works around this problem but I don't understand it well enough to know what's correct here...
Re: sndio for emulators/snes9x
On Mon, Apr 19, 2010 at 06:36:45AM +, Jacob Meuser wrote:
I enabled using a separate thread for sounds by default. it's
possible that the audio block size would be large enough that X
events would be blocked for too long and timeout, returning an
error. but having the sound handled in a different thread this
does not happen.
imo, seems to overall work better than when it was using audio(4).
please test.
Instead of this, please try the update to 1.52 below that includes SDL
for audio. Slightly tested with a Super Turrican, Aero Fighters and
Addams Family values.
Thanks.
f.-
Index: Makefile
===
RCS file: /cvs/ports/emulators/snes9x/Makefile,v
retrieving revision 1.10
diff -N -u -p Makefile
--- Makefile10 Aug 2009 06:31:09 - 1.10
+++ Makefile19 Apr 2010 17:15:48 -
@@ -1,48 +1,67 @@
# $OpenBSD: Makefile,v 1.10 2009/08/10 06:31:09 kili Exp $
-COMMENT= emulates the Super Nintendo Entertainment System
+COMMENT = emulates the Super Nintendo Entertainment System
-DISTNAME= snes9x-1.51-src
-PKGNAME= ${DISTNAME:S/-src//}p0
-CATEGORIES=emulators games
+DISTNAME = snes9x-1.52-src
+PKGNAME = ${DISTNAME:S/-src//}
+CATEGORIES = emulators games
-HOMEPAGE= http://www.snes9x.com/
+HOMEPAGE = http://www.snes9x.com/
# non-commercial
-PERMIT_PACKAGE_CDROM= No
-PERMIT_PACKAGE_FTP=Yes
-PERMIT_DISTFILES_CDROM=No
-PERMIT_DISTFILES_FTP= Yes
+PERMIT_PACKAGE_CDROM = No
+PERMIT_PACKAGE_FTP = Yes
+PERMIT_DISTFILES_CDROM = No
+PERMIT_DISTFILES_FTP = Yes
-WANTLIB+= X11 Xext Xxf86dga Xxf86vm c m pthread pthread-stubs stdc++ xcb z
+WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \
+ Xi Xinerama Xrandr Xrender Xv atk-1.0 c cairo expat \
+ fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0 \
+ gobject-2.0 gthread-2.0 m pango-1.0 pangocairo-1.0 \
+ pangoft2-1.0 pixman-1 pthread pthread-stubs stdc++ \
+ xcb xcb-render xcb-render-util z
-MASTER_SITES= http://vincent.grigorieff.free.fr/snes9x/ \
- http://files.ipherswipsite.com/snes9x/
-EXTRACT_SUFX= .tar.bz2
+MASTER_SITES = http://sites.google.com/site/bearoso/snes9x/
+EXTRACT_SUFX = .tar.bz2
-LIB_DEPENDS= png::graphics/png
+BUILD_DEPENDS =::textproc/intltool
+RUN_DEPENDS = :desktop-file-utils-*:devel/desktop-file-utils
+LIB_DEPENDS = glade-2.0::devel/libglade2 \
+ SDL::devel/sdl \
+ png::graphics/png \
+ xml2::textproc/libxml \
+ gtk-x11-2.0,gdk-x11-2.0,gdk_pixbuf-2.0::x11/gtk+2
.if ${MACHINE_ARCH} == i386
-BUILD_DEPENDS= ::devel/nasm
+BUILD_DEPENDS = ::devel/nasm
.endif
-AUTOCONF_VERSION= 2.59
+MODULES = devel/gettext
-USE_X11= Yes
-USE_GMAKE= Yes
-CONFIGURE_STYLE=autoconf no-autoheader
-CONFIGURE_ENV= OPTFLAGS=${CXXFLAGS} -I${LOCALBASE}/include/libpng \
- LIBS=-L${LOCALBASE}/lib
+USE_X11 = Yes
+USE_GMAKE =Yes
-NO_REGRESS=Yes
+CONFIGURE_STYLE = gnu
+CONFIGURE_ARGS = --disable-silent-rules \
+--without-portaudio \
+--without-oss \
+--without-alsa \
+--without-pulseaudio \
+--without-opengl
+CONFIGURE_ENV = CFLAGS=${CFLAGS} -I${LOCALBASE}/include \
+ LIBS=-L${X11BASE}/lib -L${LOCALBASE}/lib
-post-configure:
- @perl -pi -e 's|\b_C\b|__C|g' ${WRKSRC}/cheats.cpp
+NO_REGRESS = Yes
-do-install:
+WRKSRC = ${WRKDIST}/gtk
+
+post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/snes9x
- ${INSTALL_PROGRAM} ${WRKSRC}/snes9x ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${WRKSRC}/unix/docs/*.txt \
- ${PREFIX}/share/doc/snes9x
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/snes9x
+ cd ${WRKDIST}/docs ${INSTALL_DATA} \
+ control-inputs.txt controls.txt snapshots.txt snes9x-license.txt \
+ ${PREFIX}/share/doc/snes9x
+ cd ${WRKDIST}/docs ${INSTALL_DATA} snes9x.conf.default \
+ ${PREFIX}/share/examples/snes9x
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/emulators/snes9x/distinfo,v
retrieving revision 1.4
diff -N -u -p distinfo
--- distinfo9 Sep 2007 15:17:06 - 1.4
+++ distinfo19 Apr 2010 17:15:48 -
@@ -1,5 +1,5 @@
-MD5 (snes9x-1.51-src.tar.bz2) = oQOMx2H0ADGM3O2WCXL4pw==
-RMD160 (snes9x-1.51-src.tar.bz2) = WBNAWwXxgSJGFPlei6PDCfeeGzY=
-SHA1 (snes9x-1.51-src.tar.bz2) = oN4j+zdkY9J/To/H8RQkvTxZhYU=
-SHA256 (snes9x-1.51-src.tar.bz2) = cMj0H8fx4ABgUSfg9CYePrUscgGbPL+byAYbC4zN9oc=
-SIZE (snes9x-1.51-src.tar.bz2) = 1707256
+MD5 (snes9x-1.52-src.tar.bz2) = gTvToPmXMu4COKLIq0F3JQ==
+RMD160 (snes9x-1.52-src.tar.bz2) = 7H+FBY5FcdiaZaidPwni5A2wy8w=
+SHA1 (snes9x-1.52-src.tar.bz2) =
RE : [NEW] rxvt-unicode 9.07 p0
Bump. No-one interested in testing this small, fast, unicode-aware terminal ? I've been using it for more than 5 years on darwin and never found a faster/thinner terminal around. It makes xterm look sluggish. Try a few `time dmesg` to compare... Regards, -- Thomas de Grivel http://b.lowh.net/billitch Le 16 avr. 2010 01:05, Thomas de Grivel billi...@gmail.com a écrit : First port by me, please flame as needed. Worked out of the box but to remove warnings I created pa...
Re: emulators/uae flavors
On Mon, Apr 19, 2010 at 07:15:19AM +, Jacob Meuser wrote: On Mon, Mar 22, 2010 at 12:43:36AM +, Jacob Meuser wrote: On Sun, Mar 21, 2010 at 08:29:12PM +, Federico G. Schwindt wrote: On Sun, Mar 21, 2010 at 10:31:34AM +, Jacob Meuser wrote: On Fri, Jan 15, 2010 at 03:08:01AM +, Jacob Meuser wrote: is there any reason to not enable SDL sound always and get rid of the flavor? reading the commit messages leads me to believe sound doesn't work in the non-flavored package. no replies, so I guess there's no reason not to use SDL by default and disable audio(4)? if audio works fine with sdl, i don't see any reason not to. ok? untested but looks correct. one comment below: I haven't tested it either, but, why would the SDL flavor exist if it doesn't work, and why would the commit messages say native audio doesn't work? so, has anyone tested this yet? reading the SDL and audio(4) backends, I'm pretty sure SDL will not only work on more hardware, but is more correct. the audio(4) backend doesn't check what format is actually being used, but the SDL one does (and SDL does conversions, and since SDL already uses sndio(7), it can support pretty much everything via aucat). In principle it works. I've only tested it using the RSI demo and I've found some crashes but I doubt they're related to your diff. That said, I'd like to test it a bit more. f.-
Re: samba 3.51, tdb, talloc
On 2010/04/20 00:27, Nicholas Marriott wrote:
They got rid of the tdb man pages? :-/
There are manpages for tdbbackup/tdbdump/tdbtool (need xsltproc and an
stylesheet that's retrieved via http) but the library docs definitely
are worse in this release :( all we have is a couple of text files in
docs/. It would make sense to install those though, the diff below
does that.
Not tested but the fdm and tdb bits look fine to me.
Lightly tested here, but most of my mail bypasses fdm.
I didn't realise they still did a separate release of tdb.
Nor did I until today - I've looked for updates before but didn't find
any, googleing didn't help me find this one, I just noticed that a few
OS had a newer version of tdb as a separate library and after seeing
talloc, I thought to try http://tdb.samba.org, and there it was...
Index: Makefile
===
RCS file: /cvs/ports/databases/tdb/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile22 Mar 2010 09:38:36 - 1.3
+++ Makefile20 Apr 2010 00:32:42 -
@@ -2,10 +2,9 @@
COMMENT= trivial database library
-DISTNAME= tdb-1.0.6
-PKGNAME= ${DISTNAME}p1
+DISTNAME= tdb-1.2.1
CATEGORIES=databases
-SHARED_LIBS+= tdb 1.0
+SHARED_LIBS+= tdb 2.0
MAINTAINER=Nicholas Marriott n...@users.sourceforge.net
@@ -15,10 +14,22 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tdb/}
-CONFIGURE_STYLE=autoconf
-CONFIGURE_ARGS=--includedir=${TRUEPREFIX}/include/tdb
-AUTOCONF_VERSION=2.13
+WANTLIB= c
+
+HOMEPAGE= http://tdb.samba.org/
+MASTER_SITES= http://samba.org/ftp/tdb/
+
+CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS= --disable-python
+USE_GMAKE= Yes
USE_LIBTOOL= Yes
+MAKE_FLAGS=TDB_SOLIB=libtdb.so.${LIBtdb_VERSION} \
+ TDB_SONAME=libtdb.so.${LIBtdb_VERSION}
+
+INSTALL_TARGET=installdirs installbin installheaders installlibs
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tdb
+ ${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/tdb/
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/databases/tdb/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo28 Jul 2007 21:37:26 - 1.1.1.1
+++ distinfo20 Apr 2010 00:32:42 -
@@ -1,5 +1,5 @@
-MD5 (tdb-1.0.6.tar.gz) = a2Q/3rSDBAENzV9nXkWLWA==
-RMD160 (tdb-1.0.6.tar.gz) = UWPK8cx2yfOmnoj3Q47NmOxeUs8=
-SHA1 (tdb-1.0.6.tar.gz) = 0YdlIvG4/6jPhEofZgXgwy04eno=
-SHA256 (tdb-1.0.6.tar.gz) = I1vU+CMhZ1d5sO0Jl1PQg1sPPlO8RYRvNy/VE1AlK7I=
-SIZE (tdb-1.0.6.tar.gz) = 139948
+MD5 (tdb-1.2.1.tar.gz) = c+qBKCqC5clZ2cCCry0CFQ==
+RMD160 (tdb-1.2.1.tar.gz) = 8kiCJXu0Yu3BDI7w2jnYLOhHVGw=
+SHA1 (tdb-1.2.1.tar.gz) = mjsrh++3t7FGsRzNfUgCOaGaMNI=
+SHA256 (tdb-1.2.1.tar.gz) = 70I7k0xd3+3ao9OxVnBysNb3JDu65f02OhsJCwVzzfo=
+SIZE (tdb-1.2.1.tar.gz) = 268142
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 28 Jul 2007 21:37:26 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,34 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/07/28 21:37:26 jasper Exp $
Makefile.in.orig Tue Dec 11 04:08:49 2001
-+++ Makefile.inThu Jun 28 12:15:24 2007
-@@ -80,8 +80,8 @@ LDADD = libtdb.la
- @build_tdbtorture_t...@tdbtorture = tdbtorture
- @build_tdbtorture_fa...@tdbtorture =
-
--noinst_PROGRAMS = tdbspeed tdbiterate $(TDBTEST) $(TDBTORTURE)
--bin_PROGRAMS = tdbtool tdbdump
-+noinst_PROGRAMS = tdbtool tdbdump tdbspeed tdbiterate $(TDBTEST) $(TDBTORTURE)
-+bin_PROGRAMS =
-
- lib_LTLIBRARIES = libtdb.la
-
-@@ -115,7 +115,7 @@ LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- libtdb_la_LIBADD =
- libtdb_la_OBJECTS = tdb.lo spinlock.lo
--PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
-+PROGRAMS =
-
- tdbtool_OBJECTS = tdbtool.o
- tdbtool_LDADD = $(LDADD)
-@@ -159,8 +159,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEX
-
- TAR = tar
- GZIP_ENV = --best
--SOURCES = $(libtdb_la_SOURCES) $(tdbtool_SOURCES) $(tdbdump_SOURCES)
$(tdbspeed_SOURCES) $(tdbiterate_SOURCES) $(tdbtest_SOURCES)
$(tdbtorture_SOURCES)
--OBJECTS = $(libtdb_la_OBJECTS) $(tdbtool_OBJECTS) $(tdbdump_OBJECTS)
$(tdbspeed_OBJECTS) $(tdbiterate_OBJECTS) $(tdbtest_OBJECTS)
$(tdbtorture_OBJECTS)
-+SOURCES = $(libtdb_la_SOURCES)
-+OBJECTS = $(libtdb_la_OBJECTS)
-
- all: all-redirect
- .SUFFIXES:
Index: patches/patch-configure_in
===
RCS file: patches/patch-configure_in
diff -N patches/patch-configure_in
--- patches/patch-configure_in 28 Jul 2007 21:37:26 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,33 +0,0 @@
-$OpenBSD: patch-configure_in,v
Re: samba 3.51, tdb, talloc
Hi
On Tue, Apr 20, 2010 at 01:34:37AM +0100, Stuart Henderson wrote:
On 2010/04/20 00:27, Nicholas Marriott wrote:
They got rid of the tdb man pages? :-/
There are manpages for tdbbackup/tdbdump/tdbtool (need xsltproc and an
stylesheet that's retrieved via http) but the library docs definitely
are worse in this release :( all we have is a couple of text files in
docs/. It would make sense to install those though, the diff below
does that.
Yeah. I think tdb is nice but if they weren't going to maintain it
properly I wish they'd never spun it off.
Not tested but the fdm and tdb bits look fine to me.
Lightly tested here, but most of my mail bypasses fdm.
I use a database to discard duplicate mails and it seems fine to me at
least with fdm cache list/fdm cache dump.
I didn't realise they still did a separate release of tdb.
Nor did I until today - I've looked for updates before but didn't find
any, googleing didn't help me find this one, I just noticed that a few
OS had a newer version of tdb as a separate library and after seeing
talloc, I thought to try http://tdb.samba.org, and there it was...
Good of them to link this from the old SF site :-/.
Index: Makefile
===
RCS file: /cvs/ports/databases/tdb/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 22 Mar 2010 09:38:36 - 1.3
+++ Makefile 20 Apr 2010 00:32:42 -
@@ -2,10 +2,9 @@
COMMENT= trivial database library
-DISTNAME=tdb-1.0.6
-PKGNAME= ${DISTNAME}p1
+DISTNAME=tdb-1.2.1
CATEGORIES= databases
-SHARED_LIBS+=tdb 1.0
+SHARED_LIBS+=tdb 2.0
MAINTAINER= Nicholas Marriott n...@users.sourceforge.net
@@ -15,10 +14,22 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP=Yes
-MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=tdb/}
-CONFIGURE_STYLE=autoconf
-CONFIGURE_ARGS= --includedir=${TRUEPREFIX}/include/tdb
-AUTOCONF_VERSION=2.13
+WANTLIB= c
+
+HOMEPAGE=http://tdb.samba.org/
+MASTER_SITES=http://samba.org/ftp/tdb/
+
+CONFIGURE_STYLE=gnu
+CONFIGURE_ARGS= --disable-python
+USE_GMAKE= Yes
USE_LIBTOOL= Yes
+MAKE_FLAGS= TDB_SOLIB=libtdb.so.${LIBtdb_VERSION} \
+ TDB_SONAME=libtdb.so.${LIBtdb_VERSION}
+
+INSTALL_TARGET= installdirs installbin installheaders installlibs
+
+post-install:
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tdb
+ ${INSTALL_DATA} ${WRKSRC}/docs/* ${PREFIX}/share/doc/tdb/
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/databases/tdb/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 28 Jul 2007 21:37:26 - 1.1.1.1
+++ distinfo 20 Apr 2010 00:32:42 -
@@ -1,5 +1,5 @@
-MD5 (tdb-1.0.6.tar.gz) = a2Q/3rSDBAENzV9nXkWLWA==
-RMD160 (tdb-1.0.6.tar.gz) = UWPK8cx2yfOmnoj3Q47NmOxeUs8=
-SHA1 (tdb-1.0.6.tar.gz) = 0YdlIvG4/6jPhEofZgXgwy04eno=
-SHA256 (tdb-1.0.6.tar.gz) = I1vU+CMhZ1d5sO0Jl1PQg1sPPlO8RYRvNy/VE1AlK7I=
-SIZE (tdb-1.0.6.tar.gz) = 139948
+MD5 (tdb-1.2.1.tar.gz) = c+qBKCqC5clZ2cCCry0CFQ==
+RMD160 (tdb-1.2.1.tar.gz) = 8kiCJXu0Yu3BDI7w2jnYLOhHVGw=
+SHA1 (tdb-1.2.1.tar.gz) = mjsrh++3t7FGsRzNfUgCOaGaMNI=
+SHA256 (tdb-1.2.1.tar.gz) = 70I7k0xd3+3ao9OxVnBysNb3JDu65f02OhsJCwVzzfo=
+SIZE (tdb-1.2.1.tar.gz) = 268142
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 28 Jul 2007 21:37:26 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,34 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2007/07/28 21:37:26 jasper Exp $
Makefile.in.orig Tue Dec 11 04:08:49 2001
-+++ Makefile.in Thu Jun 28 12:15:24 2007
-@@ -80,8 +80,8 @@ LDADD = libtdb.la
- @build_tdbtorture_t...@tdbtorture = tdbtorture
- @build_tdbtorture_fa...@tdbtorture =
-
--noinst_PROGRAMS = tdbspeed tdbiterate $(TDBTEST) $(TDBTORTURE)
--bin_PROGRAMS = tdbtool tdbdump
-+noinst_PROGRAMS = tdbtool tdbdump tdbspeed tdbiterate $(TDBTEST)
$(TDBTORTURE)
-+bin_PROGRAMS =
-
- lib_LTLIBRARIES = libtdb.la
-
-@@ -115,7 +115,7 @@ LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
- libtdb_la_LIBADD =
- libtdb_la_OBJECTS = tdb.lo spinlock.lo
--PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
-+PROGRAMS =
-
- tdbtool_OBJECTS = tdbtool.o
- tdbtool_LDADD = $(LDADD)
-@@ -159,8 +159,8 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEX
-
- TAR = tar
- GZIP_ENV = --best
--SOURCES = $(libtdb_la_SOURCES) $(tdbtool_SOURCES) $(tdbdump_SOURCES)
$(tdbspeed_SOURCES) $(tdbiterate_SOURCES) $(tdbtest_SOURCES)
$(tdbtorture_SOURCES)
--OBJECTS = $(libtdb_la_OBJECTS) $(tdbtool_OBJECTS) $(tdbdump_OBJECTS)
$(tdbspeed_OBJECTS) $(tdbiterate_OBJECTS) $(tdbtest_OBJECTS)
[patch] sqlite3 to include man page
Hi,
A (long?) while ago I said, let me play with sqlite3, since it was
introduced into the ports. First thing I noticed was there was no man
page for it. Looking closer it seems there is a man page but it isn't
getting installed. This simple man page was helpful in getting me
started with sqlite3. Not sure if this is on purpose or just an
oversight.
Below patch installs sqlite3.1 man page included in tar-ball.
comments/OK?
--patrick
Index: Makefile
===
RCS file: /cvs/obsd/ports/databases/sqlite3/Makefile,v
retrieving revision 1.49
diff -u -p Makefile
--- Makefile2 Apr 2010 20:07:11 - 1.49
+++ Makefile20 Apr 2010 02:49:04 -
@@ -3,7 +3,7 @@
COMMENT-main= embedded SQL implementation
COMMENT-tcl= TCL bindings for Sqlite3
COMMENT-lemon= LEMON LALR(1) parser generator
-V= 3.6.23
+V= 3.6.23p0
DISTNAME= sqlite-${V}
PKGNAME-main= sqlite3-${V}
PKGNAME-tcl= sqlite3-tcl-${V}
Index: patches/patch-Makefile_in
===
RCS file: /cvs/obsd/ports/databases/sqlite3/patches/patch-Makefile_in,v
retrieving revision 1.15
diff -u -p patches/patch-Makefile_in
--- patches/patch-Makefile_in 2 Apr 2010 20:07:11 - 1.15
+++ patches/patch-Makefile_in 20 Apr 2010 02:49:04 -
@@ -1,7 +1,15 @@
$OpenBSD: patch-Makefile_in,v 1.14 2009/08/03 09:55:47 sthen Exp $
Makefile.in.orig Mon Mar 8 15:08:54 2010
-+++ Makefile.inFri Mar 26 19:44:15 2010
-@@ -176,11 +176,11 @@ OBJS0 = alter.lo analyze.lo attach.lo auth.lo backup.l
+--- Makefile.in.orig Mon Mar 8 07:08:54 2010
Makefile.inMon Apr 19 19:25:55 2010
+@@ -146,6 +146,7 @@ libdir = @libdir@
+ pkgconfigdir = $(libdir)/pkgconfig
+ bindir = @bindir@
+ includedir = @includedir@
++mandir = @mandir@
+ INSTALL = @INSTALL@
+ LIBTOOL = ./libtool
+ ALLOWRELEASE = @ALLOWRELEASE@
+@@ -176,11 +177,11 @@ OBJS0 = alter.lo analyze.lo attach.lo auth.lo backup.l
table.lo tokenize.lo trigger.lo update.lo \
util.lo vacuum.lo \
vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbetrace.lo \
@@ -15,7 +23,7 @@ $OpenBSD: patch-Makefile_in,v 1.14 2009/08/03 09:55:47
# Determine the real value of LIBOBJ based on the 'configure' script
#
-@@ -277,7 +277,8 @@ SRC = \
+@@ -277,7 +278,8 @@ SRC = \
$(TOP)/src/vdbeInt.h \
$(TOP)/src/vtab.c \
$(TOP)/src/walker.c \
@@ -25,7 +33,7 @@ $OpenBSD: patch-Makefile_in,v 1.14 2009/08/03 09:55:47
# Generated source code files
#
-@@ -448,7 +449,7 @@ HDR += \
+@@ -448,7 +450,7 @@ HDR += \
# hidden when the library is built via the amalgamation).
#
TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
@@ -34,7 +42,7 @@ $OpenBSD: patch-Makefile_in,v 1.14 2009/08/03 09:55:47
TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c
$(TESTFIXTURE_SRC$(USE_AMALGAMATION))
-@@ -469,7 +470,7 @@ libsqlite3.la: $(LIBOBJ)
+@@ -469,7 +471,7 @@ libsqlite3.la: $(LIBOBJ)
libtclsqlite3.la: tclsqlite.lo libsqlite3.la
$(LTLINK) -o $@ tclsqlite.lo \
@@ -43,7 +51,7 @@ $OpenBSD: patch-Makefile_in,v 1.14 2009/08/03 09:55:47
-rpath $(TCLLIBDIR) \
-version-info 8:6:8 \
-avoid-version
-@@ -509,6 +510,9 @@ lemon$(BEXE): $(TOP)/tool/lemon.c $(TOP)/src/lempar.c
+@@ -509,6 +511,9 @@ lemon$(BEXE): $(TOP)/tool/lemon.c $(TOP)/src/lempar.c
sqlite3.lo: sqlite3.c
$(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
@@ -53,7 +61,7 @@ $OpenBSD: patch-Makefile_in,v 1.14 2009/08/03 09:55:47
# Rules to build individual files
#
alter.lo: $(TOP)/src/alter.c $(HDR)
-@@ -690,8 +694,9 @@ select.lo: $(TOP)/src/select.c $(HDR)
+@@ -690,8 +695,9 @@ select.lo: $(TOP)/src/select.c $(HDR)
status.lo:$(TOP)/src/status.c $(HDR)
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/status.c
@@ -65,7 +73,16 @@ $OpenBSD: patch-Makefile_in,v 1.14 2009/08/03 09:55:47
table.lo: $(TOP)/src/table.c $(HDR)
$(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/table.c
-@@ -820,6 +825,8 @@ clean:
+@@ -796,6 +802,8 @@ install: sqlite3$(BEXE) lib_install sqlite3.h sqlite3.
+ $(INSTALL) -m 0644 $(TOP)/src/sqlite3ext.h $(DESTDIR)$(includedir)
+ $(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
+ $(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(pkgconfigdir)
++ $(INSTALL) -d $(DESTDIR)$(mandir)/man1
++ $(INSTALL) -m 0644 sqlite3.1 $(DESTDIR)$(mandir)/man1
+
+ pkgIndex.tcl:
+ echo 'package ifneeded sqlite3 $(RELEASE) [list load
$(TCLLIBDIR)/libtclsqlite3.so sqlite3]' $@
+@@ -820,6 +828,8 @@ clean:
distclean:clean
rm -f config.log config.status libtool Makefile sqlite3.pc
Index: pkg/PLIST-main
===
RCS file: /cvs/obsd/ports/databases/sqlite3/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p pkg/PLIST-main
--- pkg/PLIST-main 23 Jul 2008 17:31:18 - 1.3
+++
Re: [patch] sqlite3 to include man page
On Monday 19 April 2010 22:56:34 patrick keshishian wrote:
Hi,
A (long?) while ago I said, let me play with sqlite3, since it was
introduced into the ports. First thing I noticed was there was no man
page for it. Looking closer it seems there is a man page but it isn't
getting installed. This simple man page was helpful in getting me
started with sqlite3. Not sure if this is on purpose or just an
oversight.
Below patch installs sqlite3.1 man page included in tar-ball.
comments/OK?
--patrick
Index: Makefile
===
RCS file: /cvs/obsd/ports/databases/sqlite3/Makefile,v
retrieving revision 1.49
diff -u -p Makefile
--- Makefile 2 Apr 2010 20:07:11 - 1.49
+++ Makefile 20 Apr 2010 02:49:04 -
@@ -3,7 +3,7 @@
COMMENT-main=embedded SQL implementation
COMMENT-tcl= TCL bindings for Sqlite3
COMMENT-lemon= LEMON LALR(1) parser generator
-V= 3.6.23
+V= 3.6.23p0
DISTNAME=sqlite-${V}
PKGNAME-main=sqlite3-${V}
PKGNAME-tcl= sqlite3-tcl-${V}
don't add p0 to V. add it to the end of PKGNAME-main.
The patch you provided to the Makefile really should be
submitted upstream. But for the current port instead
of patching the Makefile within sqlite3 just add this to
the ports post-install target.
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
