CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/08/21 01:30:25 Modified files: print/cups-filters: Makefile distinfo print/cups-filters/pkg: PLIST Log message: Update to cups-filters-1.0.58.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/08/21 01:43:41 Modified files: print/foomatic-db: Makefile distinfo print/foomatic-db/pkg: PLIST Log message: Update to foomatic-db-4.0.20140707.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: dco...@cvs.openbsd.org 2014/08/21 02:02:56 Modified files: sysutils/pciutils: Makefile distinfo sysutils/pciutils/patches: patch-Makefile patch-lib_names-net_c patch-lib_obsd-device_c Log message: Update to pciutils-3.2.1 suggestion and ok jca@ ok matthieu@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: arm...@cvs.openbsd.org 2014/08/21 02:04:16 Modified files: archivers/sltar: Makefile devel/cmocka : Makefile devel/cxxtools : Makefile x11/xglobe : Makefile Log message: Remove tab at end of HOMEPAGE revision bump explained ok sthen
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2014/08/21 02:18:58 Modified files: x11/gtksourceview3: Makefile distinfo x11/gtksourceview3/pkg: PLIST Log message: update to gtksourceview3-3.12.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2014/08/21 02:23:00 Modified files: comms/minicom : Makefile distinfo comms/minicom/patches: patch-man_minicom_1 patch-src_main_c Added files: comms/minicom/patches: patch-src_script_c Log message: update to minicom-2.7
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/08/21 04:38:27 Modified files: security/p11-kit: Makefile distinfo Log message: Update to p11-kit-0.20.4.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2014/08/21 06:27:52 Modified files: x11/gnome/empathy: Makefile distinfo Log message: update to empathy-3.12.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/08/21 06:37:27 Modified files: security/gnutls: Makefile distinfo security/gnutls/pkg: PLIST Added files: security/gnutls/patches: patch-lib_x509_rfc2818_hostname_c Log message: Update to gnutls-3.2.16.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: z...@cvs.openbsd.org2014/08/21 08:41:41 Modified files: devel/intellij : Makefile distinfo devel/intellij/pkg: PLIST Log message: Update IntelliJ IDEA port to 13.1.4b. Set MAINTAINER to face the reality. There are many tweaks pending, to be reviewed and committed separately. Many input from and okay daniel@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2014/08/21 11:07:56 Modified files: x11/xbanish: Makefile distinfo x11/xbanish/pkg: PLIST Log message: update to xbanish-1.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/08/21 13:58:07 Modified files: comms/conserver: Makefile distinfo comms/conserver/pkg: PLIST conserver.rc Log message: fix up some more things to cope with the change to running conserver as a separate uid
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: chr...@cvs.openbsd.org 2014/08/21 14:54:04 Modified files: sysutils/findlib: Makefile sysutils/findlib/pkg: PLIST graphics/ocaml-camlimages: Makefile lang/ocaml : Makefile ocaml.port.mk Added files: lang/ocaml/pkg : DESCR-camlp4 DESCR-graphics DESCR-labltk DESCR-main PFRAG.dynlink-native-graphics PFRAG.dynlink-native-main PFRAG.native-camlp4 PFRAG.native-graphics PFRAG.native-labltk PFRAG.native-main PFRAG.shared-graphics PFRAG.shared-labltk PFRAG.shared-main PLIST-camlp4 PLIST-graphics PLIST-labltk PLIST-main Removed files: lang/ocaml/pkg : DESCR PFRAG.dynlink-native PFRAG.native PFRAG.shared PLIST Log message: Split off camlp4, labltk and graphics from our current OCaml 4.01. This will help when upgrading to upcoming OCaml 4.02, which will miss camlp4 and labltk. For a smooth transision, make all OCaml ports BUILD_DEPEND on camlp4 via MODULES=ocaml. sysutils/findlib is the only port using -labltk. graphics/ocaml-camlimage is the only port using -graphics. ok avsm@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2014/08/21 15:03:10 Modified files: x11/xbanish: Makefile distinfo Log message: oops, update to xbanish-1.3
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/08/21 15:41:57 Modified files: net/bitlbee: Makefile distinfo Removed files: net/bitlbee/patches: patch-configure patch-lib_misc_c patch-otr_c Log message: update to bitlbee 3.2.2, from maintainer Tom Doherty (plus minor wantlib sync)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: kspill...@cvs.openbsd.org 2014/08/21 15:59:55 Modified files: geo/openbsd-developers: Makefile geo/openbsd-developers/files: OpenBSD Log message: Add myself (hello, OpenBSD world!). ok many
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: mill...@cvs.openbsd.org 2014/08/21 16:31:49 Modified files: geo/openbsd-developers: Makefile geo/openbsd-developers/files: OpenBSD Log message: Update my location since I've moved.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/08/21 17:15:57 Modified files: security/openssl: Makefile distinfo security/openssl/pkg: PLIST Log message: security update to OpenSSL 1.0.1i
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2014/08/21 19:51:42 Modified files: games/wtf : Makefile distinfo Log message: Update to 20140820.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2014/08/21 20:03:20 Modified files: x11/sakura : Makefile distinfo Log message: Minor update to 3.1.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gsoa...@cvs.openbsd.org 2014/08/21 20:22:25 Modified files: security/stunnel: Makefile distinfo security/stunnel/patches: patch-tools_stunnel_conf-sample_in Log message: update to 5.03 OK kili@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2014/08/21 20:32:26 Modified files: games/openttd : Makefile distinfo games/openttd/pkg: PLIST Removed files: games/openttd/patches: patch-src_music_extmidi_cpp Log message: Update to openttd-1.4.2. Replace an unnecessary patch with a configure option. (from zhuk@)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2014/08/21 21:15:46 Modified files: graphics/birdfont: Makefile distinfo graphics/birdfont/pkg: PLIST Log message: Update to 0.47
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2014/08/21 22:16:31 Log message: Import etl-0.04.17. ETL is a multi-platform class and template library designed to add new datatypes and functions which combine well with the existing types and functions from the C++ Standard Template Library (STL). ok jca@ Status: Vendor Tag: bentley Release Tags: bentley_20140821 N ports/devel/etl/Makefile N ports/devel/etl/distinfo N ports/devel/etl/pkg/DESCR N ports/devel/etl/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bent...@cvs.openbsd.org 2014/08/21 22:17:10 Modified files: devel : Makefile Log message: +etl
Re: cups-bjnp
On 21 August 2014 05:06, Eric Lalonde e...@lalonde.com wrote: I have a canon mp 620 connected over wireless. Is there value in me testing this case? I have not gone down the cups-on-openbsd route before. I connected my Canon MP620 via a cable to my network, it would be nice if you could try it with wireless and see if it works. Sent from my iPhone On Aug 20, 2014, at 6:31 AM, Julian Andrej j.and...@gmx.de wrote: Hello, i ported the bjnp backend for cups so i can use my Canon MP printer. I've tested it on amd64 and it works flawless for me. I'd appreciate any other testing and maybe quick check of the code changes i made. cups-bjnp.tgz
UPDATE: games/openttd
Hi,
Here is a trivial update to openttd-1.4.2. Tested on amd64.
ok?
Index: Makefile
===
RCS file: /cvs/ports/games/openttd/Makefile,v
retrieving revision 1.36
diff -u -p -u -p -r1.36 Makefile
--- Makefile1 Jul 2014 02:09:27 - 1.36
+++ Makefile20 Aug 2014 15:54:29 -
@@ -2,7 +2,7 @@
COMMENT= open source clone of the game Transport Tycoon Deluxe
-V =1.4.1
+V =1.4.2
DISTNAME = openttd-${V}
EXTRACT_SUFX= -source.tar.gz
GFX_V =0.5.1
Index: distinfo
===
RCS file: /cvs/ports/games/openttd/distinfo,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 distinfo
--- distinfo1 Jul 2014 02:09:27 - 1.20
+++ distinfo20 Aug 2014 15:54:29 -
@@ -1,8 +1,8 @@
SHA256 (openttd/opengfx-0.5.1.zip) =
4bMItrVuLxzj4A/8BT8cre8CZUYfFVN5jsQfO9dL6MY=
SHA256 (openttd/openmsx-0.3.1.zip) =
kuKTronxOtZ59DGF6D+4H7jK1H/mP0rz09n5VRMEYPU=
SHA256 (openttd/opensfx-0.2.3.zip) =
NXR0WsDBOLrlO1aXJZHbjXeK2fr/1R3q43pIpWPnFmI=
-SHA256 (openttd/openttd-1.4.1-source.tar.gz) =
YOx8G2li7qNqhNcOwon7HJAMqNK12kFPczAgTSC5SKw=
+SHA256 (openttd/openttd-1.4.2-source.tar.gz) =
Pc2/bUNou7w8rrHQ8GomIxWA683zrIq8aSO+YEO7XjU=
SIZE (openttd/opengfx-0.5.1.zip) = 3468986
SIZE (openttd/openmsx-0.3.1.zip) = 136981
SIZE (openttd/opensfx-0.2.3.zip) = 11144025
-SIZE (openttd/openttd-1.4.1-source.tar.gz) = 10052089
+SIZE (openttd/openttd-1.4.2-source.tar.gz) = 10066038
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/openttd/pkg/PLIST,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 PLIST
--- pkg/PLIST 10 Apr 2014 06:32:48 - 1.19
+++ pkg/PLIST 20 Aug 2014 15:54:29 -
@@ -182,6 +182,7 @@ share/openttd/media/extra_grf/airports.n
share/openttd/media/extra_grf/airports.png
share/openttd/media/extra_grf/aqueduct.nfo
share/openttd/media/extra_grf/aqueduct.png
+share/openttd/media/extra_grf/assemble_nfo.awk
share/openttd/media/extra_grf/autorail.nfo
share/openttd/media/extra_grf/autorail.png
share/openttd/media/extra_grf/canal_locks.png
Re: UPDATE: MPlayer 20140814
On 14/08/14 4:42 AM, Brad Smith wrote:
Here is an update to a snapshot of MPlayer from 20140814.
OK?
Any MPlayer users?
Index: Makefile
===
RCS file: /home/cvs/ports/x11/mplayer/Makefile,v
retrieving revision 1.239
diff -u -p -u -p -r1.239 Makefile
--- Makefile14 Aug 2014 08:20:27 - 1.239
+++ Makefile14 Aug 2014 08:37:14 -
@@ -7,7 +7,7 @@ ONLY_FOR_ARCHS =${GCC4_ARCHS}
COMMENT = movie player supporting many formats
-V =20140412
+V =20140814
FFMPEG_V =20140810
SUBST_VARS += PREFIX CONFDIR
@@ -15,7 +15,6 @@ SUBST_VARS += PREFIX CONFDIR
# Distfiles must be hand-rolled, see README
N = mplayer
DISTNAME =mplayer-${V}
-REVISION = 1
EXTRACT_SUFX =.tar.xz
CATEGORIES = x11 multimedia
@@ -26,7 +25,7 @@ HOMEPAGE =http://www.mplayerhq.hu/
PERMIT_PACKAGE_CDROM =patents
PERMIT_PACKAGE_FTP = Yes
-WANTLIB = EGL GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
+WANTLIB = GL X11 Xext Xinerama Xss Xv Xxf86dga Xxf86vm ass avcodec \
avformat avutil bluray bz2 c cdda_interface cdda_paranoia \
crypto dv dvdnavmini dvdread enca fontconfig freetype \
fribidi jpeg m mng mp3lame ncurses png postproc pthread \
Index: distinfo
===
RCS file: /home/cvs/ports/x11/mplayer/distinfo,v
retrieving revision 1.40
diff -u -p -u -p -r1.40 distinfo
--- distinfo16 May 2014 01:34:50 - 1.40
+++ distinfo14 Aug 2014 08:31:13 -
@@ -1,2 +1,2 @@
-SHA256 (mplayer-20140412.tar.xz) = 4KUrtyu7WIw+f1Ud14cAR+GaCNpS5FcgKDehHJxHn/c=
-SIZE (mplayer-20140412.tar.xz) = 5262184
+SHA256 (mplayer-20140814.tar.xz) = xzmRZr5NKcAkCTkQ7BPor0QUyBwg+sxnbE7sMgq6V2s=
+SIZE (mplayer-20140814.tar.xz) = 5268128
Index: patches/patch-DOCS_man_en_mplayer_1
===
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-DOCS_man_en_mplayer_1,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 patch-DOCS_man_en_mplayer_1
--- patches/patch-DOCS_man_en_mplayer_1 16 May 2014 01:34:50 - 1.10
+++ patches/patch-DOCS_man_en_mplayer_1 14 Aug 2014 08:32:22 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-DOCS_man_en_mplayer_1,v 1.10 2014/05/16 01:34:50 brad Exp $
DOCS/man/en/mplayer.1.orig Wed Feb 26 23:29:38 2014
-+++ DOCS/man/en/mplayer.1 Wed Feb 26 23:31:29 2014
+--- DOCS/man/en/mplayer.1.orig Thu Aug 14 04:26:57 2014
DOCS/man/en/mplayer.1 Thu Aug 14 04:32:10 2014
@@ -1546,7 +1546,7 @@ May be negative.
.
.TP
@@ -10,7 +10,7 @@ $OpenBSD: patch-DOCS_man_en_mplayer_1,v
.
.TP
.B \-channels number (also see \-af channels)
-@@ -12313,11 +12313,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
+@@ -12315,11 +12315,11 @@ mplayer \-vo zr2 \-vf scale=352:288,zrmjpeg file.avi
.PP
.B Play DTS-CD with passthrough:
.nf
Index: patches/patch-configure
===
RCS file: /home/cvs/ports/x11/mplayer/patches/patch-configure,v
retrieving revision 1.74
diff -u -p -u -p -r1.74 patch-configure
--- patches/patch-configure 16 May 2014 01:34:50 - 1.74
+++ patches/patch-configure 14 Aug 2014 08:32:19 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.74 2014/05/16 01:34:50 brad Exp $
configure.orig Sat Apr 12 17:12:35 2014
-+++ configure Sat Apr 12 17:15:59 2014
-@@ -1505,39 +1505,39 @@ echo configuration: $configuration $TMPLOG
+--- configure.orig Thu Aug 14 04:26:50 2014
configure Thu Aug 14 04:32:10 2014
+@@ -1513,39 +1513,39 @@ echo configuration: $configuration $TMPLOG
echo $TMPLOG
@@ -73,7 +73,7 @@ $OpenBSD: patch-configure,v 1.74 2014/05
list_subparts() {
test ! -e ffmpeg/libav${3} return 1
pattern=s/^[^#]*${1}.*([^ ,]*, *\([^ ,)]*\).*/\1_${2}/p
-@@ -2390,7 +2390,7 @@ case $host_arch in
+@@ -2400,7 +2400,7 @@ case $host_arch in
arch='sparc'
iproc='sparc'
if test $host_arch = sparc64 ; then
@@ -82,7 +82,7 @@ $OpenBSD: patch-configure,v 1.74 2014/05
proc='ultrasparc'
def_fast_64bit='#define HAVE_FAST_64BIT 1'
elif sunos ; then
-@@ -2724,7 +2724,7 @@ cat $TMPC EOF
+@@ -2736,7 +2736,7 @@ cat $TMPC EOF
int ff_extern;
EOF
cc_check -c || die Symbol mangling check failed.
@@ -91,7 +91,7 @@ $OpenBSD: patch-configure,v 1.74 2014/05
extern_prefix=${sym%%ff_extern*}
def_extern_asm=#define EXTERN_ASM $extern_prefix
def_extern_prefix=#define EXTERN_PREFIX \$extern_prefix\
-@@ -2852,7 +2852,7 @@ elif test $relocatable = yes ; then
+@@ -2864,7 +2864,7 @@ elif test $relocatable = yes ; then
fi
echores $relocatable
@@ -100,7 +100,7 @@ $OpenBSD:
Re: wip: mail/opensmtpd-extra
On 08/19/14 19:27, Giovanni Bechis wrote: [...] Otherwise this looks nice. Didn't tried it yet, though. Thanks, port updated. Now I have to understand how to proper setup mysql.conf. a couple of other problems: - when I try to install the -mysql package it deletes the -main package - when I start smtpd and mysql/postgres is not running (and pkg_scripts will run after smtpd), smtpd will exit because it cannot connect to the user database, maybe it will be worth to retry ? Gilles ? Thanks Cheers Giovanni
Re: wip: mail/opensmtpd-extra
2014-08-21 12:27 GMT+04:00 Giovanni Bechis giova...@paclan.it: On 08/19/14 19:27, Giovanni Bechis wrote: [...] Otherwise this looks nice. Didn't tried it yet, though. Thanks, port updated. Now I have to understand how to proper setup mysql.conf. a couple of other problems: - when I try to install the -mysql package it deletes the -main package 1. Run make show=PKGNAMES. 2. Realize that you have OpenSMTPD-NNN-mysql instead of OpenSMTPD-mysql-NNN. 3. Specify PKGNAME-mysql explicitly. 4. Repeat steps (2) and (3) for other subpackages, except -main. For -main, it's usually the PKGNAME-main = $PKGNAME is used. By the way, do you insist on capitalized names and not on opensmtpd-*? - when I start smtpd and mysql/postgres is not running (and pkg_scripts will run after smtpd), smtpd will exit because it cannot connect to the user database, maybe it will be worth to retry ? Gilles ? Yep, opensmtpd shouldn't exit. -- WBR, Vadim Zhukov
Re: Attempt #2 at switching to MariaDB
On 08/19/14 23:15, Brad Smith wrote: Here is a diff to make attempt #2 at switching to MariaDB. what about the upgrade path ? a default install of mysql-server will not upgrade easily (see log file), atm I have 2 options: 1) change the default values of iblog and ibdata file size to match the ones of mysql-5.0.x 2) add an entry in current.html to proceed this way: # mysqladmin flush logs # /etc/rc.d/mysql stop # pkg_add -ui mysql # rm -f /var/mysql/ib_logfile[0-9] uncomment the line innodb_data_file_path = ibdata1:10M:autoextend in /etc/my.cnf # /etc/rc.d/mysqld start I think that 1) should be the way to go, if you changed my.cnf it will not be overwritten and mariadb will not start but you should know how to fix it. Cheers Giovanni 140821 11:14:59 [ERROR] InnoDB: auto-extending data file ./ibdata1 is of a different size 640 pages (rounded down to MB) than specified in the .cnf file: initial 768 pages, max 0 (relevant if non-zero) pages! 140821 11:14:59 [ERROR] InnoDB: Could not open or create the system tablespace. If you tried to add new data files to the system tablespace, and it failed here, you should now edit innodb_data_file_path in my.cnf back to what it was, and remove the new ibdata files InnoDB created in this failed attempt. InnoDB only wrote those files full of zeros, but did not yet use them in any way. But be careful: do not remove old data files which contain your precious data! 140821 11:14:59 [ERROR] Plugin 'InnoDB' init function returned error. 140821 11:14:59 [ERROR] Plugin 'InnoDB' registration as a STORAGE ENGINE failed. 140821 11:14:59 [ERROR] Unknown/unsupported storage engine: InnoDB 140821 11:14:59 [ERROR] Aborting
Re: wip: mail/opensmtpd-extra
On 08/21/14 11:22, Vadim Zhukov wrote: 2014-08-21 12:27 GMT+04:00 Giovanni Bechis giova...@paclan.it: On 08/19/14 19:27, Giovanni Bechis wrote: [...] Otherwise this looks nice. Didn't tried it yet, though. Thanks, port updated. Now I have to understand how to proper setup mysql.conf. a couple of other problems: - when I try to install the -mysql package it deletes the -main package 1. Run make show=PKGNAMES. 2. Realize that you have OpenSMTPD-NNN-mysql instead of OpenSMTPD-mysql-NNN. 3. Specify PKGNAME-mysql explicitly. 4. Repeat steps (2) and (3) for other subpackages, except -main. I failed at step 2 (but portcheck(1) failed here as well). Thanks Cheers Giovanni opensmtpd-extras-20140808.tgz Description: application/compressed-tar
Tweak default PKGNAME and FULLPKGNAME for MULTI_PACKAGES
Here is what I'm thinking of: put SUBPACKAGE name by default right
before version instead of making it FLAVOR-like one. This is the
way it's done more often at least. I.e., in case of PKGNAME=foo-1.0
and MULTI_PACKAGES=-main -bar this will result in the following
packages by default:
${PKGNAME-main} == foo-1.0
${PKGNAME-bar} == foo-bar-1.0
If this way is accepted in general, I'll try to look for the fallout
and provide the full diff, suitable for bulk test. I expect more
- than + lines there. :) So - any opinions?
--
WBR,
Vadim Zhukov
Index: bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1277
diff -u -p -r1.1277 bsd.port.mk
--- bsd.port.mk 11 Aug 2014 11:34:42 - 1.1277
+++ bsd.port.mk 21 Aug 2014 10:00:00 -
@@ -606,11 +606,12 @@ FULLPKGNAME- = ${FULLPKGNAME}
ERRORS += Warning: FULLPKGNAME${_s} defined but no FULLPKGPATH${_s}
. endif
.else
-. if defined(PKGNAME${_s})
-FULLPKGNAME${_s} = ${PKGNAME${_s}}${FLAVOR_EXT}
+. if ${_s} == -main
+ PKGNAME${_s} ?= ${PKGNAME}
. else
-FULLPKGNAME${_s} = ${PKGNAME}${_s}${FLAVOR_EXT}
+ PKGNAME${_s} ?= ${PKGNAME:C/-[0-9]/${_s}/}
. endif
+FULLPKGNAME${_s} = ${PKGNAME${_s}}${FLAVOR_EXT}
.endif
# XXX see comments above for !MULTI_PACKAGES case
.if ${FULLPKGNAME${_s}:M*-[0-9]*-*}
Re: wip: mail/opensmtpd-extra
2014-08-21 13:36 GMT+04:00 Giovanni Bechis giova...@paclan.it: On 08/21/14 11:22, Vadim Zhukov wrote: 2014-08-21 12:27 GMT+04:00 Giovanni Bechis giova...@paclan.it: On 08/19/14 19:27, Giovanni Bechis wrote: [...] Otherwise this looks nice. Didn't tried it yet, though. Thanks, port updated. Now I have to understand how to proper setup mysql.conf. a couple of other problems: - when I try to install the -mysql package it deletes the -main package 1. Run make show=PKGNAMES. 2. Realize that you have OpenSMTPD-NNN-mysql instead of OpenSMTPD-mysql-NNN. 3. Specify PKGNAME-mysql explicitly. 4. Repeat steps (2) and (3) for other subpackages, except -main. I failed at step 2 (but portcheck(1) failed here as well). Because that's not an error. :) We could have a more sane default, though... Just sent a separate mail with proposal to ports@. -- WBR, Vadim Zhukov
Re: UPDATE: games/openttd
2014-08-21 11:44 GMT+04:00 Anthony J. Bentley anth...@cathet.us: Hi, Here is a trivial update to openttd-1.4.2. Tested on amd64. ok? No objections, builds fine here on i386. And given that you're the MAINTAINER... ;) ... did you have a chance to look at the http://marc.info/?l=openbsd-portsm=140638267405791w=2 ? -- WBR, Vadim Zhukov
Re: UPDATE: MPlayer 20140814
On Thu, 21 Aug 2014 03:52:23 -0400, Brad Smith b...@comstyle.com wrote: Any MPlayer users? Compiles and works (for what I use) fine. Fwiw, $ uname -a OpenBSD ardoine.chown.me 5.6 GENERIC.MP#0 amd64 Cheers, -- Vigdis
Re: Tweak default PKGNAME and FULLPKGNAME for MULTI_PACKAGES
On Thu, 21 Aug 2014 14:10:02 +0400 (MSK) Vadim Zhukov
persg...@gmail.com wrote:
Here is what I'm thinking of: put SUBPACKAGE name by default right
before version instead of making it FLAVOR-like one. This is the
way it's done more often at least. I.e., in case of PKGNAME=foo-1.0
and MULTI_PACKAGES=-main -bar this will result in the following
packages by default:
${PKGNAME-main} == foo-1.0
${PKGNAME-bar} == foo-bar-1.0
If this way is accepted in general, I'll try to look for the fallout
and provide the full diff, suitable for bulk test. I expect more
- than + lines there. :) So - any opinions?
I'd strongly prefer the behaviour you are proposing over the current
behaviour - if you can find the name/version split reliably.
Christopher
--
WBR,
Vadim Zhukov
Index: bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1277
diff -u -p -r1.1277 bsd.port.mk
--- bsd.port.mk 11 Aug 2014 11:34:42 - 1.1277
+++ bsd.port.mk 21 Aug 2014 10:00:00 -
@@ -606,11 +606,12 @@ FULLPKGNAME- = ${FULLPKGNAME}
ERRORS += Warning: FULLPKGNAME${_s} defined but no FULLPKGPATH${_s}
. endif
.else
-. if defined(PKGNAME${_s})
-FULLPKGNAME${_s} = ${PKGNAME${_s}}${FLAVOR_EXT}
+. if ${_s} == -main
+ PKGNAME${_s} ?= ${PKGNAME}
. else
-FULLPKGNAME${_s} = ${PKGNAME}${_s}${FLAVOR_EXT}
+ PKGNAME${_s} ?= ${PKGNAME:C/-[0-9]/${_s}/}
. endif
+FULLPKGNAME${_s} = ${PKGNAME${_s}}${FLAVOR_EXT}
.endif
# XXX see comments above for !MULTI_PACKAGES case
.if ${FULLPKGNAME${_s}:M*-[0-9]*-*}
--
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
F190 D013 8F01 AA53 E080 3F3C F17F B0A1 D44E 4FEE
signature.asc
Description: PGP signature
Re: MFC: krfb-4.x CVE-2014-4607
Vadim Zhukov persg...@gmail.com writes: This fixes another security issue in KDE4 for 5.5, as mentioned here: http://www.kde.org/info/security/advisory-20140803-1.txt Basically this updates bundled LZO version in the bundled libvncserver. I'll work on separate libvncserver after unlock; Krfb got removed it's code now anyway. Packaging tested on i386. Okay? As I told zhuk a few days ago, those changes look fine and did build fine too on a 5.5 VM. I think they should go in (together with the kdelibs diff). -- jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: opendnssec and softhsm revisited
On Mon, Jun 02, 2014 at 09:48:41AM +0200, Patrik Lundin wrote: Is no one interested in this? I think it is a nice complement to nsd in base for automated DNSSEC. I have now been updating the ports for both opendnssec and softhsm to the latest versions (opendnssec 1.4.6 and softhsm 1.3.7). While doing this I extended my testing from amd64/sparc64 to i386. Sadly this revealed a segfault in ods-signerd (which was present in 1.4.5 as well). I have posted a detailed report to opendnssec-user which can be read here: http://permalink.gmane.org/gmane.network.dns.opendnssec.user/2735 Regards, Patrik Lundin
Re: UPDATE: games/openttd
Hi Vadim, Vadim Zhukov writes: 2014-08-21 11:44 GMT+04:00 Anthony J. Bentley anth...@cathet.us: Hi, Here is a trivial update to openttd-1.4.2. Tested on amd64. ok? No objections, builds fine here on i386. And given that you're the MAINTAINER... ;) ... did you have a chance to look at the http://marc.info/?l=openbsd-portsm=140638267405791w=2 ? Oh, right! This completely slipped my mind. The first chunk makes sense. I am a little unsure about the readme chunk; would it make more sense in the FAQ since it applies to any program using MIDI? -- Anthony J. Bentley
Re: UPDATE: games/openttd
2014-08-21 18:48 GMT+04:00 Anthony J. Bentley anth...@cathet.us: Hi Vadim, Vadim Zhukov writes: 2014-08-21 11:44 GMT+04:00 Anthony J. Bentley anth...@cathet.us: Hi, Here is a trivial update to openttd-1.4.2. Tested on amd64. ok? No objections, builds fine here on i386. And given that you're the MAINTAINER... ;) ... did you have a chance to look at the http://marc.info/?l=openbsd-portsm=140638267405791w=2 ? Oh, right! This completely slipped my mind. The first chunk makes sense. I am a little unsure about the readme chunk; would it make more sense in the FAQ since it applies to any program using MIDI? Hm-m-m... /etc/rc.d/fluidsynth then? -- WBR, Vadim Zhukov
devel/intellij tweaks
Now that IDEA update is in, here is a separate patch with a couple
of tweaks:
* Fix the stuck editor problem caused by IDEA-79312;
* Hardcode JAVA_HOME for IDEA itself (not for stuff you build);
* Get rid of unnecessary BUILD_DEPENDS line, it's cared already;
* Use a pax -rw instead of two tar calls;
* Allow customization of IDEA configuration using @sample dance;
* Get rid on unneeded our own IDEA startup script and use the
one from upstream;
* Fix corner cases with argument handling (spaces in args etc.)
in the IDEA startup script;
* Add a few additional notes in README.
Works fine here on i386.
--
WBR,
Vadim Zhukov
Index: Makefile
===
RCS file: /cvs/ports/devel/intellij/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile21 Aug 2014 14:41:41 - 1.20
+++ Makefile21 Aug 2014 14:57:36 -
@@ -8,6 +8,7 @@ V= 13.1.4b
DISTNAME= ideaIC-${V}
PKGNAME= intellij-${V}
CATEGORIES=devel
+REVISION= 0
HOMEPAGE= http://www.jetbrains.com/idea/
MAINTAINER=Vadim Zhukov persg...@gmail.com
@@ -20,33 +21,41 @@ MASTER_SITES= http://download.jetbrains
MODULES= java
MODJAVA_VER= 1.7
-BUILD_DEPENDS= ${MODJAVA_RUN_DEPENDS}
-
RUN_DEPENDS= devel/desktop-file-utils
NO_TEST= Yes
-SUBST_VARS+= JAVA_HOME
+SUBST_VARS=JAVA_HOME
WRKDIST= ${WRKDIR}/idea-IC-135.1230
-IJ=${PREFIX}/intellij
+IJ=${TRUEPREFIX}/intellij
+IJINST=${WRKINST}${IJ}
+CONFFILES= idea.properties \
+ idea.vmoptions \
+ idea64.vmoptions
+
+pre-configure:
+ @${SUBST_CMD} ${WRKSRC}/bin/idea.sh
-# If NO_BUILD is set, JAVA_HOME doesn't get defined. So do
-# a no-op for do-build.
+# Note, if NO_BUILD is set, JAVA_HOME doesn't get defined.
do-build:
- @true
+ cd ${WRKDIR} ${JAVA_HOME}/bin/jar xf ${WRKSRC}/lib/icons.jar icon.png
do-install:
- ${INSTALL_DATA_DIR} ${IJ}
- @tar -czf - -C ${WRKDIST} . | tar xzf - -C ${IJ}
- @${SUBST_PROGRAM} ${FILESDIR}/idea ${PREFIX}/bin/idea
- @chmod ${BINMODE} ${PREFIX}/bin/idea
- @ln -s ${TRUEPREFIX}/bin/idea ${PREFIX}/bin/intellij
+ ${INSTALL_DATA_DIR} ${IJINST}
+ cd ${WRKDIST} pax -rw -s '/.*\.beforesubst$$//' \
+ -s '/.*\${PATCHORIG}$$//' * ${IJINST}
+ ln -sf ${IJ}/bin/idea.sh ${PREFIX}/bin/intellij
+ ln -sf ${IJ}/bin/idea.sh ${PREFIX}/bin/idea
${INSTALL_MAN} ${FILESDIR}/idea.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${PREFIX}/share/applications
- cd ${WRKDIST}/lib ${JAVA_HOME}/bin/jar xf icons.jar
- ${INSTALL_DATA} ${WRKDIST}/lib/icon.png ${IJ}/idea.png
+ ${INSTALL_DATA} ${WRKDIR}/icon.png ${IJINST}/idea.png
@${SUBST_DATA} ${FILESDIR}/intellij.desktop \
${PREFIX}/share/applications/intellij.desktop
+ ${INSTALL_DATA_DIR} ${WRKINST}${SYSCONFDIR}/idea
+.for _f in ${CONFFILES}
+ mv ${IJINST}/bin/${_f} ${IJINST}/bin/${_f}.dist
+ ln -sf ${SYSCONFDIR}/idea/${_f} ${IJINST}/bin/${_f}
+.endfor
.include bsd.port.mk
Index: files/idea
===
RCS file: files/idea
diff -N files/idea
--- files/idea 30 Apr 2010 19:02:17 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: idea,v 1.2 2010/04/30 19:02:17 jasper Exp $
-#
-# OpenBSD-specific startup script for IntelliJ IDE
-
-IDEA_HOME=${TRUEPREFIX}/intellij
-
-#-
-# Determine configuration settings
-#-
-
-export IDEA_JDK=${JAVA_HOME}
-
-if [ ! -x ${IDEA_JDK}/bin/java ]; then
- echo Error: JAVA_HOME may not be defined correctly: ${IDEA_JDK}
- echoUnable to find Java binary ${IDEA_JDK}/bin/java
-exit 1
-fi
-
-# Check if 'idea' executable can be found
-if [ ! -x ${IDEA_HOME}/bin/idea.sh ]; then
- echo Error: IDEA_HOME may not be defined correctly: ${IDEA_HOME}
- echoUnable to find launcher binary: ${IDEA_HOME}/bin/idea.sh
- exit 1
-fi
-
-PATH=${IDEA_JDK}/bin:$PATH exec ${IDEA_HOME}/bin/idea.sh $@
Index: files/intellij.desktop
===
RCS file: /cvs/ports/devel/intellij/files/intellij.desktop,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 intellij.desktop
--- files/intellij.desktop 9 Apr 2010 22:23:26 - 1.1.1.1
+++ files/intellij.desktop 21 Aug 2014 14:57:36 -
@@ -2,9 +2,9 @@
Version=1.0
Encoding=UTF-8
Type=Application
-Name=Intellij Idea
-GenericName=Intellij IDE
Re: Attempt #2 at switching to MariaDB
On 08/21/14 11:26, Giovanni Bechis wrote:
On 08/19/14 23:15, Brad Smith wrote:
Here is a diff to make attempt #2 at switching to MariaDB.
what about the upgrade path ?
a default install of mysql-server will not upgrade easily (see log file), atm
I have 2 options:
1) change the default values of iblog and ibdata file size to match the ones
of mysql-5.0.x
2) add an entry in current.html to proceed this way:
# mysqladmin flush logs
# /etc/rc.d/mysql stop
# pkg_add -ui mysql
# rm -f /var/mysql/ib_logfile[0-9]
uncomment the line innodb_data_file_path = ibdata1:10M:autoextend in
/etc/my.cnf
# /etc/rc.d/mysqld start
I think that 1) should be the way to go, if you changed my.cnf it will not be
overwritten and mariadb will not start but you should know how to fix it.
Cheers
Giovanni
Now with patch, anyway we should add an entry in current.html as well.
Cheers
Giovanni
Index: Makefile
===
RCS file: /var/cvs/ports/databases/mariadb/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile 19 Aug 2014 16:42:40 - 1.16
+++ Makefile 21 Aug 2014 13:42:17 -
@@ -7,6 +7,7 @@ COMMENT-server= multithreaded SQL databa
COMMENT-tests= multithreaded SQL database (regression test suite/benchmark)
VERSION= 10.0.13
+REVISION= 0
DISTNAME= mariadb-${VERSION}
PKGNAME-main= mariadb-client-${VERSION}
PKGNAME-server= mariadb-server-${VERSION}
Index: patches/patch-cmake_install_macros_cmake
===
RCS file: /var/cvs/ports/databases/mariadb/patches/patch-cmake_install_macros_cmake,v
retrieving revision 1.6
diff -u -p -r1.6 patch-cmake_install_macros_cmake
--- patches/patch-cmake_install_macros_cmake 19 Aug 2014 16:42:40 - 1.6
+++ patches/patch-cmake_install_macros_cmake 21 Aug 2014 13:41:54 -
@@ -1,7 +1,14 @@
+ patch-cmake_install_macros_cmake
+$OpenBSD: patch-cmake_install_macros_cmake,v 1.5 2014/06/19 23:04:42 brad Exp $
+--- cmake/install_macros.cmake.orig Fri Aug 8 18:13:47 2014
cmake/install_macros.cmake Mon Aug 11 17:35:30 2014
+@@ -198,6 +198,36 @@ IF(UNIX)
+===
$OpenBSD: patch-cmake_install_macros_cmake,v 1.6 2014/08/19 16:42:40 brad Exp $
--- cmake/install_macros.cmake.orig Fri Aug 8 18:13:47 2014
+++ cmake/install_macros.cmake Mon Aug 11 17:35:30 2014
@@ -198,6 +198,36 @@ IF(UNIX)
+ 1.6
ENDIF()
ENDMACRO()
Index: patches/patch-libmysql_CMakeLists_txt
===
RCS file: /var/cvs/ports/databases/mariadb/patches/patch-libmysql_CMakeLists_txt,v
retrieving revision 1.7
diff -u -p -r1.7 patch-libmysql_CMakeLists_txt
--- patches/patch-libmysql_CMakeLists_txt 19 Aug 2014 16:42:40 - 1.7
+++ patches/patch-libmysql_CMakeLists_txt 21 Aug 2014 14:09:32 -
@@ -1,6 +1,12 @@
+ patch-libmysql_CMakeLists_txt
+$OpenBSD: patch-libmysql_CMakeLists_txt,v 1.6 2014/06/19 23:04:42 brad Exp $
+--- libmysql/CMakeLists.txt.orig Fri Aug 8 18:13:37 2014
libmysql/CMakeLists.txt Mon Aug 11 17:35:30 2014
+===
$OpenBSD: patch-libmysql_CMakeLists_txt,v 1.7 2014/08/19 16:42:40 brad Exp $
--- libmysql/CMakeLists.txt.orig Fri Aug 8 18:13:37 2014
+++ libmysql/CMakeLists.txt Mon Aug 11 17:35:30 2014
+ 1.7
@@ -259,6 +259,8 @@ mariadb_dyncol_column_count
mariadb_dyncol_prepare_decimal
)
Index: patches/patch-scripts_mysqld_safe_sh
===
RCS file: /var/cvs/ports/databases/mariadb/patches/patch-scripts_mysqld_safe_sh,v
retrieving revision 1.5
diff -u -p -r1.5 patch-scripts_mysqld_safe_sh
--- patches/patch-scripts_mysqld_safe_sh 19 Aug 2014 16:42:40 - 1.5
+++ patches/patch-scripts_mysqld_safe_sh 21 Aug 2014 13:41:54 -
@@ -1,6 +1,12 @@
+ patch-scripts_mysqld_safe_sh
+$OpenBSD: patch-scripts_mysqld_safe_sh,v 1.4 2014/06/19 23:04:42 brad Exp $
+--- scripts/mysqld_safe.sh.orig Fri Aug 8 18:13:37 2014
scripts/mysqld_safe.sh Mon Aug 11 17:35:30 2014
+===
$OpenBSD: patch-scripts_mysqld_safe_sh,v 1.5 2014/08/19 16:42:40 brad Exp $
--- scripts/mysqld_safe.sh.orig Fri Aug 8 18:13:37 2014
+++ scripts/mysqld_safe.sh Mon Aug 11 17:35:30 2014
+ 1.5
@@ -25,7 +25,8 @@ numa_interleave=0
logging=init
want_syslog=0
Index: patches/patch-sql_CMakeLists_txt
===
RCS file: /var/cvs/ports/databases/mariadb/patches/patch-sql_CMakeLists_txt,v
retrieving revision 1.8
diff -u -p -r1.8 patch-sql_CMakeLists_txt
--- patches/patch-sql_CMakeLists_txt 19 Aug 2014 16:42:40 - 1.8
+++ patches/patch-sql_CMakeLists_txt 21 Aug 2014 13:46:58 -
@@ -1,6 +1,7 @@
-$OpenBSD: patch-sql_CMakeLists_txt,v 1.8 2014/08/19 16:42:40 brad Exp $
sql/CMakeLists.txt.orig Fri Aug 8 18:13:44 2014
-+++ sql/CMakeLists.txt Mon Aug 11 17:35:30 2014
+ patch-sql_CMakeLists_txt
+$OpenBSD: patch-sql_CMakeLists_txt,v 1.7 2014/06/19 23:04:42 brad Exp $
+--- sql/CMakeLists.txt.orig
Re: Attempt #2 at switching to MariaDB
On 2014/08/21 17:06, Giovanni Bechis wrote: On 08/21/14 11:26, Giovanni Bechis wrote: On 08/19/14 23:15, Brad Smith wrote: Here is a diff to make attempt #2 at switching to MariaDB. what about the upgrade path ? a default install of mysql-server will not upgrade easily (see log file), atm I have 2 options: 1) change the default values of iblog and ibdata file size to match the ones of mysql-5.0.x 2) add an entry in current.html to proceed this way: # mysqladmin flush logs # /etc/rc.d/mysql stop # pkg_add -ui mysql # rm -f /var/mysql/ib_logfile[0-9] uncomment the line innodb_data_file_path = ibdata1:10M:autoextend in /etc/my.cnf # /etc/rc.d/mysqld start I think that 1) should be the way to go, if you changed my.cnf it will not be overwritten and mariadb will not start but you should know how to fix it. Cheers Giovanni Now with patch, anyway we should add an entry in current.html as well. This patch adds some cvs conflict markers... in any event, there are a lot of reasons why people might not be using a file based on my-medium.cnf, so an entry in current.html seems more sensible to me. (Also innodb is probably a less-common configuration anyway, isn't it?)
Re: Attempt #2 at switching to MariaDB
On 08/21/14 17:40, Stuart Henderson wrote: On 2014/08/21 17:06, Giovanni Bechis wrote: On 08/21/14 11:26, Giovanni Bechis wrote: On 08/19/14 23:15, Brad Smith wrote: Here is a diff to make attempt #2 at switching to MariaDB. what about the upgrade path ? a default install of mysql-server will not upgrade easily (see log file), atm I have 2 options: 1) change the default values of iblog and ibdata file size to match the ones of mysql-5.0.x 2) add an entry in current.html to proceed this way: # mysqladmin flush logs # /etc/rc.d/mysql stop # pkg_add -ui mysql # rm -f /var/mysql/ib_logfile[0-9] uncomment the line innodb_data_file_path = ibdata1:10M:autoextend in /etc/my.cnf # /etc/rc.d/mysqld start I think that 1) should be the way to go, if you changed my.cnf it will not be overwritten and mariadb will not start but you should know how to fix it. Cheers Giovanni Now with patch, anyway we should add an entry in current.html as well. This patch adds some cvs conflict markers... in any event, there are a lot of reasons why people might not be using a file based on my-medium.cnf, so an entry in current.html seems more sensible to me. if you have changed /etc/my.cnf mariadb upgrade will not overwrite it in any case (Also innodb is probably a less-common configuration anyway, isn't it?) innodb tablespace is created by MySQL 5.0.x even if not used by default for new databases. Cheers Giovanni
Re: Attempt #2 at switching to MariaDB
On 2014/08/21 17:45, Giovanni Bechis wrote: if you have changed /etc/my.cnf mariadb upgrade will not overwrite it in any case Yes exactly - so we still need to tell people what to do. Modifying the default config is pretty common for people using this with chrooted httpd.. It seems better to me if the default config has the new values which upstream have chosen to use, and if people need file compatibility they can follow the upgrade notes, does that make sense to you? (Also innodb is probably a less-common configuration anyway, isn't it?) innodb tablespace is created by MySQL 5.0.x even if not used by default for new databases. Ah, OK then.
Re: Attempt #2 at switching to MariaDB
On 08/21/14 17:53, Stuart Henderson wrote: On 2014/08/21 17:45, Giovanni Bechis wrote: if you have changed /etc/my.cnf mariadb upgrade will not overwrite it in any case Yes exactly - so we still need to tell people what to do. Modifying the default config is pretty common for people using this with chrooted httpd.. It seems better to me if the default config has the new values which upstream have chosen to use, and if people need file compatibility they can follow the upgrade notes, does that make sense to you? that makes sense. Giovanni
Re: Attempt #2 at switching to MariaDB
On 21/08/14 11:40 AM, Stuart Henderson wrote: On 2014/08/21 17:06, Giovanni Bechis wrote: On 08/21/14 11:26, Giovanni Bechis wrote: On 08/19/14 23:15, Brad Smith wrote: Here is a diff to make attempt #2 at switching to MariaDB. what about the upgrade path ? a default install of mysql-server will not upgrade easily (see log file), atm I have 2 options: 1) change the default values of iblog and ibdata file size to match the ones of mysql-5.0.x 2) add an entry in current.html to proceed this way: # mysqladmin flush logs # /etc/rc.d/mysql stop # pkg_add -ui mysql # rm -f /var/mysql/ib_logfile[0-9] uncomment the line innodb_data_file_path = ibdata1:10M:autoextend in /etc/my.cnf # /etc/rc.d/mysqld start I think that 1) should be the way to go, if you changed my.cnf it will not be overwritten and mariadb will not start but you should know how to fix it. Cheers Giovanni Now with patch, anyway we should add an entry in current.html as well. This patch adds some cvs conflict markers... in any event, there are a lot of reasons why people might not be using a file based on my-medium.cnf, so an entry in current.html seems more sensible to me. (Also innodb is probably a less-common configuration anyway, isn't it?) Other than what Giovanni already said regarding this question.. It is also now the default table type used with MySQL 5.5 / MariaDB 5.5. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: Attempt #2 at switching to MariaDB
On 21/08/14 5:26 AM, Giovanni Bechis wrote: On 08/19/14 23:15, Brad Smith wrote: Here is a diff to make attempt #2 at switching to MariaDB. what about the upgrade path ? a default install of mysql-server will not upgrade easily (see log file), atm I have 2 options: 1) change the default values of iblog and ibdata file size to match the ones of mysql-5.0.x 2) add an entry in current.html to proceed this way: # mysqladmin flush logs # /etc/rc.d/mysql stop # pkg_add -ui mysql # rm -f /var/mysql/ib_logfile[0-9] uncomment the line innodb_data_file_path = ibdata1:10M:autoextend in /etc/my.cnf # /etc/rc.d/mysqld start I think that 1) should be the way to go, if you changed my.cnf it will not be overwritten and mariadb will not start but you should know how to fix it. and just to clarify this isn't MariaDB specific. This is due to a change with the default parameters with MySQL 5.6 and which comes in via MariaDB 10.0. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
Re: Attempt #2 at switching to MariaDB
On 21/08/14 11:53 AM, Stuart Henderson wrote: On 2014/08/21 17:45, Giovanni Bechis wrote: if you have changed /etc/my.cnf mariadb upgrade will not overwrite it in any case Yes exactly - so we still need to tell people what to do. Modifying the default config is pretty common for people using this with chrooted httpd.. It seems better to me if the default config has the new values which upstream have chosen to use, and if people need file compatibility they can follow the upgrade notes, does that make sense to you? Looking at this a bit further and trying to figure out what I think the most appropriate upgrade path is I think what you said was what I was thinking is best. A from scratch install should be encouraged to use the new default parameters. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.
[UPDATE] net/pidgin-sipe 1.18.3
Hi Here's an update for pidgin-sipe to 1.18.3. version 1.18.3 Bug Fixes III (2014-08-16) Fixed [#259]: HTML response to EWS autodiscover triggers libxml2 assert (Stefan Becker) Fixed [#258]: VV call gets rejected when IPv6 is enabled (Stefan Becker, Jakub Adam) Fixed [#257]: Windows 7: SIPE crashes after a minute (Stefan Becker) mingw: improve crash information reporting (Stefan Becker) version 1.18.2 Bug Fixes II (2014-06-07) Fixed [#255]: Crash when PersistentChat sends BYE instead of response (Stefan Becker) Fixed [#248]: Remove libpurple SSL configure check (Stefan Becker) Fixed [#245]: Unable to resolve DNS SRV record error when joining conference (Stefan Becker) Fixed [#241]: Adium filters : from sip: (Stefan Becker) Fixed [#210]: Conference call ends with error message (for real this time, Jakub Adam) ews: extract settings also from type EXPR (Stefan Becker) ucs: honor user specified email URL (Stefan Becker) adium: fix compilation on OS X 10.7 (Stefan Becker) updated Transifex URLs (Stefan Becker) updated translations: Hindi (hi), Telugu (te) Cheers Tom Index: Makefile === RCS file: /cvs/ports/net/pidgin-sipe/Makefile,v retrieving revision 1.15 diff -u -p -u -r1.15 Makefile --- Makefile24 Apr 2014 21:37:47 - 1.15 +++ Makefile21 Aug 2014 21:23:34 - @@ -6,7 +6,7 @@ SHARED_ONLY = Yes COMMENT = SIPE plugin for Pidgin -DISTNAME = pidgin-sipe-1.18.1 +DISTNAME = pidgin-sipe-1.18.3 CATEGORIES = net Index: distinfo === RCS file: /cvs/ports/net/pidgin-sipe/distinfo,v retrieving revision 1.7 diff -u -p -u -r1.7 distinfo --- distinfo24 Apr 2014 21:37:47 - 1.7 +++ distinfo21 Aug 2014 21:23:34 - @@ -1,2 +1,2 @@ -SHA256 (pidgin-sipe-1.18.1.tar.gz) = hapG0XXS2dLMB9UpSDBrhkFbbe4IRagu7SfOE688kKE= -SIZE (pidgin-sipe-1.18.1.tar.gz) = 1093875 +SHA256 (pidgin-sipe-1.18.3.tar.gz) = z9xN/BWXxh+NCjzVj82STrTJq4uvdxW3/qAMyZt1E9o= +SIZE (pidgin-sipe-1.18.3.tar.gz) = 1097427 Index: pkg/PLIST === RCS file: /cvs/ports/net/pidgin-sipe/pkg/PLIST,v retrieving revision 1.3 diff -u -p -u -r1.3 PLIST --- pkg/PLIST 9 Mar 2014 21:32:38 - 1.3 +++ pkg/PLIST 21 Aug 2014 21:23:34 - @@ -26,6 +26,7 @@ share/locale/ro/LC_MESSAGES/pidgin-sipe. share/locale/ru/LC_MESSAGES/pidgin-sipe.mo share/locale/sv/LC_MESSAGES/pidgin-sipe.mo share/locale/ta/LC_MESSAGES/pidgin-sipe.mo +share/locale/te/LC_MESSAGES/pidgin-sipe.mo share/locale/tr/LC_MESSAGES/pidgin-sipe.mo share/locale/zh_CN/LC_MESSAGES/pidgin-sipe.mo share/locale/zh_TW/LC_MESSAGES/pidgin-sipe.mo
Re: UPDATE: games/openttd
Vadim Zhukov writes: 2014-08-21 18:48 GMT+04:00 Anthony J. Bentley anth...@cathet.us: Hi Vadim, Vadim Zhukov writes: 2014-08-21 11:44 GMT+04:00 Anthony J. Bentley anth...@cathet.us: Hi, Here is a trivial update to openttd-1.4.2. Tested on amd64. ok? No objections, builds fine here on i386. And given that you're the MAINTAINER... ;) ... did you have a chance to look at the http://marc.info/?l=openbsd-portsm=140638267405791w=2 ? Oh, right! This completely slipped my mind. The first chunk makes sense. I am a little unsure about the readme chunk; would it make more sense in the FAQ since it applies to any program using MIDI? Hm-m-m... /etc/rc.d/fluidsynth then? I like that idea. Is the fact that it doesn't come with a soundfont by default a problem? -- Anthony J. Bentley
NEW: games/quadrupleback
Hi, Quadrupleback is a video game where intruders must be circled. It is a clone of the 1982 Doubleback game by Dale Lear for the Tandy Color Computer. Works fine on i386/amd64. ok? -- Anthony J. Bentley quadrupleback.tar.gz Description: quadrupleback.tar.gz
Re: NEW: games/quadrupleback
Hi, Anthony J. Bentley writes: Quadrupleback is a video game where intruders must be circled. It is a clone of the 1982 Doubleback game by Dale Lear for the Tandy Color Computer. Works fine on i386/amd64. ok? Updated tarball with some tweaks from bcallah@: simplify CONFIGURE_ENV and don't install files to a directory containing a version number. -- Anthony J. Bentley quadrupleback.tar.gz Description: quadrupleback.tar.gz
NEW: editors/le
Hello, le is a text editor inspired by Norton Commander. It works fine on i386 ok? Regards Rambius -- Tangra Mega Rock: http://www.radiotangra.com le.tar.gz Description: GNU Zip compressed data
Re: UPDATE: games/openttd
2014-08-22 6:19 GMT+04:00 Anthony J. Bentley anth...@cathet.us: Vadim Zhukov writes: 2014-08-21 18:48 GMT+04:00 Anthony J. Bentley anth...@cathet.us: Hi Vadim, Vadim Zhukov writes: 2014-08-21 11:44 GMT+04:00 Anthony J. Bentley anth...@cathet.us: Hi, Here is a trivial update to openttd-1.4.2. Tested on amd64. ok? No objections, builds fine here on i386. And given that you're the MAINTAINER... ;) ... did you have a chance to look at the http://marc.info/?l=openbsd-portsm=140638267405791w=2 ? Oh, right! This completely slipped my mind. The first chunk makes sense. I am a little unsure about the readme chunk; would it make more sense in the FAQ since it applies to any program using MIDI? Hm-m-m... /etc/rc.d/fluidsynth then? I like that idea. Is the fact that it doesn't come with a soundfont by default a problem? I don't think so. You won't enable every service blindly, do you? And the note about SoundFont bank required is in fluidsynth/pkg/DESCR already. The only problem is to actually make it act like a daemon - IIRC, fluidsynth tends to exit if no stdin is available... I'll take a look what could be done there. So, what about putting a note into openttd's README for now? I'll remove it once fluidsynth situation is resolved. -- WBR, Vadim Zhukov
