PHP rename comments
Hello ports@,
Here's the diff that changes php5 to php in the module comments.
I left out the modules that moved to 5.6/Makefile, to make it a
little more clear that these modules aren't available for 7.x.
OK?
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.98
diff -u -p -r1.98 Makefile.inc
--- Makefile.inc16 Nov 2017 07:05:06 - 1.98
+++ Makefile.inc16 Nov 2017 07:24:29 -
@@ -115,28 +115,28 @@ MULTI_PACKAGES+= -main -fastcgi
# bz2
MULTI_PACKAGES+= -bz2
-COMMENT-bz2= bzip2 compression extensions for php5
+COMMENT-bz2= bzip2 compression extensions for php
CONFIGURE_ARGS+= --with-bz2=shared,${LOCALBASE}
LIB_DEPENDS-bz2= archivers/bzip2
WANTLIB-bz2= bz2>=10 pthread
# curl
MULTI_PACKAGES+= -curl
-COMMENT-curl= curl URL library extensions for php5
+COMMENT-curl= curl URL library extensions for php
CONFIGURE_ARGS+= --with-curl=shared,${LOCALBASE}
LIB_DEPENDS-curl= net/curl
WANTLIB-curl= pthread crypto nghttp2 ssl z curl>=2
# dba
MULTI_PACKAGES+= -dba
-COMMENT-dba= dba GDBM access extensions for php5
+COMMENT-dba= dba GDBM access extensions for php
CONFIGURE_ARGS+= --enable-dba=shared --with-gdbm=${LOCALBASE}
LIB_DEPENDS-dba= databases/gdbm
WANTLIB-dba= gdbm>=2 pthread
# gd
MULTI_PACKAGES+= -gd
-COMMENT-gd=image manipulation extensions for php5
+COMMENT-gd=image manipulation extensions for php
LIB_DEPENDS-gd=graphics/jpeg \
graphics/png
.if ${PV} == "5.6"
@@ -154,14 +154,14 @@ CONFIGURE_ARGS+= --with-gd=shared \
# gmp
MULTI_PACKAGES+= -gmp
-COMMENT-gmp= gmp math library support for php5
+COMMENT-gmp= gmp math library support for php
CONFIGURE_ARGS+= --with-gmp=shared,${LOCALBASE}
LIB_DEPENDS-gmp= devel/gmp
WANTLIB-gmp= gmp>=4 pthread
# intl
MULTI_PACKAGES+= -intl
-COMMENT-intl= intl library support for php5
+COMMENT-intl= intl library support for php
CONFIGURE_ARGS+= --enable-intl=shared \
--with-icu-dir=${LOCALBASE}
LIB_DEPENDS-intl= textproc/icu4c
@@ -170,7 +170,7 @@ WANTLIB-intl= ${COMPILER_LIBCXX} icudat
# imap
MULTI_PACKAGES+= -imap
-COMMENT-imap= imap, pop3 and nntp extensions for php5
+COMMENT-imap= imap, pop3 and nntp extensions for php
CONFIGURE_ARGS+= --with-imap=shared,${LOCALBASE} \
--with-imap-ssl
LIB_DEPENDS-imap= mail/alpine,-c-client
@@ -178,91 +178,91 @@ WANTLIB-imap= pthread crypto ssl c-clie
# ldap
MULTI_PACKAGES+= -ldap
-COMMENT-ldap= ldap protocol extensions for php5
+COMMENT-ldap= ldap protocol extensions for php
CONFIGURE_ARGS+= --with-ldap=shared,${LOCALBASE}
LIB_DEPENDS-ldap= databases/openldap
WANTLIB-ldap= pthread ldap>=2 lber
# mcrypt
MULTI_PACKAGES+= -mcrypt
-COMMENT-mcrypt=mcrypt encryption/decryption extensions for php5
+COMMENT-mcrypt=mcrypt encryption/decryption extensions for php
CONFIGURE_ARGS+= --with-mcrypt=shared,${LOCALBASE}
LIB_DEPENDS-mcrypt=security/libmcrypt devel/libtool,-ltdl
WANTLIB-mcrypt=mcrypt ltdl>=1 pthread
# mysqli
MULTI_PACKAGES+= -mysqli
-COMMENT-mysqli=mysql database access extensions for php5
+COMMENT-mysqli=mysql database access extensions for php
CONFIGURE_ARGS+= --with-mysqli=shared,${LOCALBASE}/bin/mysql_config
LIB_DEPENDS-mysqli=databases/mariadb
WANTLIB-mysqli=crypto m pthread ssl z lib/mysql/mysqlclient
# odbc
MULTI_PACKAGES+= -odbc
-COMMENT-odbc= odbc database access extensions for php5
+COMMENT-odbc= odbc database access extensions for php
CONFIGURE_ARGS+=--with-iodbc=shared,${LOCALBASE}
LIB_DEPENDS-odbc= databases/iodbc
WANTLIB-odbc= iodbc>=2 pthread iodbcinst
# pcntl
MULTI_PACKAGES+= -pcntl
-COMMENT-pcntl= PCNTL extensions for php5
+COMMENT-pcntl= PCNTL extensions for php
CONFIGURE_ARGS+= --enable-pcntl=shared
LIB_DEPENDS-pcntl=
WANTLIB-pcntl= pthread
# pdo-mysql
MULTI_PACKAGES+= -pdo_mysql
-COMMENT-pdo_mysql= PDO mysql database access extensions for php5
+COMMENT-pdo_mysql= PDO mysql database access extensions for php
CONFIGURE_ARGS+= --with-pdo-mysql=shared,${LOCALBASE}
LIB_DEPENDS-pdo_mysql= databases/mariadb
WANTLIB-pdo_mysql= crypto m pthread ssl z lib/mysql/mysqlclient
# pdo-pgsql
MULTI_PACKAGES+= -pdo_pgsql
-COMMENT-pdo_pgsql= PDO database access extensions for php5
+COMMENT-pdo_pgsql= PDO database access extensions for php
CONFIGU
Re: font/ru-ptsans license
16 нояб. 2017 г. 6:48 пользователь "Anthony J. Bentley" написал: > > Hi, > > The license marker in ru-ptsans says OFL, but I can't find any mention > of OFL either on the website or in the distfile. The "ParaType Free > Font Licensing Agreement" seems free enough though. > > We could probably swing PERMIT_PACKAGE_CDROM given the commercial > bundling allowance but might as well avoid any risk. The story with OFL is somewhat complex. Originally those fonts were published under "ParaType Free Font Licensing Agreement", and both https://www.paratype.ru/public/ and https://www.paratype.com/public/ mention it. But then it was mentioned that OFL fonts would be available: https://paratype.livejournal.com/10009.html#cutid5 (sorry, Russian only), and then ParaType started publishing versions with OFL separately, e.g.: https://paratype.livejournal.com/21560.html (see the link at the end of posting). So, yes, those fonts have either ParaType own license, or OFL, but not both. Obviously, I've choosed OFL. :) http://www.fontstock.com/public/PTSansOFL.zip > While here, switch homepage/master_sites to https. Yep. I've switched this server to https a week or two ago, and you already found it. :)
font/ru-ptsans license
Hi, The license marker in ru-ptsans says OFL, but I can't find any mention of OFL either on the website or in the distfile. The "ParaType Free Font Licensing Agreement" seems free enough though. We could probably swing PERMIT_PACKAGE_CDROM given the commercial bundling allowance but might as well avoid any risk. While here, switch homepage/master_sites to https. ok? Index: Makefile === RCS file: /cvs/ports/fonts/ru-ptsans/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile13 Aug 2015 20:02:43 - 1.7 +++ Makefile16 Nov 2017 03:39:50 - @@ -4,19 +4,19 @@ COMMENT = free Cyrillic fonts PKG_ARCH = * DISTNAME = ru-ptsans-3.0 CATEGORIES = fonts x11 +REVISION = 0 MAINTAINER = Vadim Zhukov # Original distfile taken from http://www.fontstock.com/public/ -MASTER_SITES = http://ohvost.ru/distfiles/ -HOMEPAGE = http://paratype.com/public/ +MASTER_SITES = https://ohvost.ru/distfiles/ +HOMEPAGE = https://www.paratype.com/public/ -# OFL, http://scripts.sil.org/OFL (CC-like) -# permits: -# Distribution, Reproduction, Embedding, DerivativeWorks -# requires -# Attribution, Notice, ShareAlike, DerivativeRenaming, -# BundlingWhenSelling -PERMIT_PACKAGE_CDROM = Yes +# ParaType Free Font Licensing Agreement 1.2 / 1.3 +# "ParaType Ltd grants you the right to use, copy, modify, and +# distribute modified and unmodified copies" ... +# "but you may not sell the fonts by themselves." +PERMIT_PACKAGE_CDROM = Non-commercial +PERMIT_PACKAGE_FTP = Yes NO_BUILD = Yes NO_TEST = Yes
devel/codeblocks: runtime SIGSEGV fault
Hi I try to start codeblocks and it aborts core on amd64 with today's install and a current from couple of days, here's the backtrace. Can somebody please give me a cluestick where to look? Thanks OpenBSD 6.2-current (GENERIC.MP) #206: Mon Nov 13 15:11:18 MST 2017 dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP (codeblocks:31686): Gtk-WARNING **: Unable to locate theme engine in module_path: "murrine", (codeblocks:31686): Gtk-WARNING **: Unable to locate theme engine in module_path: "murrine", Starting Code::Blocks Release 16.01 rev 10692 Nov 15 2017, 01:01:03 - wx2.8.12 (OpenBSD, unicode) - 64 bit [New process 31686] Initialize EditColourSet . Initialize EditColourSet: done. Program received signal SIGSEGV, Segmentation fault. 0x1a7d36216a61 in wxStringBase::operator= () from /usr/local/lib/libwx_base.so.3.0 Current language: auto; currently minimal (gdb) bt #0 0x1a7d36216a61 in wxStringBase::operator= () from /usr/local/lib/libwx_base.so.3.0 #1 0x1a7d215bb570 in wxPGProperty::wxPGProperty () from /usr/local/lib/libcodeblocks.so.0.1 #2 0x1a7d215e0412 in wxStringProperty::wxStringProperty () from /usr/local/lib/libcodeblocks.so.0.1 #3 0x1a7a954abf8e in WatchesProperty::wxCreateObject () from /usr/local/bin/codeblocks #4 0x1a7a9541752f in DebugInterfaceFactory::OnEditorDeactivate () from /usr/local/bin/codeblocks #5 0x1a7d213337a3 in DebuggerManager::CreateWindows () from /usr/local/lib/libcodeblocks.so.0.1 #6 0x1a7d21334673 in DebuggerManager::SetInterfaceFactory () from /usr/local/lib/libcodeblocks.so.0.1 #7 0x1a7a9545d1c8 in MainFrame::OnUnlockLogManager () from /usr/local/bin/codeblocks #8 0x1a7a95456873 in MainFrame::OnMouseRightUp () from /usr/local/bin/codeblocks #9 0x1a7a9545518d in MainFrame::OnMouseRightUp () from /usr/local/bin/codeblocks #10 0x1a7a95406e9f in CodeBlocksApp::OnTBIconLeftDown () from /usr/local/bin/codeblocks #11 0x1a7d361ede90 in wxEntry () from /usr/local/lib/libwx_base.so.3.0 #12 0x1a7a95404f9f in wxCreateApp () from /usr/local/bin/codeblocks #13 0x1a7a95404e04 in ?? () from /usr/local/bin/codeblocks #14 0x in ?? () (gdb)
drop audio/oggtag
On Nov 15 18:11:48, jul...@vgai.de wrote:
> Looks fine to me, too.
> I wouldn't mind being replaced as maintainer,
> since I didn't use this program for a while.
On Nov 15 20:45:01, s...@spacehopper.org wrote:
> thanks, committed.
Now that audio/oggtag is at its latest,
do we want to drop it altogether? Yeah.
Sorry for wasting everyone's time on the update,
but while rewriting the manpage and preparing the update,
I became convinced there's no point in having it:
vorbiscomment(1) of vorbis-tools does everything that oggtag(1) does
(and you do have vorbis-tools installed if you want to handle ogg files)
and most importantly, oggtag is the opposite of least surprise:
$ oggtag file.ogg
What does that do? It removes all the ogg tags. That's right:
BUGS
oggtag deletes all tags that are not specified.
The default is not to list the present tags (as for e.g vorbiscomment),
but to rewrite the present tags with the given set (possibly empty);
it has no mode for listing or editing or appending, it only rewrites.
So now I don't know who recorded 01.sgt-pepper.ogg on which album.
Is there anyone using audio/oggtag?
What other alternatives are there
taht people use beside vorbis-tools?
The maintainer just stepped down,
but what do you think, Julian?
Jan
Index: Makefile
===
RCS file: /cvs/ports/audio/Makefile,v
retrieving revision 1.390
diff -u -p -u -p -r1.390 Makefile
--- Makefile27 Aug 2017 16:09:21 - 1.390
+++ Makefile15 Nov 2017 22:31:24 -
@@ -141,7 +141,6 @@
SUBDIR += nosefart
SUBDIR += nspmod
SUBDIR += ocp
- SUBDIR += oggtag
SUBDIR += openal
SUBDIR += opencore-amr
SUBDIR += opennap
Index: oggtag/Makefile
===
RCS file: oggtag/Makefile
diff -N oggtag/Makefile
--- oggtag/Makefile 22 Jan 2015 21:17:46 - 1.12
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,39 +0,0 @@
-# $OpenBSD: Makefile,v 1.12 2015/01/22 21:17:46 naddy Exp $
-COMMENT= command-line editor for tags in Ogg Vorbis files
-
-DISTNAME= oggtag_1.0
-PKGNAME= ${DISTNAME:S/_/-/}
-REVISION= 0
-CATEGORIES=audio
-
-HOMEPAGE= http://oggtag.sourceforge.net/
-
-MAINTAINER=Julian Leyh
-
-# GPLv2
-PERMIT_PACKAGE_CDROM= Yes
-
-WANTLIB= c m ogg>=5 vorbis>=3
-
-MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=oggtag/}
-EXTRACT_SUFX= .tgz
-
-LIB_DEPENDS= audio/libogg \
- audio/libvorbis
-
-WRKDIST= ${WRKDIR}
-
-NO_TEST= Yes
-
-LIBS= -lvorbis -logg -lm
-
-do-build:
- cd ${WRKSRC} && \
- ${CC} ${CFLAGS} -o oggtag oggtag.c vcedit.c \
- -I${LOCALBASE}/include -L${LOCALBASE}/lib ${LIBS}
-
-do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/oggtag ${PREFIX}/bin
- ${INSTALL_MAN} ${WRKSRC}/oggtag.1 ${PREFIX}/man/man1
-
-.include
Index: oggtag/distinfo
===
RCS file: oggtag/distinfo
diff -N oggtag/distinfo
--- oggtag/distinfo 18 Jan 2015 03:12:46 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,2 +0,0 @@
-SHA256 (oggtag_1.0.tgz) = AZdZgRWUQl4DPfXtv6ygWZXsn66epQbTPWOtDaFQBzQ=
-SIZE (oggtag_1.0.tgz) = 14463
Index: oggtag/patches/patch-oggtag_c
===
RCS file: oggtag/patches/patch-oggtag_c
diff -N oggtag/patches/patch-oggtag_c
--- oggtag/patches/patch-oggtag_c 10 Jun 2004 20:37:44 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-oggtag_c,v 1.1.1.1 2004/06/10 20:37:44 xsa Exp $
oggtag.c.orig 2002-12-02 10:03:27.0 +0100
-+++ oggtag.c 2004-06-10 16:51:58.0 +0200
-@@ -4,6 +4,8 @@
- */
-
- #include
-+#include
-+#include
- #include
- #include "vcedit.h"
-
Index: oggtag/pkg/DESCR
===
RCS file: oggtag/pkg/DESCR
diff -N oggtag/pkg/DESCR
--- oggtag/pkg/DESCR10 Jun 2004 20:37:44 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,5 +0,0 @@
-oggtag is a tiny command-line editor for description tags in Ogg Vorbis
-files. It can set all the tags suggested by the Ogg Vorbis specification[1]
-on one or several files at a time.
-
-[1] http://www.xiph.org/ogg/vorbis/doc/v-comment.html
Index: oggtag/pkg/PLIST
===
RCS file: oggtag/pkg/PLIST
diff -N oggtag/pkg/PLIST
--- oggtag/pkg/PLIST10 Mar 2009 10:36:47 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.3 2009/03/10 10:36:47 sthen Exp $
-@bin bin/oggtag
-@man man/man1/oggtag.1
Re: [UPDATE] audio/ncmpc 0.28 -> 0.29
On Wed, Nov 15, 2017 at 11:27:35PM +0100, Klemens Nanni wrote: > Both 0.28 and 0.29 don't actually run tests, do we want to set NO_TEST? > > $ make -s test > ===> Regression tests for ncmpc-0.29v0 > ninja: Entering directory `/usr/obj/ports/ncmpc-0.29/build-amd64' > [0/1] Running all tests. > No tests defined. Rephrasing since NO_TEST=Yes is not an option: There are test targets defined in build.ninja but it doesn't seem to run the actual test. I'm no ninja/meson expert so how should we handle this? `make test' yielding no tests and returning zero seems broken to me.
[UPDATE] audio/ncmpc 0.28 -> 0.29
Here's a simple update to the bug fix release:
* fix crash after losing MPD connection
* fix crash after DNS lookup error
While here, switch sites to HTTPS and shorten shell parameter expansion
a bit.
Both 0.28 and 0.29 don't actually run tests, do we want to set NO_TEST?
$ make -s test
===> Regression tests for ncmpc-0.29v0
ninja: Entering directory `/usr/obj/ports/ncmpc-0.29/build-amd64'
[0/1] Running all tests.
No tests defined.
Feedback? Any takers?
diff --git a/audio/ncmpc/Makefile b/audio/ncmpc/Makefile
index 3c7296f6a35..0a9ff2799af 100644
--- a/audio/ncmpc/Makefile
+++ b/audio/ncmpc/Makefile
@@ -2,13 +2,12 @@
COMMENT= curses based frontend for mpd
-VER= 0.28
+VER= 0.29
DISTNAME= ncmpc-${VER}
EPOCH= 0
CATEGORIES=audio
-REVISION= 0
-HOMEPAGE= http://www.musicpd.org/clients/ncmpc/
+HOMEPAGE= https://www.musicpd.org/clients/ncmpc/
MAINTAINER=David Coppa
@@ -17,7 +16,7 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c glib-2.0 intl mpdclient>=1 ncursesw
-MASTER_SITES= http://www.musicpd.org/download/ncmpc/${VER:R}/
+MASTER_SITES= https://www.musicpd.org/download/ncmpc/${VER:R}/
EXTRACT_SUFX= .tar.xz
@@ -42,7 +41,7 @@ CONFIGURE_ENV=CPP=${CPP} \
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ncmpc
- mv ${PREFIX}/share/doc/ncmpc/{config.sample,keys.sample,ncmpc.lirc} \
+ mv ${PREFIX}/share/doc/ncmpc/{{config,keys}.sample,ncmpc.lirc} \
${PREFIX}/share/examples/ncmpc/
.include
diff --git a/audio/ncmpc/distinfo b/audio/ncmpc/distinfo
index b503f98aac7..d44cc8162fb 100644
--- a/audio/ncmpc/distinfo
+++ b/audio/ncmpc/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ncmpc-0.28.tar.xz) = 9m5bb++Dvf2js++vP7rWpNjEe7GztoEL7UTT41sAeAQ=
-SIZE (ncmpc-0.28.tar.xz) = 233724
+SHA256 (ncmpc-0.29.tar.xz) = 72iptnFyOD6oDuRleQFRCUM/oFhyiBLSsOvt5mDYXxI=
+SIZE (ncmpc-0.29.tar.xz) = 233876
diff --git a/audio/ncmpc/patches/patch-meson_build
b/audio/ncmpc/patches/patch-meson_build
index 9c5bf14598f..6807cf7c69a 100644
--- a/audio/ncmpc/patches/patch-meson_build
+++ b/audio/ncmpc/patches/patch-meson_build
@@ -3,7 +3,7 @@ $OpenBSD: patch-meson_build,v 1.1 2017/09/26 09:55:07 dcoppa
Exp $
Index: meson.build
--- meson.build.orig
+++ meson.build
-@@ -55,73 +55,11 @@ conf.set('ENABLE_ASYNC_CONNECT', async_connect)
+@@ -55,78 +55,11 @@ conf.set('ENABLE_ASYNC_CONNECT', async_connect)
conf.set('ENABLE_MULTIBYTE', get_option('multibyte'))
@@ -26,6 +26,11 @@ Index: meson.build
-if curses_dep.found()
- curses = 'ncurses'
-else
+- curses_dep = cc.find_library('ncursesw', required: false)
+- if not curses_dep.found()
+-curses_dep = cc.find_library('ncurses')
+- endif
+-
- # TODO: find other curses implementation (pdcurses?)
-endif
- endif
@@ -81,7 +86,7 @@ Index: meson.build
enable_lirc = get_option('lirc')
if enable_lirc == 'false'
enable_lirc = false
-@@ -142,7 +80,7 @@ else
+@@ -147,7 +80,7 @@ else
endif
conf.set('ENABLE_LIRC', enable_lirc)
@@ -90,7 +95,7 @@ Index: meson.build
common_cflags = [
# for getaddrinfo() and sigaction() with glibc
-@@ -350,7 +288,6 @@ ncmpc = executable('ncmpc',
+@@ -359,7 +292,6 @@ ncmpc = executable('ncmpc',
include_directories: inc,
dependencies: [
glib_dep,
Re: drop gettext from ports/audio
On Wed, November 15, 2017 23:42, Stuart Henderson wrote:
> On 2017/11/15 23:10, Kirill Bychkov wrote:
>> Hi guys!
>> The diff below drops gettext from MODULES for some simple cases in audio
>> category. Trying to ride a bump in some ports to regen PLISTS and switch
>> HOMEPAGEs to https. Also moves/adds RCS tags to make portcheck happy.
>> OKs? Comments?
>
> OK.
>
> It would have been easier to review if the different types
> of diff were separated (i.e. not trying to ride bumps).
Hi Stuart,
I'll take it into account for the next portion of patches.
>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/audio/aqualung/Makefile,v
>> retrieving revision 1.46
>> diff -u -p -r1.46 Makefile
>> --- Makefile 26 Jul 2017 22:45:14 - 1.46
>> +++ Makefile 14 Nov 2017 14:29:14 -
>> @@ -4,7 +4,7 @@ COMMENT= advanced music player
>>
>> VERSION=1.0
>> DISTNAME= aqualung-${VERSION}
>> -REVISION= 2
>> +REVISION= 3
>> EPOCH= 0
>> CATEGORIES= audio
>>
>> @@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM= Yes
>> WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
>> WANTLIB += Xrandr Xrender atk-1.0 bz2 c cairo fontconfig
>> WANTLIB += freetype gio-2.0 glib-2.0 gobject-2.0
>> -WANTLIB += gthread-2.0 m mp3lame ogg pango-1.0 pangocairo-1.0
>> +WANTLIB += gthread-2.0 iconv intl m mp3lame ogg pango-1.0 pangocairo-1.0
>> WANTLIB += pangoft2-1.0 pthread samplerate sndfile sndio ${COMPILER_LIBCXX}
>> WANTLIB += vorbis vorbisenc vorbisfile z gtk-x11-2.0 gdk-x11-2.0
>> WANTLIB += gdk_pixbuf-2.0 xml2 mac mad mpcdec FLAC avcodec
>> @@ -27,8 +27,7 @@ WANTLIB += cdio_cdda cdio_paranoia modpl
>>
>> MASTER_SITES=
>> https://github.com/jeremyevans/aqualung/releases/download/${VERSION}/
>>
>> -MODULES=devel/gettext \
>> -lang/lua
>> +MODULES=lang/lua
>>
>> MODLUA_SA= Yes
>>
>> Index: Makefile
>> ===
>> RCS file: /cvs/ports/audio/ario/Makefile,v
>> retrieving revision 1.18
>> diff -u -p -r1.18 Makefile
>> --- Makefile 23 Oct 2017 17:10:37 - 1.18
>> +++ Makefile 15 Nov 2017 20:00:01 -
>> @@ -3,7 +3,7 @@
>> COMMENT = GTK2-based MPD client inspired by Rhythmbox
>> DISTNAME = ario-1.5.1
>> CATEGORIES =audio x11
>> -REVISION = 14
>> +REVISION = 15
>>
>> SHARED_LIBS += audioscrobbler 0.0 # 0.0
>> SHARED_LIBS += filesystem 0.0 # 0.0
>> @@ -23,17 +23,17 @@ WANTLIB += Xrender atk-1.0 avahi-client
>> WANTLIB += crypto curl dbus-1 dbus-glib-1 expat ffi fontconfig freetype
>> WANTLIB += gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
>> WANTLIB += gmodule-2.0 gmp gnutls gobject-2.0 gpg-error graphite2
>> -WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz hogweed idn2 lzma m
>> -WANTLIB += mpdclient nettle nghttp2 notify p11-kit pango-1.0
>> +WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz hogweed iconv idn2 intl lzma
>> +WANTLIB += m mpdclient nettle nghttp2 notify p11-kit pango-1.0
>> WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
>> WANTLIB += soup-2.4 sqlite3 ssl tag tag_c tasn1 unique-1.0
>> WANTLIB += unistring xcb xcb-render xcb-shm xml2 z
>>
>> MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ario-player/}
>>
>> -MODULES = devel/gettext \
>> -textproc/intltool
>> +MODULES = textproc/intltool
>>
>> +BUILD_DEPENDS = devel/gettext-tools
>> LIB_DEPENDS = audio/libmpdclient \
>> audio/taglib \
>> devel/libnotify \
>> Index: patches/patch-src_ario-util_h
>> ===
>> RCS file: /cvs/ports/audio/ario/patches/patch-src_ario-util_h,v
>> retrieving revision 1.1.1.1
>> diff -u -p -r1.1.1.1 patch-src_ario-util_h
>> --- patches/patch-src_ario-util_h9 May 2013 14:24:55 - 1.1.1.1
>> +++ patches/patch-src_ario-util_h15 Nov 2017 20:00:01 -
>> @@ -1,6 +1,7 @@
>> +$OpenBSD: patch-src_ario-util_h,v 1.1.1.1 2013/05/09 14:24:55 bcallah Exp $
>> +
>> XXX: Only needed on powerpc, seems not to affect amd64 or loongson.
>>
>> -$OpenBSD: patch-src_ario-util_h,v 1.1.1.1 2013/05/09 14:24:55 bcallah Exp $
>> --- src/ario-util.h.origFri May 3 22:23:22 2013
>> +++ src/ario-util.h Fri May 3 22:23:52 2013
>> @@ -18,7 +18,7 @@
>> Index: patches/patch-src_plugins_ario-plugin-info_c
>> ===
>> RCS file:
>> /cvs/ports/audio/ario/patches/patch-src_plugins_ario-plugin-info_c,v
>> retrieving revision 1.1.1.1
>> diff -u -p -r1.1.1.1 patch-src_plugins_ario-plugin-info_c
>> --- patches/patch-src_plugins_ario-plugin-info_c 9 May 2013 14:24:55
>> -1.1.1.1
>> +++ patches/patch-src_plugins_ario-plugin-info_c 15 Nov 2017 20:00:01
>> -
>> @@ -1,6 +1,7 @@
>> +$OpenBSD: patch-src_plugins_ario-plugin-info_c,v 1.1.1.1 2013/05/09
>> 14:24:55
>> bcallah Exp $
>> +
>> XXX: Only needed o
Re: drop gettext from ports/audio
On 2017/11/15 23:10, Kirill Bychkov wrote:
> Hi guys!
> The diff below drops gettext from MODULES for some simple cases in audio
> category. Trying to ride a bump in some ports to regen PLISTS and switch
> HOMEPAGEs to https. Also moves/adds RCS tags to make portcheck happy.
> OKs? Comments?
OK.
It would have been easier to review if the different types
of diff were separated (i.e. not trying to ride bumps).
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/aqualung/Makefile,v
> retrieving revision 1.46
> diff -u -p -r1.46 Makefile
> --- Makefile 26 Jul 2017 22:45:14 - 1.46
> +++ Makefile 14 Nov 2017 14:29:14 -
> @@ -4,7 +4,7 @@ COMMENT= advanced music player
>
> VERSION= 1.0
> DISTNAME=aqualung-${VERSION}
> -REVISION=2
> +REVISION=3
> EPOCH= 0
> CATEGORIES= audio
>
> @@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM= Yes
> WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
> WANTLIB += Xrandr Xrender atk-1.0 bz2 c cairo fontconfig
> WANTLIB += freetype gio-2.0 glib-2.0 gobject-2.0
> -WANTLIB += gthread-2.0 m mp3lame ogg pango-1.0 pangocairo-1.0
> +WANTLIB += gthread-2.0 iconv intl m mp3lame ogg pango-1.0 pangocairo-1.0
> WANTLIB += pangoft2-1.0 pthread samplerate sndfile sndio ${COMPILER_LIBCXX}
> WANTLIB += vorbis vorbisenc vorbisfile z gtk-x11-2.0 gdk-x11-2.0
> WANTLIB += gdk_pixbuf-2.0 xml2 mac mad mpcdec FLAC avcodec
> @@ -27,8 +27,7 @@ WANTLIB += cdio_cdda cdio_paranoia modpl
>
> MASTER_SITES=
> https://github.com/jeremyevans/aqualung/releases/download/${VERSION}/
>
> -MODULES= devel/gettext \
> - lang/lua
> +MODULES= lang/lua
>
> MODLUA_SA= Yes
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/ario/Makefile,v
> retrieving revision 1.18
> diff -u -p -r1.18 Makefile
> --- Makefile 23 Oct 2017 17:10:37 - 1.18
> +++ Makefile 15 Nov 2017 20:00:01 -
> @@ -3,7 +3,7 @@
> COMMENT =GTK2-based MPD client inspired by Rhythmbox
> DISTNAME = ario-1.5.1
> CATEGORIES = audio x11
> -REVISION = 14
> +REVISION = 15
>
> SHARED_LIBS += audioscrobbler 0.0 # 0.0
> SHARED_LIBS += filesystem 0.0 # 0.0
> @@ -23,17 +23,17 @@ WANTLIB += Xrender atk-1.0 avahi-client
> WANTLIB += crypto curl dbus-1 dbus-glib-1 expat ffi fontconfig freetype
> WANTLIB += gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
> WANTLIB += gmodule-2.0 gmp gnutls gobject-2.0 gpg-error graphite2
> -WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz hogweed idn2 lzma m
> -WANTLIB += mpdclient nettle nghttp2 notify p11-kit pango-1.0
> +WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz hogweed iconv idn2 intl lzma
> +WANTLIB += m mpdclient nettle nghttp2 notify p11-kit pango-1.0
> WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
> WANTLIB += soup-2.4 sqlite3 ssl tag tag_c tasn1 unique-1.0
> WANTLIB += unistring xcb xcb-render xcb-shm xml2 z
>
> MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ario-player/}
>
> -MODULES =devel/gettext \
> - textproc/intltool
> +MODULES =textproc/intltool
>
> +BUILD_DEPENDS = devel/gettext-tools
> LIB_DEPENDS =audio/libmpdclient \
> audio/taglib \
> devel/libnotify \
> Index: patches/patch-src_ario-util_h
> ===
> RCS file: /cvs/ports/audio/ario/patches/patch-src_ario-util_h,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-src_ario-util_h
> --- patches/patch-src_ario-util_h 9 May 2013 14:24:55 - 1.1.1.1
> +++ patches/patch-src_ario-util_h 15 Nov 2017 20:00:01 -
> @@ -1,6 +1,7 @@
> +$OpenBSD: patch-src_ario-util_h,v 1.1.1.1 2013/05/09 14:24:55 bcallah Exp $
> +
> XXX: Only needed on powerpc, seems not to affect amd64 or loongson.
>
> -$OpenBSD: patch-src_ario-util_h,v 1.1.1.1 2013/05/09 14:24:55 bcallah Exp $
> --- src/ario-util.h.orig Fri May 3 22:23:22 2013
> +++ src/ario-util.h Fri May 3 22:23:52 2013
> @@ -18,7 +18,7 @@
> Index: patches/patch-src_plugins_ario-plugin-info_c
> ===
> RCS file: /cvs/ports/audio/ario/patches/patch-src_plugins_ario-plugin-info_c,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-src_plugins_ario-plugin-info_c
> --- patches/patch-src_plugins_ario-plugin-info_c 9 May 2013 14:24:55
> - 1.1.1.1
> +++ patches/patch-src_plugins_ario-plugin-info_c 15 Nov 2017 20:00:01
> -
> @@ -1,6 +1,7 @@
> +$OpenBSD: patch-src_plugins_ario-plugin-info_c,v 1.1.1.1 2013/05/09 14:24:55
> bcallah Exp $
> +
> XXX: Only needed on powerpc, seems not to affect amd64 or loongson.
>
> -$OpenBSD: patch-src_plugins_ario-plugin-info_c,v 1.1.1.1 2013/05/09 14:24:55
> bcallah Exp $
> --- src/plugins/ario-plugin-info.c.orig Fri May 3 22:28:48 2013
drop gettext from ports/audio
Hi guys!
The diff below drops gettext from MODULES for some simple cases in audio
category. Trying to ride a bump in some ports to regen PLISTS and switch
HOMEPAGEs to https. Also moves/adds RCS tags to make portcheck happy.
OKs? Comments?
Index: Makefile
===
RCS file: /cvs/ports/audio/aqualung/Makefile,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile
--- Makefile26 Jul 2017 22:45:14 - 1.46
+++ Makefile14 Nov 2017 14:29:14 -
@@ -4,7 +4,7 @@ COMMENT=advanced music player
VERSION= 1.0
DISTNAME= aqualung-${VERSION}
-REVISION= 2
+REVISION= 3
EPOCH= 0
CATEGORIES=audio
@@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM= Yes
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender atk-1.0 bz2 c cairo fontconfig
WANTLIB += freetype gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += gthread-2.0 m mp3lame ogg pango-1.0 pangocairo-1.0
+WANTLIB += gthread-2.0 iconv intl m mp3lame ogg pango-1.0 pangocairo-1.0
WANTLIB += pangoft2-1.0 pthread samplerate sndfile sndio ${COMPILER_LIBCXX}
WANTLIB += vorbis vorbisenc vorbisfile z gtk-x11-2.0 gdk-x11-2.0
WANTLIB += gdk_pixbuf-2.0 xml2 mac mad mpcdec FLAC avcodec
@@ -27,8 +27,7 @@ WANTLIB += cdio_cdda cdio_paranoia modpl
MASTER_SITES=
https://github.com/jeremyevans/aqualung/releases/download/${VERSION}/
-MODULES= devel/gettext \
- lang/lua
+MODULES= lang/lua
MODLUA_SA= Yes
Index: Makefile
===
RCS file: /cvs/ports/audio/ario/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile23 Oct 2017 17:10:37 - 1.18
+++ Makefile15 Nov 2017 20:00:01 -
@@ -3,7 +3,7 @@
COMMENT = GTK2-based MPD client inspired by Rhythmbox
DISTNAME = ario-1.5.1
CATEGORIES = audio x11
-REVISION = 14
+REVISION = 15
SHARED_LIBS += audioscrobbler 0.0 # 0.0
SHARED_LIBS += filesystem 0.0 # 0.0
@@ -23,17 +23,17 @@ WANTLIB += Xrender atk-1.0 avahi-client
WANTLIB += crypto curl dbus-1 dbus-glib-1 expat ffi fontconfig freetype
WANTLIB += gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
WANTLIB += gmodule-2.0 gmp gnutls gobject-2.0 gpg-error graphite2
-WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz hogweed idn2 lzma m
-WANTLIB += mpdclient nettle nghttp2 notify p11-kit pango-1.0
+WANTLIB += gthread-2.0 gtk-x11-2.0 harfbuzz hogweed iconv idn2 intl lzma
+WANTLIB += m mpdclient nettle nghttp2 notify p11-kit pango-1.0
WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
WANTLIB += soup-2.4 sqlite3 ssl tag tag_c tasn1 unique-1.0
WANTLIB += unistring xcb xcb-render xcb-shm xml2 z
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ario-player/}
-MODULES = devel/gettext \
- textproc/intltool
+MODULES = textproc/intltool
+BUILD_DEPENDS =devel/gettext-tools
LIB_DEPENDS = audio/libmpdclient \
audio/taglib \
devel/libnotify \
Index: patches/patch-src_ario-util_h
===
RCS file: /cvs/ports/audio/ario/patches/patch-src_ario-util_h,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_ario-util_h
--- patches/patch-src_ario-util_h 9 May 2013 14:24:55 - 1.1.1.1
+++ patches/patch-src_ario-util_h 15 Nov 2017 20:00:01 -
@@ -1,6 +1,7 @@
+$OpenBSD: patch-src_ario-util_h,v 1.1.1.1 2013/05/09 14:24:55 bcallah Exp $
+
XXX: Only needed on powerpc, seems not to affect amd64 or loongson.
-$OpenBSD: patch-src_ario-util_h,v 1.1.1.1 2013/05/09 14:24:55 bcallah Exp $
--- src/ario-util.h.orig Fri May 3 22:23:22 2013
+++ src/ario-util.hFri May 3 22:23:52 2013
@@ -18,7 +18,7 @@
Index: patches/patch-src_plugins_ario-plugin-info_c
===
RCS file: /cvs/ports/audio/ario/patches/patch-src_plugins_ario-plugin-info_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-src_plugins_ario-plugin-info_c
--- patches/patch-src_plugins_ario-plugin-info_c9 May 2013 14:24:55
- 1.1.1.1
+++ patches/patch-src_plugins_ario-plugin-info_c15 Nov 2017 20:00:01
-
@@ -1,6 +1,7 @@
+$OpenBSD: patch-src_plugins_ario-plugin-info_c,v 1.1.1.1 2013/05/09 14:24:55
bcallah Exp $
+
XXX: Only needed on powerpc, seems not to affect amd64 or loongson.
-$OpenBSD: patch-src_plugins_ario-plugin-info_c,v 1.1.1.1 2013/05/09 14:24:55
bcallah Exp $
--- src/plugins/ario-plugin-info.c.origFri May 3 22:28:48 2013
+++ src/plugins/ario-plugin-info.c Fri May 3 22:29:10 2013
@@ -27,7 +27,7 @@
Index: pkg/PLIST
===
RCS file: /cvs/ports/audio/ario/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 9 May 2013 14:46:59 - 1.2
+++ pkg/PLIST 15 Nov 2017 20:00:01 -
@@ -85,21
Re: update audio/oggtag
Looks fine to me, too.
I wouldn't mind being replaced as maintainer, since I didn't use this program
for a while.
Feel free to commit.
Julian
-Ursprüngliche Nachricht-
Von: Jan Stary [mailto:h...@stare.cz]
Gesendet: Mittwoch, 15. November 2017 19:06
An: ports@openbsd.org; Julian Leyh
Betreff: Re: update audio/oggtag
Ah, right; thanks.
Does anyone want to commit this version tweaked by Anthony and Stu?
Jan
On Nov 15 12:52:42, s...@spacehopper.org wrote:
> On 2017/11/15 13:34, Jan Stary wrote:
> > On Nov 14 19:39:59, anth...@anjbe.name wrote:
> > > Stuart Henderson writes:
> > > > > do-build:
> > > > > - cd ${WRKSRC} && \
> > > > > + cd ${WRKSRC}/oggtag && \
> > > > > ${CC} ${CFLAGS} -o oggtag oggtag.c vcedit.c \
> > > > > -I${LOCALBASE}/include -L${LOCALBASE}/lib ${LIBS}
> > > > >
> > > > > do-install:
> > > > > - ${INSTALL_PROGRAM} ${WRKSRC}/oggtag ${PREFIX}/bin
> > > > > - ${INSTALL_MAN} ${WRKSRC}/oggtag.1 ${PREFIX}/man/man1
> > > > > + ${INSTALL_PROGRAM} ${WRKSRC}/oggtag/oggtag ${PREFIX}/bin
> > > > > + ${INSTALL_MAN} ${WRKSRC}/oggtag/oggtag.1 ${PREFIX}/man/man1
> > >
> > > You should remove the WRKDIST=${WRKDIR} line instead.
> >
> > That fails for me. Did I missunderstand?
> >
> > Jan
> >
> >
> > $ make
> > ===> Building for oggtag-1.0.2
> > cd /usr/ports/pobj/oggtag-1.0.2/oggtag_1.0.2 && cc -O2 -pipe -o
> > oggtag oggtag.c vcedit.c -I/usr/local/include -L/usr/local/lib -lvorbis
> > -logg -lm
> > cc: error: no such file or directory: 'oggtag.c'
> > cc: error: no such file or directory: 'vcedit.c'
> > *** Error 1 in . (Makefile:30 'do-build')
> > *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2724
> > '/usr/ports/pobj/oggtag-1.0.2/.build_done')
> > *** Error 1 in /usr/ports/audio/oggtag
> > (/usr/ports/infrastructure/mk/bsd.port.mk:2425 'all')
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/oggtag/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile 22 Jan 2015 21:17:46 - 1.12
> +++ Makefile 15 Nov 2017 12:52:18 -
> @@ -1,9 +1,8 @@
> # $OpenBSD: Makefile,v 1.12 2015/01/22 21:17:46 naddy Exp $
> COMMENT= command-line editor for tags in Ogg Vorbis files
>
> -DISTNAME=oggtag_1.0
> +DISTNAME=oggtag_1.0.2
> PKGNAME= ${DISTNAME:S/_/-/}
> -REVISION=0
> CATEGORIES= audio
>
> HOMEPAGE=http://oggtag.sourceforge.net/
> @@ -21,7 +20,7 @@ EXTRACT_SUFX= .tgz
> LIB_DEPENDS= audio/libogg \
> audio/libvorbis
>
> -WRKDIST= ${WRKDIR}
> +WRKSRC= ${WRKDIR}/oggtag
>
> NO_TEST= Yes
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/audio/oggtag/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo 18 Jan 2015 03:12:46 - 1.4
> +++ distinfo 15 Nov 2017 12:52:18 -
> @@ -1,2 +1,2 @@
> -SHA256 (oggtag_1.0.tgz) = AZdZgRWUQl4DPfXtv6ygWZXsn66epQbTPWOtDaFQBzQ=
> -SIZE (oggtag_1.0.tgz) = 14463
> +SHA256 (oggtag_1.0.2.tgz) = hU+f3DttnqTERzX2b5NQqyHNcGDc0rjsz95skFB2Cxc=
> +SIZE (oggtag_1.0.2.tgz) = 14689
> Index: patches/patch-oggtag_c
> ===
> RCS file: patches/patch-oggtag_c
> diff -N patches/patch-oggtag_c
> --- patches/patch-oggtag_c10 Jun 2004 20:37:44 - 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-oggtag_c,v 1.1.1.1 2004/06/10 20:37:44 xsa Exp $
> oggtag.c.orig2002-12-02 10:03:27.0 +0100
> -+++ oggtag.c 2004-06-10 16:51:58.0 +0200
> -@@ -4,6 +4,8 @@
> - */
> -
> - #include
> -+#include
> -+#include
> - #include
> - #include "vcedit.h"
> -
>
Re: update audio/oggtag
Ah, right; thanks.
Does anyone want to commit this version tweaked by Anthony and Stu?
Jan
On Nov 15 12:52:42, s...@spacehopper.org wrote:
> On 2017/11/15 13:34, Jan Stary wrote:
> > On Nov 14 19:39:59, anth...@anjbe.name wrote:
> > > Stuart Henderson writes:
> > > > > do-build:
> > > > > - cd ${WRKSRC} && \
> > > > > + cd ${WRKSRC}/oggtag && \
> > > > > ${CC} ${CFLAGS} -o oggtag oggtag.c vcedit.c \
> > > > > -I${LOCALBASE}/include -L${LOCALBASE}/lib ${LIBS}
> > > > >
> > > > > do-install:
> > > > > - ${INSTALL_PROGRAM} ${WRKSRC}/oggtag ${PREFIX}/bin
> > > > > - ${INSTALL_MAN} ${WRKSRC}/oggtag.1 ${PREFIX}/man/man1
> > > > > + ${INSTALL_PROGRAM} ${WRKSRC}/oggtag/oggtag ${PREFIX}/bin
> > > > > + ${INSTALL_MAN} ${WRKSRC}/oggtag/oggtag.1 ${PREFIX}/man/man1
> > >
> > > You should remove the WRKDIST=${WRKDIR} line instead.
> >
> > That fails for me. Did I missunderstand?
> >
> > Jan
> >
> >
> > $ make
> > ===> Building for oggtag-1.0.2
> > cd /usr/ports/pobj/oggtag-1.0.2/oggtag_1.0.2 && cc -O2 -pipe -o
> > oggtag oggtag.c vcedit.c -I/usr/local/include -L/usr/local/lib -lvorbis
> > -logg -lm
> > cc: error: no such file or directory: 'oggtag.c'
> > cc: error: no such file or directory: 'vcedit.c'
> > *** Error 1 in . (Makefile:30 'do-build')
> > *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2724
> > '/usr/ports/pobj/oggtag-1.0.2/.build_done')
> > *** Error 1 in /usr/ports/audio/oggtag
> > (/usr/ports/infrastructure/mk/bsd.port.mk:2425 'all')
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/oggtag/Makefile,v
> retrieving revision 1.12
> diff -u -p -r1.12 Makefile
> --- Makefile 22 Jan 2015 21:17:46 - 1.12
> +++ Makefile 15 Nov 2017 12:52:18 -
> @@ -1,9 +1,8 @@
> # $OpenBSD: Makefile,v 1.12 2015/01/22 21:17:46 naddy Exp $
> COMMENT= command-line editor for tags in Ogg Vorbis files
>
> -DISTNAME=oggtag_1.0
> +DISTNAME=oggtag_1.0.2
> PKGNAME= ${DISTNAME:S/_/-/}
> -REVISION=0
> CATEGORIES= audio
>
> HOMEPAGE=http://oggtag.sourceforge.net/
> @@ -21,7 +20,7 @@ EXTRACT_SUFX= .tgz
> LIB_DEPENDS= audio/libogg \
> audio/libvorbis
>
> -WRKDIST= ${WRKDIR}
> +WRKSRC= ${WRKDIR}/oggtag
>
> NO_TEST= Yes
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/audio/oggtag/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo 18 Jan 2015 03:12:46 - 1.4
> +++ distinfo 15 Nov 2017 12:52:18 -
> @@ -1,2 +1,2 @@
> -SHA256 (oggtag_1.0.tgz) = AZdZgRWUQl4DPfXtv6ygWZXsn66epQbTPWOtDaFQBzQ=
> -SIZE (oggtag_1.0.tgz) = 14463
> +SHA256 (oggtag_1.0.2.tgz) = hU+f3DttnqTERzX2b5NQqyHNcGDc0rjsz95skFB2Cxc=
> +SIZE (oggtag_1.0.2.tgz) = 14689
> Index: patches/patch-oggtag_c
> ===
> RCS file: patches/patch-oggtag_c
> diff -N patches/patch-oggtag_c
> --- patches/patch-oggtag_c10 Jun 2004 20:37:44 - 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,12 +0,0 @@
> -$OpenBSD: patch-oggtag_c,v 1.1.1.1 2004/06/10 20:37:44 xsa Exp $
> oggtag.c.orig2002-12-02 10:03:27.0 +0100
> -+++ oggtag.c 2004-06-10 16:51:58.0 +0200
> -@@ -4,6 +4,8 @@
> - */
> -
> - #include
> -+#include
> -+#include
> - #include
> - #include "vcedit.h"
> -
>
[UPDATE] www/varnish to 5.2.1
This is a security update[0] fixing a data leak:
A wrong if statement in the varnishd source code means that
synthetic objects in stevedores which over-allocate, may leak up
to page size of data from a malloc(3) memory allocation.
In a unpredictable percentage of the cases where this condition
arises, a segmentation fault will happen instead.
Tests continue to pass as before (full log attached):
# TOTAL: 636
# PASS: 630
# SKIP: 5
# XFAIL: 0
# FAIL: 1
# XPASS: 0
# ERROR: 0
I also removed TEST_TARGET=check as it's the default, used
${INSTALL_DATA} instead of cp in post-install and pointed users to 5.2
instead of 5.0 docs.
Varnish uses python scripts to compile .vsc into C so I added
lang/python with MODPY_VERSION=2.7 explicity since it's importing
StringIO which appearantly became io.StringIO in 3.0 and higher.
Feedback? Does anyone want to commit this?
0: https://varnish-cache.org/releases/rel5.2.1.html#rel5-2-1
diff --git a/www/varnish/Makefile b/www/varnish/Makefile
index b0fa5029ab4..5cf58670364 100644
--- a/www/varnish/Makefile
+++ b/www/varnish/Makefile
@@ -2,7 +2,7 @@
COMMENT = high-performance HTTP accelerator
-DISTNAME = varnish-5.2.0
+DISTNAME = varnish-5.2.1
CATEGORIES = www
@@ -16,12 +16,16 @@ MAINTAINER =Jim Razmus II
\
# BSD
PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES = https://varnish-cache.org/_downloads/
+MASTER_SITES = ${HOMEPAGE}_downloads/
EXTRACT_SUFX = .tgz
WANTLIB += c execinfo m ncursesw pcre pthread readline termcap
+MODULES = lang/python
+
+MODPY_VERSION =2.7
+
BUILD_DEPENDS =${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
devel/libtool \
@@ -30,6 +34,8 @@ LIB_DEPENDS = devel/pcre
# The internal backtrace implementation fails to build with -Werror on arm/hppa
LIB_DEPENDS += devel/libexecinfo
+MODPY_RUNDEP = No
+
WRKDIST = ${WRKDIR}/${DISTNAME}
USE_GMAKE =Yes
CONFIGURE_STYLE = gnu
@@ -38,7 +44,7 @@ AUTOMAKE_VERSION =1.15
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
-TEST_TARGET = check
+MODPY_ADJ_FILES = lib/lib*/*.py
post-patch:
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
@@ -47,7 +53,7 @@ post-patch:
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/varnish
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/varnish
- cp ${WRKDIST}${SYSCONFDIR}/{example,builtin}.vcl \
+ ${INSTALL_DATA} ${WRKDIST}${SYSCONFDIR}/{example,builtin}.vcl \
${PREFIX}/share/examples/varnish
rm -f ${PREFIX}/lib/varnish/{vmods,}/*.{a,la}
diff --git a/www/varnish/distinfo b/www/varnish/distinfo
index f7dc351f783..cdba07a9889 100644
--- a/www/varnish/distinfo
+++ b/www/varnish/distinfo
@@ -1,2 +1,2 @@
-SHA256 (varnish-5.2.0.tgz) = zEgmoEgPSSaNOZYwnkt+RlFR6aUjzPjq1JnsV1FJ9H4=
-SIZE (varnish-5.2.0.tgz) = 2828867
+SHA256 (varnish-5.2.1.tgz) = uEUsnXjBb3jIz9HBoeaWUjv2S3chwzAVDcwIUkWQFLM=
+SIZE (varnish-5.2.1.tgz) = 2827676
diff --git a/www/varnish/pkg/MESSAGE b/www/varnish/pkg/MESSAGE
index 5f50b1bbf2a..ce02efaef87 100644
--- a/www/varnish/pkg/MESSAGE
+++ b/www/varnish/pkg/MESSAGE
@@ -5,4 +5,4 @@ or the following link for more information:
and for further information:
- https://www.varnish-cache.org/docs/5.0/
+ https://www.varnish-cache.org/docs/5.2/
===
Varnish 5.2.1: bin/varnishtest/test-suite.log
===
# TOTAL: 636
# PASS: 630
# SKIP: 5
# XFAIL: 0
# FAIL: 1
# XPASS: 0
# ERROR: 0
.. contents:: :depth: 2
SKIP: tests/a00014
==
top 0.0 extmacro def
pwd=/usr/obj/ports/varnish-5.2.1/varnish-5.2.1/bin/varnishtest
top 0.0 extmacro def localhost=127.0.0.1
top 0.0 extmacro def bad_backend=127.0.0.1 45991
top 0.0 extmacro def bad_ip=192.0.2.255
top 0.0 extmacro def topbuild=/usr/obj/ports/varnish-5.2.1/varnish-5.2.1
top 0.0 macro def tmpdir=/tmp/vtc.615.05f97f59
*top 0.0 TEST ./tests/a00014.vtc starting
** top 0.0 === varnishtest "Custom feature verification"
*top 0.0 TEST Custom feature verification
** top 0.0 === feature cmd true
** top 0.0 === feature cmd false
*top 0.0 SKIPPING test, lacking feature: false
*top 0.0 RESETTING after ./tests/a00014.vtc
*top 0.0 TEST ./tests/a00014.vtc completed
#top TEST ./tests/a00014.vtc skipped (0.004)
SKIP tests/a00014.vtc (exit status: 77)
SKIP: tests/a02022
==
top 0.0 extmacro def
pwd=/usr/obj/ports/varnish-5.2.1/varnish-5.2.1/bin/varnishtest
top 0.0 extmacro def lo
[UPDATE] www/varnish 5.2.0 -> 5.2.1
This is a security update[0] fixing a data leak:
A wrong if statement in the varnishd source code means that
synthetic objects in stevedores which over-allocate, may leak up
to page size of data from a malloc(3) memory allocation.
In a unpredictable percentage of the cases where this condition
arises, a segmentation fault will happen instead.
Tests continue to pass:
# TOTAL: 636
# PASS: 630
# SKIP: 5
# XFAIL: 0
# FAIL: 1
# XPASS: 0
# ERROR: 0
FAIL tests/u0.vtc (exit status: 2)
Removed TEST_TARGET=check as it's default. I also replaced cp with
${INSTALL_DATA} post-install and pointed users to 5.2 docs.
Since Varnish compiles .vsc files to C using python with 2.7 specific
code (import StringIO), I added lang/python and explicity set
MODPY_VERSION=2.7.
Feedback? Does anyone want to commit this?
0: https://varnish-cache.org/releases/rel5.2.1.html#rel5-2-1
diff --git a/www/varnish/Makefile b/www/varnish/Makefile
index b0fa5029ab4..5cf58670364 100644
--- a/www/varnish/Makefile
+++ b/www/varnish/Makefile
@@ -2,7 +2,7 @@
COMMENT = high-performance HTTP accelerator
-DISTNAME = varnish-5.2.0
+DISTNAME = varnish-5.2.1
CATEGORIES = www
@@ -16,12 +16,16 @@ MAINTAINER =Jim Razmus II
\
# BSD
PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES = https://varnish-cache.org/_downloads/
+MASTER_SITES = ${HOMEPAGE}_downloads/
EXTRACT_SUFX = .tgz
WANTLIB += c execinfo m ncursesw pcre pthread readline termcap
+MODULES = lang/python
+
+MODPY_VERSION =2.7
+
BUILD_DEPENDS =${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
devel/libtool \
@@ -30,6 +34,8 @@ LIB_DEPENDS = devel/pcre
# The internal backtrace implementation fails to build with -Werror on arm/hppa
LIB_DEPENDS += devel/libexecinfo
+MODPY_RUNDEP = No
+
WRKDIST = ${WRKDIR}/${DISTNAME}
USE_GMAKE =Yes
CONFIGURE_STYLE = gnu
@@ -38,7 +44,7 @@ AUTOMAKE_VERSION =1.15
CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}"
-TEST_TARGET = check
+MODPY_ADJ_FILES = lib/lib*/*.py
post-patch:
cd ${WRKSRC} && env AUTOCONF_VERSION=${AUTOCONF_VERSION} \
@@ -47,7 +53,7 @@ post-patch:
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/varnish
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/varnish
- cp ${WRKDIST}${SYSCONFDIR}/{example,builtin}.vcl \
+ ${INSTALL_DATA} ${WRKDIST}${SYSCONFDIR}/{example,builtin}.vcl \
${PREFIX}/share/examples/varnish
rm -f ${PREFIX}/lib/varnish/{vmods,}/*.{a,la}
diff --git a/www/varnish/distinfo b/www/varnish/distinfo
index f7dc351f783..cdba07a9889 100644
--- a/www/varnish/distinfo
+++ b/www/varnish/distinfo
@@ -1,2 +1,2 @@
-SHA256 (varnish-5.2.0.tgz) = zEgmoEgPSSaNOZYwnkt+RlFR6aUjzPjq1JnsV1FJ9H4=
-SIZE (varnish-5.2.0.tgz) = 2828867
+SHA256 (varnish-5.2.1.tgz) = uEUsnXjBb3jIz9HBoeaWUjv2S3chwzAVDcwIUkWQFLM=
+SIZE (varnish-5.2.1.tgz) = 2827676
diff --git a/www/varnish/pkg/MESSAGE b/www/varnish/pkg/MESSAGE
index 5f50b1bbf2a..ce02efaef87 100644
--- a/www/varnish/pkg/MESSAGE
+++ b/www/varnish/pkg/MESSAGE
@@ -5,4 +5,4 @@ or the following link for more information:
and for further information:
- https://www.varnish-cache.org/docs/5.0/
+ https://www.varnish-cache.org/docs/5.2/
Re: Fish shell
Ugh, REALLY should have posted sooner. Oh well, my mistake... On 11/15/2017 09:53 AM, Adam Mokhtari wrote: > I really should have posted this sooner, but actually I have recently > revived an old version of the Fish port (not in the ports tree), and > it's running on my OpenBSD server. The version is 2.7b1 from the GitHub > releases, because version 2.6.0 has a bug in the configure script that > fails on OpenBSD (there's a test relying on undefined threading > behavior, which from GitHub commit history seems to go back to at least > 2.4.0). I was unable to get autotools to work. Eventually, when 2.7.0 is > released, I will update it to pull the stable version from the official > website instead of GitHub. > > It's not really finished yet, e.g. I didn't try running the tests, but I > haven't noticed any crashes or bugs, so maybe it will work for you as > well (my version is 6.2, arch is amd64). > > I've attached the generated package (fish-2.7b1.tgz), as well as a > tarball of the port (fish.tgz, goes in /usr/ports/shells/fish, for > anyone who wants to work on the package itself). > > The old version can be downloaded from > https://www.mail-archive.com/ports@openbsd.org/msg12511/fish-port.tar.gz > > > On 11/15/2017 08:23 AM, Oscar Forner Martinez wrote: >> Hi, >> >> First timer on this mailing list. I have been running OpenBSD for over >> 2 weeks on my machine, but there are still few small things missing >> from my setup. One of the is the Fish Shell. I haven't been able to >> find it in the packages neither in the ports. >> >> I would like to know if there is someone else working on porting it. I >> can compile it from source without a problem in OpenBSD, so I would >> like to bring it to the ports. I am following >> https://www.openbsd.org/faq/ports/guide.html and one of the first >> steps is to check ask in this mailing list :D >> >> Best regards, >> >> Oscar >>
Re: Fish shell
On 2017/11/15 14:23, Oscar Forner Martinez wrote: > Hi, > > First timer on this mailing list. I have been running OpenBSD for over 2 > weeks on my machine, but there are still few small things missing from my > setup. One of the is the Fish Shell. I haven't been able to find it in the > packages neither in the ports. > > I would like to know if there is someone else working on porting it. I can > compile it from source without a problem in OpenBSD, so I would like to > bring it to the ports. I am following > https://www.openbsd.org/faq/ports/guide.html and one of the first steps is > to check ask in this mailing list :D > > Best regards, > > Oscar > There is a work-in-progress attempt at https://github.com/jasperla/openbsd-wip/tree/master/shells/fish - note the TODO file as there are still some things to be done.
Fish shell
Hi, First timer on this mailing list. I have been running OpenBSD for over 2 weeks on my machine, but there are still few small things missing from my setup. One of the is the Fish Shell. I haven't been able to find it in the packages neither in the ports. I would like to know if there is someone else working on porting it. I can compile it from source without a problem in OpenBSD, so I would like to bring it to the ports. I am following https://www.openbsd.org/faq/ports/guide.html and one of the first steps is to check ask in this mailing list :D Best regards, Oscar
Re: update www/apache-httpd 2.4.29
ping :-) On 4 November 2017 at 09:13, David CARLIER wrote: > Hi, > > here a proposal to update to 2.4.29, removing some patches LIBRESSL's > related pushed upstream in the process. > > Hope it is good. > > Kind regards. >
Remove x11/xdmchoose
When xdm is used to handle access to remote X11 servers, it can offer a chooser menu that allows selecting which host to connect to. x11/xdmchoose is a replacement for the default xdm chooser. Since the ability to manage remote X11 servers has been completely stripped from xenodm, there is no possible use for xdmchoose any longer. I guess somebody might make an xdm port, but apparently nobody felt the need in the eight months since xenocara switched to xenodm. Therefore I would like to remove x11/xdmchoose, before it is so far forgotten that nobody even remembers that it has become useless. -- Christian "naddy" Weisgerber na...@mips.inka.de
Re: update audio/oggtag
On 2017/11/15 13:34, Jan Stary wrote:
> On Nov 14 19:39:59, anth...@anjbe.name wrote:
> > Stuart Henderson writes:
> > > > do-build:
> > > > - cd ${WRKSRC} && \
> > > > + cd ${WRKSRC}/oggtag && \
> > > > ${CC} ${CFLAGS} -o oggtag oggtag.c vcedit.c \
> > > > -I${LOCALBASE}/include -L${LOCALBASE}/lib ${LIBS}
> > > >
> > > > do-install:
> > > > - ${INSTALL_PROGRAM} ${WRKSRC}/oggtag ${PREFIX}/bin
> > > > - ${INSTALL_MAN} ${WRKSRC}/oggtag.1 ${PREFIX}/man/man1
> > > > + ${INSTALL_PROGRAM} ${WRKSRC}/oggtag/oggtag ${PREFIX}/bin
> > > > + ${INSTALL_MAN} ${WRKSRC}/oggtag/oggtag.1 ${PREFIX}/man/man1
> >
> > You should remove the WRKDIST=${WRKDIR} line instead.
>
> That fails for me. Did I missunderstand?
>
> Jan
>
>
> $ make
> ===> Building for oggtag-1.0.2
> cd /usr/ports/pobj/oggtag-1.0.2/oggtag_1.0.2 &&cc -O2 -pipe -o
> oggtag oggtag.c vcedit.c -I/usr/local/include -L/usr/local/lib -lvorbis
> -logg -lm
> cc: error: no such file or directory: 'oggtag.c'
> cc: error: no such file or directory: 'vcedit.c'
> *** Error 1 in . (Makefile:30 'do-build')
> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2724
> '/usr/ports/pobj/oggtag-1.0.2/.build_done')
> *** Error 1 in /usr/ports/audio/oggtag
> (/usr/ports/infrastructure/mk/bsd.port.mk:2425 'all')
Index: Makefile
===
RCS file: /cvs/ports/audio/oggtag/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile22 Jan 2015 21:17:46 - 1.12
+++ Makefile15 Nov 2017 12:52:18 -
@@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.12 2015/01/22 21:17:46 naddy Exp $
COMMENT= command-line editor for tags in Ogg Vorbis files
-DISTNAME= oggtag_1.0
+DISTNAME= oggtag_1.0.2
PKGNAME= ${DISTNAME:S/_/-/}
-REVISION= 0
CATEGORIES=audio
HOMEPAGE= http://oggtag.sourceforge.net/
@@ -21,7 +20,7 @@ EXTRACT_SUFX= .tgz
LIB_DEPENDS= audio/libogg \
audio/libvorbis
-WRKDIST= ${WRKDIR}
+WRKSRC=${WRKDIR}/oggtag
NO_TEST= Yes
Index: distinfo
===
RCS file: /cvs/ports/audio/oggtag/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:12:46 - 1.4
+++ distinfo15 Nov 2017 12:52:18 -
@@ -1,2 +1,2 @@
-SHA256 (oggtag_1.0.tgz) = AZdZgRWUQl4DPfXtv6ygWZXsn66epQbTPWOtDaFQBzQ=
-SIZE (oggtag_1.0.tgz) = 14463
+SHA256 (oggtag_1.0.2.tgz) = hU+f3DttnqTERzX2b5NQqyHNcGDc0rjsz95skFB2Cxc=
+SIZE (oggtag_1.0.2.tgz) = 14689
Index: patches/patch-oggtag_c
===
RCS file: patches/patch-oggtag_c
diff -N patches/patch-oggtag_c
--- patches/patch-oggtag_c 10 Jun 2004 20:37:44 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-oggtag_c,v 1.1.1.1 2004/06/10 20:37:44 xsa Exp $
oggtag.c.orig 2002-12-02 10:03:27.0 +0100
-+++ oggtag.c 2004-06-10 16:51:58.0 +0200
-@@ -4,6 +4,8 @@
- */
-
- #include
-+#include
-+#include
- #include
- #include "vcedit.h"
-
Re: update audio/oggtag
On Nov 14 19:39:59, anth...@anjbe.name wrote:
> Stuart Henderson writes:
> > > do-build:
> > > - cd ${WRKSRC} && \
> > > + cd ${WRKSRC}/oggtag && \
> > > ${CC} ${CFLAGS} -o oggtag oggtag.c vcedit.c \
> > > -I${LOCALBASE}/include -L${LOCALBASE}/lib ${LIBS}
> > >
> > > do-install:
> > > - ${INSTALL_PROGRAM} ${WRKSRC}/oggtag ${PREFIX}/bin
> > > - ${INSTALL_MAN} ${WRKSRC}/oggtag.1 ${PREFIX}/man/man1
> > > + ${INSTALL_PROGRAM} ${WRKSRC}/oggtag/oggtag ${PREFIX}/bin
> > > + ${INSTALL_MAN} ${WRKSRC}/oggtag/oggtag.1 ${PREFIX}/man/man1
>
> You should remove the WRKDIST=${WRKDIR} line instead.
That fails for me. Did I missunderstand?
Jan
$ make
===> Building for oggtag-1.0.2
cd /usr/ports/pobj/oggtag-1.0.2/oggtag_1.0.2 && cc -O2 -pipe -o oggtag
oggtag.c vcedit.c -I/usr/local/include -L/usr/local/lib -lvorbis -logg -lm
cc: error: no such file or directory: 'oggtag.c'
cc: error: no such file or directory: 'vcedit.c'
*** Error 1 in . (Makefile:30 'do-build')
*** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2724
'/usr/ports/pobj/oggtag-1.0.2/.build_done')
*** Error 1 in /usr/ports/audio/oggtag
(/usr/ports/infrastructure/mk/bsd.port.mk:2425 'all')
$ cat Makefile
# $OpenBSD: Makefile,v 1.12 2015/01/22 21:17:46 naddy Exp $
COMMENT=command-line editor for tags in Ogg Vorbis files
DISTNAME= oggtag_1.0.2
PKGNAME=${DISTNAME:S/_/-/}
CATEGORIES= audio
HOMEPAGE= http://oggtag.sourceforge.net/
MAINTAINER= Julian Leyh
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
WANTLIB=c m ogg>=5 vorbis>=3
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=oggtag/}
EXTRACT_SUFX= .tgz
LIB_DEPENDS=audio/libogg \
audio/libvorbis
NO_TEST=Yes
LIBS= -lvorbis -logg -lm
do-build:
cd ${WRKSRC} && \
${CC} ${CFLAGS} -o oggtag oggtag.c vcedit.c \
-I${LOCALBASE}/include -L${LOCALBASE}/lib ${LIBS}
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/oggtag ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/oggtag.1 ${PREFIX}/man/man1
.include
Re: [UPDATE] devel/pudb
Le 14-11-2017 17:12, Brian Callahan a écrit : On 11/14/17 10:28, Remi Pointel wrote: Hi, this is the diff to update pudb to latest release. Ok? Cheers, Remi. When I run `make test`, it runs some tests, they all pass, cool. When I run `env FLAVOR=python3 make test`, it launches the binary. And as far as I can tell, doesn't run any tests. Is that intentional? Hi, yes I have the same for the reggression tests, and as far as I remember it has always be here. I think regress tests are broken. Otherwise, ok. Thank you, I will commit the update. Cheers, Remi.
Re: PHP: clean Makefile.inc of 5.x specifics
On 2017/11/15 10:03, Thierry M wrote: > You may wish to add the following to your diff for > /cvs/ports/lang/php/Makefile.inc: > > - remove '--enable-zend-multibyte' (This feature has been DEPRECATED as of > PHP 5.3.0 and REMOVED as of PHP 5.4.0) > > - rename '--enable-fastcgi' to '--enable-cgi' (As of PHP 5.3.0 this > argument > no longer exists and is enabled by --enable-cgi instead) > > (taken from https://secure.php.net/manual/en/configure.about.php ) If you check the rest of the thread, the idea is to split the diff into manageable chunks. Please either check Martijn's jumbo diff to see if it's already there (and therefore already known about), or wait until the dust settles :)
Re: PHP: clean Makefile.inc of 5.x specifics
On 2017/11/15 07:59, Martijn van Duren wrote: > On 11/14/17 23:20, Stuart Henderson wrote: > > On 2017/11/14 16:53, Daniel Jakots wrote: > >> On Tue, 14 Nov 2017 19:54:55 +0100, Martijn van Duren > >> wrote: > >> > >>> Hello ports@, > >>> > >>> As requested by sthen@ I will cut up my big patch into smaller pieces. > >>> This is the first part of that undertaking. > >>> > >>> I will send in 1 at the time since a lot intermingles with > >>> Makefile.inc and I don't want stacking patches to cause trouble. > >>> > >>> If someone objects to a certain patch I'll just drop it till it's the > >>> right time to discuss it, so to not keep the things that can move > >>> along. > >>> > >> > >> Subject: PHP: clean Makefile.inc of 5.x specifics: then would you mind > >> running "/usr/ports/lang/php$ sed -i 's/php5/php/' Makefile.inc"? :p > >> It's a bit weird to do a pkg_info and see: > >> php-curl-7.0.23 curl URL library extensions for php5 > >> > >> Cheers, > >> Daniel > >> > > > > I agree this makes sense. It will need more than just s//, all subpackages > > will need bumping too. > > > That was the next thing on my agenda. This was also in my original patch, > but one thing at a time. > I'll probably leave these 3 as is, since they disappeared in php7, so it's > a bit more informative why they're not there for php7. > > @sthen@: Do we want that bump with the coming diff for the s/php5/php/ > diff and all the following, or shall we accumulate these minor diffs > that don't change anything substantial and bump them all in one go? (maybe > when we jump to 5.6.32 and 7.0.25?) It seems sensible to change those with the updates, it doesn't add too much noise to the diff.
Re: NEW: games/freedoom
On Wed, Nov 15, 2017 at 02:09:57AM -0700, Anthony J. Bentley wrote: > Landry Breuil writes: > > On Mon, Nov 13, 2017 at 11:38:48PM -0700, Anthony J. Bentley wrote: > > > Hi, > > > > > > Attached is a port for freedoom. > > > > > > > > > Freedoom is a freely licensed game pack for the Doom engine, split in two > > > p > > arts. > > > > > > Phase 1 is the first part of the single-player game, containing four > > > chapte > > rs > > > which are nine levels each, smoothly paced for beginner players. It is > > > compatible with mods for the original Doom and The Ultimate Doom. > > > > > > Phase 2 is the second major part of the single-player game, a massive > > > 32-le > > vel > > > chapter expanding upon the same concepts present in Phase 1, as well as > > > containing additional monsters and the double-barreled shotgun! The > > > levels > > in > > > this game tend to demand more skillful play than the previous chapters. > > > It > > is > > > compatible with mods for Doom II. > > > > > > FreeDM is a fast-paced competitive deathmatch game, part of the Freedoom > > > project. Rather than the usual single-player focused levels, these contain > > > no monsters and are intended for deathmatch only. It is compatible with > > > mod > > s > > > for Doom II. > > > > > > > > > You can run the game with chocolate-doom. > > > > > > ok? > > > > ok (werent there licence issues with this one at some point, which > > required reimplementing/relicencing some bits ? or all this is finally > > over ?) > > I looked but can't find anything like this, except OpenGameArt > pointlessly complaining that it's BSD instead of Creative Commons... Ah, sorry, that was gzdoom that had licence issues that were finally solved, cf https://github.com/coelckers/gzdoom/commit/c219811a542e0d6aae38b920ae9e257c5c2286c1 and https://forum.drdteam.org/viewtopic.php?t=7613 so many dooms
Re: NEW: games/freedoom
Landry Breuil writes: > On Mon, Nov 13, 2017 at 11:38:48PM -0700, Anthony J. Bentley wrote: > > Hi, > > > > Attached is a port for freedoom. > > > > > > Freedoom is a freely licensed game pack for the Doom engine, split in two p > arts. > > > > Phase 1 is the first part of the single-player game, containing four chapte > rs > > which are nine levels each, smoothly paced for beginner players. It is > > compatible with mods for the original Doom and The Ultimate Doom. > > > > Phase 2 is the second major part of the single-player game, a massive 32-le > vel > > chapter expanding upon the same concepts present in Phase 1, as well as > > containing additional monsters and the double-barreled shotgun! The levels > in > > this game tend to demand more skillful play than the previous chapters. It > is > > compatible with mods for Doom II. > > > > FreeDM is a fast-paced competitive deathmatch game, part of the Freedoom > > project. Rather than the usual single-player focused levels, these contain > > no monsters and are intended for deathmatch only. It is compatible with mod > s > > for Doom II. > > > > > > You can run the game with chocolate-doom. > > > > ok? > > ok (werent there licence issues with this one at some point, which > required reimplementing/relicencing some bits ? or all this is finally > over ?) I looked but can't find anything like this, except OpenGameArt pointlessly complaining that it's BSD instead of Creative Commons...
Re: PHP: clean Makefile.inc of 5.x specifics
On 11/15/17 10:03, Thierry M wrote: > You may wish to add the following to your diff for > /cvs/ports/lang/php/Makefile.inc: > > - remove '--enable-zend-multibyte' (This feature has been DEPRECATED as of > PHP 5.3.0 and REMOVED as of PHP 5.4.0) > > - rename '--enable-fastcgi' to '--enable-cgi' (As of PHP 5.3.0 this argument > no longer exists and is enabled by --enable-cgi instead) > > (taken from https://secure.php.net/manual/en/configure.about.php ) Same as with php5, due for a next patch and part of my original big diff.
Re: PHP: clean Makefile.inc of 5.x specifics
You may wish to add the following to your diff for
/cvs/ports/lang/php/Makefile.inc:
- remove '--enable-zend-multibyte' (This feature has been DEPRECATED as
of
PHP 5.3.0 and REMOVED as of PHP 5.4.0)
- rename '--enable-fastcgi' to '--enable-cgi' (As of PHP 5.3.0 this
argument
no longer exists and is enabled by --enable-cgi instead)
(taken from https://secure.php.net/manual/en/configure.about.php )
Le 14-11-2017 19:54, Martijn van Duren a écrit :
Hello ports@,
As requested by sthen@ I will cut up my big patch into smaller pieces.
This is the first part of that undertaking.
I will send in 1 at the time since a lot intermingles with Makefile.inc
and I don't want stacking patches to cause trouble.
If someone objects to a certain patch I'll just drop it till it's the
right time to discuss it, so to not keep the things that can move
along.
OK for the patch below?
martijn@
Index: Makefile.inc
===
RCS file: /cvs/ports/lang/php/Makefile.inc,v
retrieving revision 1.97
diff -u -p -r1.97 Makefile.inc
--- Makefile.inc14 Nov 2017 11:57:25 - 1.97
+++ Makefile.inc14 Nov 2017 18:02:26 -
@@ -71,12 +71,8 @@ CONFIGURE_ARGS+= --enable-shared \
--with-pdo-sqlite \
--enable-sqlite-utf8 \
--with-sqlite3 \
- --program-suffix=-${PV}
-
-# readline is broken in PHP-5.3
-.if ${PV} != 5.3
-CONFIGURE_ARGS += --with-readline
-.endif
+ --program-suffix=-${PV} \
+ --with-readline
Re: security/sshlockout: use DIOCADDADDRS and remove "proc exec" from pledge.
"Theo de Raadt" wrote:
> > On 2017/11/14 18:31, Jeremie Courreges-Anglas wrote:
> > > On Sun, Nov 12 2017, sunil+po...@nimmagadda.net wrote:
> > > > Hi,
> > >
> > > Hi Sunil,
> > >
> > > > This diff replaces a system(3) call to insert an address into a pf
> > > > table with ioctl(DIOCADDADDRS) which allows removal of "proc exec"
> > > > from the pledge promises.
> > >
> > > Interesting. So DIOCRADDADDRS isn't restricted by pledge(2)?
> >
> > It looks like it would be restricted, it's not on the list of permitted
> > ioctls in the PLEDGE_PF section of kern_pledge.c. OTOH, DIOCRSETADDRS
> > and DIOCRCLRADDRS *are* permitted, so I don't think it would be
> > unreasonable to permit the remaining DIOCRxxxADDRS.
> >
> > One reason for a port to call out to pfctl for PF-related operations
> > is to insulate it from kernel ABI changes (pfctl is more likely to be
> > up to date than packages after an update). I suppose at least for
> > sshlockout, it would fail open rather than closed if there were a
> > problem like this, so not likely to be a huge annoyance.
>
> absolutely. Don't do the ioctl by hand.
As this program needs to run with elevated privileges, I was looking
for a way to reduce pledge promises. I didn't know ioctl(2) by hand
was discouraged.
>
> As to DIOCRADDADDRS and other ioctl, did you even test your diff
> before sending it???
Yes, I did but I did it wrong and I now realized my mistake. I
forgot to make update-patches and was testing system("pfctl -tlockout
-Tadd x.x.x.x") assuming it was ioctl(2).
I installed a clean snapshot, ports tree and sshlockout with this
diff promptly crashes as ioctl(2) isn't allowed by pledge and syslogd
restarts sshlockout. Sorry for the noise. I will drop this diff.
