sparc64 bulk build report
bulk build on sparc64-1.ports.openbsd.org started on Tue Mar 6 12:31:39 MST 2018 finished at Sun Mar 18 00:54:58 MDT 2018 lasted 12D04h23m done with kern.version=OpenBSD 6.3-beta (GENERIC) #457: Mon Mar 5 23:20:56 MST 2018 built packages:8484 Mar 6:215 Mar 7:198 Mar 8:114 Mar 9:59 Mar 10:172 Mar 11:101 Mar 12:119 Mar 13:305 Mar 14:355 Mar 15:676 Mar 16:1144 Mar 17:4659 Mar 18:366 build failures: 29 http://build-failures.rhaalovely.net//sparc64/2018-03-06/audio/audacious-plugins.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/devel/arm-none-eabi/gcc-linaro.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/devel/ptlib.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/devel/reposurgeon.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/devel/xtensa-elf/gcc.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/editors/qscintilla.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/editors/scintilla.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/emulators/higan.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/emulators/ppsspp.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/games/fs2open.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/games/hyperrogue.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/games/pokerth.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/games/tbftss.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/games/widelands.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/graphics/dcmtk.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/graphics/feh.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/graphics/piglit.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/lang/apl.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/lang/duktape.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/lang/gambit.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/net/libtorrent-rasterbar.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/net/telegram-purple.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/security/sslscan,openssl.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/sysutils/facter.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/www/kore,pgsql.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/www/webkitgtk4.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/x11/gnome/totem.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/x11/qt5/qtbase.log http://build-failures.rhaalovely.net//sparc64/2018-03-06/x11/vlc,.log recurrent failures failures/devel/arm-none-eabi/gcc-linaro.log failures/devel/reposurgeon.log failures/devel/xtensa-elf/gcc.log failures/editors/qscintilla.log failures/editors/scintilla.log failures/emulators/higan.log failures/games/pokerth.log failures/games/tbftss.log failures/games/widelands.log failures/graphics/dcmtk.log failures/graphics/feh.log failures/graphics/piglit.log failures/lang/apl.log failures/lang/duktape.log failures/net/libtorrent-rasterbar.log failures/net/telegram-purple.log failures/security/sslscan,openssl.log failures/sysutils/facter.log failures/www/webkitgtk4.log failures/x11/qt5/qtbase.log new failures +++ ls-failures Sun Mar 18 00:55:59 2018 +failures/audio/audacious-plugins.log +failures/devel/ptlib.log +failures/emulators/ppsspp.log +failures/games/fs2open.log +failures/games/hyperrogue.log +failures/lang/gambit.log +failures/www/kore,pgsql.log +failures/x11/gnome/totem.log +failures/x11/vlc,.log resolved failures --- ../old/sparc64/last//ls-failuresSun Feb 25 08:36:46 2018 -failures/geo/gdal,python3,-python.log -failures/mail/kopano/core,-mapi.log -failures/mail/nmh,sasl.log -failures/multimedia/libvpx.log -failures/net/librenms.log -failures/net/py-slixmpp.log -failures/print/texlive/base.log -failures/www/libwebsockets.log Base libs: c.92.3 crypto.42.7 X libs:
Update devel/tkcvs from 6.0 to 8.2.3
>From the Changelog it appears that tkcvs 6.0 is somewhere around 20
years old -- upstream has changed a lot in the interim.
NOTE: this change additionally requires you to manually delete the
patches folder in devel/tkcvs. No patches are needed on the new
version, because the new installer lets you specify the destination
directory from the command line. I couldn't figure out how to make cvs
make a patch which showed the folder deletion! I am a beginner at CVS
and at Porting, so please let me know if there is something I should
be doing differently.
Thanks,
Currell
Index: Makefile
===
RCS file: /cvs/ports/devel/tkcvs/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile 22 Jan 2015 18:41:16 - 1.33
+++ Makefile 18 Mar 2018 03:17:00 -
@@ -1,15 +1,18 @@
# $OpenBSD: Makefile,v 1.33 2015/01/22 18:41:16 naddy Exp $
-COMMENT= graphical frontend to CVS
-DISTNAME= tkcvs-6.0
-REVISION = 5
+COMMENT= graphical frontend to CVS and SVN
+DISTNAME= tkcvs-8.2.3
+REVISION = 6
CATEGORIES= devel
MAINTAINER= Todd T. Fries
+# License GPLv2 only
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES=
http://www.neosoft.com/tcl/ftparchive/sorted/packages-7.6/apps/tkcvs-6.0/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tkcvs/} \
+ http://www.twobarleycorns.net/
+
MODULES= x11/tk
RUN_DEPENDS= ${MODTK_RUN_DEPENDS}
@@ -18,11 +21,7 @@ BUILD_DEPENDS= ${RUN_DEPENDS}
NO_BUILD= Yes
NO_TEST= Yes
-pre-configure:
- @${MODTCL_TCLSH_ADJ} ${WRKSRC}/tkcvs/cvscheck.blank
- @${SUBST_CMD} ${WRKSRC}/tkcvs/doinstall
-
do-install:
- cd $(WRKSRC)/tkcvs; ./doinstall
+ cd ${WRKSRC} && $(MODTCL_BIN) ./doinstall.tcl -nox ${PREFIX}
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/tkcvs/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 18 Jan 2015 03:13:48 - 1.4
+++ distinfo 18 Mar 2018 03:17:00 -
@@ -1,2 +1,2 @@
-SHA256 (tkcvs-6.0.tar.gz) = PfT5mVOrZD5/mxg6zDHNJbt5CpKdlgKePwl+XhH4KXI=
-SIZE (tkcvs-6.0.tar.gz) = 102022
+SHA256 (tkcvs-8.2.3.tar.gz) = S/sp3Z/7u8Hm5hHhx3KvdF10LTNueXvwVtv3ARa44yo=
+SIZE (tkcvs-8.2.3.tar.gz) = 570910
Index: pkg/DESCR
===
RCS file: /cvs/ports/devel/tkcvs/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- pkg/DESCR 15 Apr 2010 13:27:47 - 1.2
+++ pkg/DESCR 18 Mar 2018 03:17:00 -
@@ -1,35 +1,15 @@
-README for tkCVS release 6.0
+TkCVS is a Tcl/Tk-based graphical interface to the CVS and Subversion
+configuration management systems. It will also help with RCS. The
user interface
+is consistent across Unix/Linux, Windows, and MacOS X. TkDiff is included for
+browsing and merging your changes.
+
+It shows the status of the files in the current working directory,
and has tools
+for tagging, merging, importing, exporting, checking in/out, and other user
+operations.
+
+TkCVS also aids in browsing the repository. For Subversion, the repository tree
+is browsed like an ordinary file tree. For CVS, the CVSROOT/modules file is
+read. TkCVS extends CVS with a method to produce a "user friendly" listing of
+modules by using special comments in the CVSROOT/modules file.
-tkCVS is a Tk based graphical interface to the CVS configuration
-management system. It includes facilities for providing "user
-friendly" names to modules and directories within the repository, and
-provides a facility to interactively browse the repository looking for
-modules and directories.
-
-Some of the features of tkCVS include:
-
-- File and directory browser, with optional display of hidden
- files, and display of the current directory's location within
- the CVS tree.
-
-- Push-button based check-in / check-out of CVS modules. Ability
- to add and delete files from the repository also using push
- buttons.
-
-- Module tree browser, and reports showing the structure of the
- CVS modules tree. Individual modules or entire directory trees
- may be checked out using the browser.
-
-- Updating of files from the repository when they change.
-
-- Tagging and branching of files from the file browser, and tagging
- and branching of modules from the module browser.
-
-- Exporting a CVS module or directory from the repository for
- delivery off-site.
-
-- Creation of patch files between two releases of a module, or
- between a release and the current (head) version.
-
-- Viewing of diff and status listings for currently checked out
- modules.
+TkCVS is free and open-source.
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/tkcvs/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST 8 Feb 2014 14:57:35 - 1.8
+++ pkg/PLIST 18 Mar 2018 03:17:00 -
@@ -1,48 +1,128 @@
-@comment $OpenBSD: PLIST,v 1.8 2014/02/08 14:57:35 espie Exp $
+@comment $OpenBSD$
@conflict tkdiff-*
-@conf
[UPDATE] games/cataclysm-dda -> 20180314
I've actually had some time to catch Cataclysm up to a fairly recent commit. The last last moth and a half has brought many changes and bug fixes to the game. Some highlights include: Update to the ChestHole tileset New 'seeds' category Cash cards are finally displayed in dollars instead of cents. Removed prepper house as a starting location so you don't step on a landmine and die on your first move Cars now have dashboards Fix to low level mutations Translations updates Tim. Index: Makefile === RCS file: /cvs/ports/games/cataclysm-dda/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- Makefile5 Mar 2018 09:44:06 - 1.4 +++ Makefile17 Mar 2018 01:12:44 - @@ -1,12 +1,12 @@ # $OpenBSD: Makefile,v 1.4 2018/03/05 09:44:06 sthen Exp $ COMMENT= rogue-like zombie survival game -DISTNAME= cataclysm-dda-2018.02.01 +DISTNAME= cataclysm-dda-2018.03.14 CATEGORIES=games GH_ACCOUNT=CleverRaven GH_PROJECT=Cataclysm-DDA -GH_COMMIT= cf64a8836391ba742ce1eca500e1e0409a654d83 +GH_COMMIT= d6381a8725fdd587a80690625e1810e84ed8b69d HOMEPAGE= http://en.cataclysmdda.com MAINTAINER=Tim Meunier Index: distinfo === RCS file: /cvs/ports/games/cataclysm-dda/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo5 Mar 2018 09:44:06 - 1.3 +++ distinfo17 Mar 2018 01:12:44 - @@ -1,2 +1,2 @@ -SHA256 (cataclysm-dda-2018.02.01-cf64a883.tar.gz) = PqoXPbvHznM8ezzgbiejZZ7xuyzhI+iyWlBB7bXgHTk= -SIZE (cataclysm-dda-2018.02.01-cf64a883.tar.gz) = 60095165 +SHA256 (cataclysm-dda-2018.03.14-d6381a87.tar.gz) = j7EC7t6nx0eJaxjrm9fYoe6YMtiZKMvaVoXrhDsFKhY= +SIZE (cataclysm-dda-2018.03.14-d6381a87.tar.gz) = 60310694 Index: patches/patch-Makefile === RCS file: /cvs/ports/games/cataclysm-dda/patches/patch-Makefile,v retrieving revision 1.4 diff -u -p -r1.4 patch-Makefile --- patches/patch-Makefile 5 Mar 2018 09:44:06 - 1.4 +++ patches/patch-Makefile 17 Mar 2018 01:12:44 - @@ -37,7 +37,7 @@ Index: Makefile endif CXXFLAGS += $(WARNINGS) $(DEBUG) $(DEBUGSYMS) $(PROFILE) $(OTHERS) -MMD -MP -@@ -407,11 +405,6 @@ ifdef MAPSIZE +@@ -409,11 +407,6 @@ ifdef MAPSIZE CXXFLAGS += -DMAPSIZE=$(MAPSIZE) endif @@ -49,7 +49,7 @@ Index: Makefile PKG_CONFIG = $(CROSS)pkg-config SDL2_CONFIG = $(CROSS)sdl2-config -@@ -716,7 +709,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(ODIR) $(OBJS) +@@ -718,7 +711,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(ODIR) $(OBJS) .PHONY: version json-verify version: @( VERSION_STRING=$(VERSION) ; \ @@ -57,7 +57,7 @@ Index: Makefile [ -e "$(SRC_DIR)/version.h" ] && OLDVERSION=$$(grep VERSION $(SRC_DIR)/version.h|cut -d '"' -f2) ; \ if [ "x$$VERSION_STRING" != "x$$OLDVERSION" ]; then echo "#define VERSION \"$$VERSION_STRING\"" | tee $(SRC_DIR)/version.h ; fi \ ) -@@ -770,35 +762,35 @@ distclean: +@@ -772,35 +764,35 @@ distclean: bindist: $(BINDIST) ifeq ($(TARGETSYSTEM), LINUX) @@ -112,7 +112,7 @@ Index: Makefile mkdir -p $(LOCALE_DIR) ifdef LANGUAGES LOCALE_DIR=$(LOCALE_DIR) lang/compile_mo.sh $(LANGUAGES) -@@ -966,11 +958,6 @@ astyle: $(ASTYLED_WHITELIST) +@@ -968,11 +960,6 @@ astyle: $(ASTYLED_WHITELIST) astyle-all: $(SOURCES) $(HEADERS) $(TESTSRC) $(TESTHDR) $(TOOLSRC) $(ASTYLE_BINARY) --options=.astylerc -n $(SOURCES) $(HEADERS) $(ASTYLE_BINARY) --options=.astylerc -n $(TESTSRC) $(TESTHDR) Index: pkg/PLIST === RCS file: /cvs/ports/games/cataclysm-dda/pkg/PLIST,v retrieving revision 1.3 diff -u -p -r1.3 PLIST --- pkg/PLIST 5 Mar 2018 09:44:06 - 1.3 +++ pkg/PLIST 17 Mar 2018 01:12:45 - @@ -75,6 +75,7 @@ share/cataclysm-dda/json/items/ammo/300. share/cataclysm-dda/json/items/ammo/3006.json share/cataclysm-dda/json/items/ammo/308.json share/cataclysm-dda/json/items/ammo/32.json +share/cataclysm-dda/json/items/ammo/357.json share/cataclysm-dda/json/items/ammo/36paper.json share/cataclysm-dda/json/items/ammo/38.json share/cataclysm-dda/json/items/ammo/40.json @@ -177,6 +178,7 @@ share/cataclysm-dda/json/items/gun/300.j share/cataclysm-dda/json/items/gun/3006.json share/cataclysm-dda/json/items/gun/308.json share/cataclysm-dda/json/items/gun/32.json +share/cataclysm-dda/json/items/gun/357.json share/cataclysm-dda/json/items/gun/36paper.json share/cataclysm-dda/json/items/gun/38.json share/cataclysm-dda/json/items/gun/40.json @@ -210,7 +212,6 @@ share/cataclysm-dda/json/items/gun/ups.j share/cataclysm-dda/json/items/gunmod/ share/cataclysm-dda/json/items/gunmod/accessories.json share/cataclysm-dda/json/items/gunmod/barre
Re: drop opencore-amr from SoX
On Mar 17 16:15:36, s...@spacehopper.org wrote: > done sox/imagination. Thanks. > it might still be useful for pjsua though > so i'd be inclined to keep that. My real goal is to drop opencore-amr altogether, these are the individual steps to not use it. pjsua has no maintainer - do pjsua users have an opinion on this? I have never seen the AMR codec used in an actual pjsua conversation. Jan
Re: move requests back to pypi (instead of GH_*)
On 2018/03/17 12:37, Daniel Jakots wrote: > > I don't know how much we want this diff or if we just want to wait next > update (so post 6.3 tag) to do this move? post 6.3 makes more sense to me, it's better to spend time on things that actually improve the release now.
Re: Security update: audio/tremor
On 2018/03/17 01:55, Christian Weisgerber wrote: > audio/tremor received a fix for CVE-2018-5146 (out-of-bounds write > on codebook decoding). Since there are no releases, I checked out > head from git and rolled my own tarball. It also includes some > other fixes accumulated over the years. > > OK? OK. > Everybody is investing minimal effort in this, myself included. > As soon as arm gets hardfloat, I suggest we remove tremor from the > tree with extreme prejudice. I agree
drop opencore-amr from pjsua
Tested on current/amd64 and current/macppc.
Jan
Index: Makefile
===
RCS file: /cvs/ports/telephony/pjsua/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile5 Aug 2017 12:31:01 - 1.43
+++ Makefile17 Mar 2018 16:39:56 -
@@ -4,7 +4,7 @@ COMMENT-main= multimedia communication l
COMMENT-pjsua= lightweight sip client
V= 2.4.5
-REVISION= 2
+REVISION= 3
DISTNAME= pjproject-$V
PKGNAME-main= pjsip-$V
PKGNAME-pjsua= pjsua-$V
@@ -35,7 +35,7 @@ MASTER_SITES= ${HOMEPAGE}release/$V/
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += crypto gsm m opencore-amrnb opencore-amrwb portaudio pthread
+WANTLIB += crypto gsm m portaudio pthread
WANTLIB += speex speexdsp ssl
WANTLIB-pjsua += ${WANTLIB}
@@ -48,7 +48,6 @@ WANTLIB-main = ${WANTLIB} ${COMPILER_LIB
MULTI_PACKAGES=-main -pjsua
LIB_DEPENDS-main= audio/gsm \
- audio/opencore-amr \
audio/portaudio-svn \
audio/speex
@@ -63,6 +62,7 @@ AUTOCONF_VERSION= 2.69
CONFIGURE_ARGS=--enable-shared \
--disable-oss \
--disable-video \
+ --disable-opencore-amr \
--with-external-gsm \
--with-external-pa \
--with-external-speex \
move requests back to pypi (instead of GH_*)
Hi,
shadchin@ moved requests from PYPI to GH when he updated it to 2.10.0
because in the PYPI tgz, tests weren't included.
A friend of mine noticed it was a 'bug' on requests side and they now
include the tests in the PYPI tgz since commit 2667c77 [0].
I looked to switch back to PYPI. I extracted both tgz and looked for
difference because make makesum said
-SIZE (requests-2.18.4.tar.gz) = 3040025
+SIZE (requests-2.18.4.tar.gz) = 126224
It's because the GH tgz has docs and other things. OTOH, the src
code is the same:
$ diff -pruN pypi/requests-2.18.4/requests gh/requests-2.18.4/requests
-> returns nothing.
$ diff -pruN pypi/requests-2.18.4/tests gh/requests-2.18.4/tests ->
returns nothing as well.
I don't know how much we want this diff or if we just want to wait next
update (so post 6.3 tag) to do this move?
Cheers,
Daniel
[0]:
https://github.com/requests/requests/commit/2667c772b905aaba37dfefc33835ef769286776c
Index: Makefile
===
RCS file: /cvs/ports/www/py-requests/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile21 Jan 2018 23:20:10 - 1.26
+++ Makefile17 Mar 2018 16:36:55 -
@@ -3,11 +3,12 @@
COMMENT= elegant and simple HTTP library for Python
MODPY_EGG_VERSION= 2.18.4
-PKGNAME= py-requests-${MODPY_EGG_VERSION}
+DISTNAME= requests-${MODPY_EGG_VERSION}
+PKGNAME= py-${DISTNAME}
+REVISION= 0
-GH_ACCOUNT=kennethreitz
-GH_PROJECT=requests
-GH_TAGNAME=v${MODPY_EGG_VERSION}
+# XXX remove during next update
+DISTFILES =${DISTNAME}_1{${DISTNAME}}${EXTRACT_SUFX}
CATEGORIES=www
@@ -36,6 +37,7 @@ FLAVORS= python3
FLAVOR?=
MODPY_SETUPTOOLS= Yes
+MODPY_PI= Yes
WRKDIST= ${WRKDIR}/requests-${MODPY_EGG_VERSION}
Index: distinfo
===
RCS file: /cvs/ports/www/py-requests/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo21 Jan 2018 23:20:10 - 1.20
+++ distinfo17 Mar 2018 16:36:55 -
@@ -1,2 +1,2 @@
-SHA256 (requests-2.18.4.tar.gz) = sGjMzjtzminL9yFIsP9L49gBmPt829YwZvc4S7Vu+Rc=
-SIZE (requests-2.18.4.tar.gz) = 3040025
+SHA256 (requests-2.18.4_1.tar.gz) =
nEQ+cyS6W4UHDEqBit4ov6vt8W6hAgbaETLtqm3aI34=
+SIZE (requests-2.18.4_1.tar.gz) = 126224
Porting ruby bundler software
Hi, while I am busy with teaching Vagrant how to use VMM (and more) to be a fully supported host/provider, I struggle with creating a port of Vagrant itself. I managed the very basics so that 'make extract' works fine, but I've only seen ports that use a 'gem' for CONFIGURE_STYLE - which would download a .gem. If one could shoot me on the right moon (which RTFM) or want to collaborate on that, that would be highly appreciated, since the timeslots working on the actual thing are already filled and BSDCan is coming close at warp speed - as always. Makefile: === # this relies on vmm(4) ONLY_FOR_ARCHS =amd64 i386 COMMENT = lifecycle manager for VMs GH_ACCOUNT =hashicorp GH_PROJECT =vagrant GH_TAGNAME =v2.0.2 CATEGORIES =misc HOMEPAGE = https://www.vagrantup.com/ # MIT PERMIT_PACKAGE_CDROM = Yes RUN_DEPENDS = lang/ruby BUILD_DEPENDS = devel/ruby-bundler CONFIGURE_STYLE = ruby-bundler # wants a .gem from DIST .include === TIA, -- pb
drop opencore-amr from imagination
This accompanies the removal of AMR from SoX: multimedia/imagination pulls the WANTLIB through the SoX dependency. Tested on current/amd64. Jan Index: Makefile === RCS file: /cvs/ports/multimedia/imagination/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- Makefile23 Oct 2017 17:10:52 - 1.13 +++ Makefile17 Mar 2018 15:36:33 - @@ -2,7 +2,7 @@ COMMENT = lightweight and simple DVD slide show maker DISTNAME = imagination-3.0 -REVISION = 6 +REVISION = 7 CATEGORIES = multimedia @@ -17,8 +17,8 @@ WANTLIB += FLAC X11 Xcomposite Xcursor X WANTLIB += Xinerama Xrandr Xrender atk-1.0 c cairo expat ffi fontconfig WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gsm gthread-2.0 gtk-x11-2.0 -WANTLIB += harfbuzz iconv id3tag intl m mad mp3lame ogg opencore-amrnb -WANTLIB += opencore-amrwb opus opusfile pango-1.0 pangocairo-1.0 +WANTLIB += harfbuzz iconv id3tag intl m mad mp3lame ogg +WANTLIB += opus opusfile pango-1.0 pangocairo-1.0 WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread WANTLIB += sndfile sndio sox twolame vorbis vorbisenc vorbisfile WANTLIB += wavpack xcb xcb-render xcb-shm z
drop opencore-amr from SoX
OK, I'll try again.
> > On 2017/09/15 07:56, Jan Stary wrote:
> > > A new version of opencore-amr is out since January.
> > > Before I upgrade the port, shouldn't we rather drop it?
> > >
> > > Originaly, I added the opencore-amr port to have AMR in SoX,
> > > because AMR is what Android recorded by default in its voice recorder.
> > > That's no longer true ("normal quality" is m4a, "high quality" is wav),
> > > and I have no other use of the amr codec.
> > >
> > > Also, it is encumbered with patents.
> > >
> > > Does anyone need audio/opencore-amr?
The diff below removes opencore-amr from SoX.
Tested on current/amd64 and current/macppc.
Jan
Index: Makefile
===
RCS file: /cvs/ports/audio/sox/Makefile,v
retrieving revision 1.68
diff -u -p -r1.68 Makefile
--- Makefile22 Sep 2016 19:58:22 - 1.68
+++ Makefile17 Mar 2018 14:50:54 -
@@ -5,21 +5,19 @@ BROKEN-hppa = bend.c:155:12: internal co
COMMENT= Sound eXchange, the Swiss Army knife of audio manipulation
DISTNAME= sox-14.4.2
-REVISION= 2
+REVISION= 3
SHARED_LIBS += sox 4.0 # 3.0
CATEGORIES=audio
HOMEPAGE= http://sox.sourceforge.net/
MAINTAINER=Jan Stary
-# code is GPLv2+, however as opencore is under Apache License we must use
-# sox under the terms of GPLv3 to avoid license conflict.
+# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += c m z sndio
WANTLIB += FLAC gsm mad id3tag mp3lame ogg
WANTLIB += sndfile vorbis vorbisenc vorbisfile
-WANTLIB += opencore-amrnb opencore-amrwb
WANTLIB += opus opusfile twolame wavpack
WANTLIB += iconv png
@@ -35,7 +33,6 @@ LIB_DEPENDS= \
audio/libogg\
audio/libsndfile\
audio/libvorbis \
- audio/opencore-amr \
audio/opus \
audio/opusfile \
audio/twolame \
@@ -75,8 +72,8 @@ CONFIGURE_ARGS+= \
--with-oggvorbis\
--with-opus \
--with-flac \
- --with-amrwb\
- --with-amrnb\
+ --without-amrwb \
+ --without-amrnb \
--with-wavpack \
--with-sndfile \
--with-mp3 \
Re: update libsndfile to 1.0.28
On Mar 13 21:58:50, s...@spacehopper.org wrote: > On 2018/03/11 20:53, Jan Stary wrote: > > On Mar 11 13:57:13, h...@stare.cz wrote: > > > Tested on current amd64, macppc and armv7; please test everywhere. > > > > sox works fine happy with the new version > > > > Jan > > > > Lots of functions removed and the direct dependencies chain to a lot > more things in the ports tree. > > $ sqlite3 /usr/local/share/sqlports "select fullpkgpath from depends where > dependspath='audio/libsndfile'" Thanks for the list; I took a subset of it. The followign build fine on current/amd64 and current/macppc: audio/fluidsynth audio/herrie audio/jack audio/libbs2b audio/libsamplerate audio/pulseaudio audio/siren audio/sox audio/speech-dispatcher audio/twolame audio/vamp-plugin-sdk comms/minimodem emulators/mednafen Jan
UPDATE: x11/dmenu 4.7 -> 4.8
Trivial update with patch simplications as done in x11/st; dmenu
continues to work for me on amd64.
jim@ has been inactive since 2014, so I'll take over MAINTAINER.
OK?
Index: Makefile
===
RCS file: /cvs/ports/x11/dmenu/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile10 May 2017 22:06:33 - 1.22
+++ Makefile17 Mar 2018 13:57:45 -
@@ -1,24 +1,35 @@
# $OpenBSD: Makefile,v 1.22 2017/05/10 22:06:33 jung Exp $
COMMENT= dynamic menu for X11
-DISTNAME= dmenu-4.7
+
+V= 4.8
+DISTNAME= dmenu-${V}
CATEGORIES=x11
-HOMEPAGE= http://tools.suckless.org/dmenu
-MAINTAINER=Jim Razmus II
+HOMEPAGE= https://tools.suckless.org/dmenu
+
+MAINTAINER=Klemens Nanni
# MIT/X
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= X11 Xinerama c Xft fontconfig
+WANTLIB= X11 Xinerama Xft c fontconfig
-MASTER_SITES= http://dl.suckless.org/tools/
+MASTER_SITES= https://dl.suckless.org/tools/
RUN_DEPENDS= fonts/terminus-font
-FAKE_FLAGS=DESTDIR=""
+MAKE_ENV= LDFLAGS="${LDFLAGS}" \
+ X11INC=${X11BASE}/include \
+ X11LIB=${X11BASE}/lib
NO_TEST= Yes
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/{dmenu,stest} ${PREFIX}/bin/
+ ${INSTALL_SCRIPT} ${WRKSRC}/dmenu_{run,path} ${PREFIX}/bin/
+ ${INSTALL_MAN} ${WRKSRC}/*.1 ${PREFIX}/man/man1/
+ sed -i s/VERSION/${V}/g ${PREFIX}/man/man1/*.1
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/dmenu/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo10 May 2017 22:06:33 - 1.16
+++ distinfo17 Mar 2018 13:57:45 -
@@ -1,2 +1,2 @@
-SHA256 (dmenu-4.7.tar.gz) = p1Y1+NwsvCgN7suQatm3WUxcMWIOSgG6MNyDmEiB97k=
-SIZE (dmenu-4.7.tar.gz) = 15597
+SHA256 (dmenu-4.8.tar.gz) = /mFaXDYHBh4hBnAIYugqxiqfoeanrD1hapx2EGR222E=
+SIZE (dmenu-4.8.tar.gz) = 15658
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 10 May 2017 22:06:33 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,56 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.4 2017/05/10 22:06:33 jung Exp $
Makefile.orig Mon May 8 19:25:36 2017
-+++ Makefile Mon May 8 19:32:43 2017
-@@ -15,8 +15,7 @@ options:
- @echo "CC = ${CC}"
-
- .c.o:
-- @echo CC $<
-- @${CC} -c ${CFLAGS} $<
-+ ${CC} -c ${CFLAGS} $<
-
- config.h:
- @echo creating $@ from config.def.h
-@@ -25,12 +24,10 @@ config.h:
- ${OBJ}: arg.h config.h config.mk drw.h
-
- dmenu: dmenu.o drw.o util.o
-- @echo CC -o $@
-- @${CC} -o $@ dmenu.o drw.o util.o ${LDFLAGS}
-+ ${CC} -o $@ dmenu.o drw.o util.o ${LDFLAGS}
-
- stest: stest.o
-- @echo CC -o $@
-- @${CC} -o $@ stest.o ${LDFLAGS}
-+ ${CC} -o $@ stest.o ${LDFLAGS}
-
- clean:
- @echo cleaning
-@@ -47,19 +44,14 @@ dist: clean
- @rm -rf dmenu-${VERSION}
-
- install: all
-- @echo installing executables to ${DESTDIR}${PREFIX}/bin
-- @mkdir -p ${DESTDIR}${PREFIX}/bin
-- @cp -f dmenu dmenu_path dmenu_run stest ${DESTDIR}${PREFIX}/bin
-- @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
-- @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_path
-- @chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
-- @chmod 755 ${DESTDIR}${PREFIX}/bin/stest
-- @echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1
-- @mkdir -p ${DESTDIR}${MANPREFIX}/man1
-- @sed "s/VERSION/${VERSION}/g" < dmenu.1 >
${DESTDIR}${MANPREFIX}/man1/dmenu.1
-- @sed "s/VERSION/${VERSION}/g" < stest.1 >
${DESTDIR}${MANPREFIX}/man1/stest.1
-- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1
-- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/stest.1
-+ ${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
-+ ${BSD_INSTALL_PROGRAM} dmenu dmenu_path dmenu_run stest
${DESTDIR}${PREFIX}/bin
-+ ${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
-+ sed "s/VERSION/${VERSION}/g" < dmenu.1 > dmenu.1.tmp
-+ sed "s/VERSION/${VERSION}/g" < stest.1 > stest.1.tmp
-+ mv dmenu.1.tmp dmenu.1
-+ mv stest.1.tmp stest.1
-+ ${BSD_INSTALL_MAN} dmenu.1 stest.1 ${DESTDIR}${MANPREFIX}/man1
-
- uninstall:
- @echo removing executables from ${DESTDIR}${PREFIX}/bin
Index: patches/patch-config_mk
===
RCS file: /cvs/ports/x11/dmenu/patches/patch-config_mk,v
retrieving revision 1.12
diff -u -p -r1.12 patch-config_mk
--- patches/patch-config_mk 10 May 2017 22:06:33 - 1.12
+++ patches/patch-config_mk 17 Mar 2018 13:57:45 -
@@ -1,44 +1,2
Re: drop opencore-amr?
Ping On 17 Mar 2018 3:32 pm, "Jan Stary" wrote: > ping > > On Jan 28 09:08:24, h...@stare.cz wrote: > > ping > > > > On Nov 01 14:49:04, h...@stare.cz wrote: > > > ping > > > > > > On Sep 20 15:13:33, h...@stare.cz wrote: > > > > On Sep 20 15:05:01, h...@stare.cz wrote: > > > > > Below is a diff that unhooks opencore-amr from audio/Makefile > > > > > and removes the dependency from audio/sox, multimedia/imagination, > > > > > and telephony/pjsua. Please correct me where I missed something. > > > > > > > > On Sep 20 13:11:38, s...@spacehopper.org wrote: > > > > > multimedia/imagination just picks up the library dependency from > sox. > > > > > Regen wantlib and bump REVISION to fix. > > > > > For telephony/pjsua just remove the dep/wantlib, add > > > > > --disable-opencore-amr to CONFIGURE_ARGS, and bump. > > > > > > > > Better diff below, except I don't know how to convey > > > > the actual removal of the audio/opencore-amr directory in a diff. > > > > > > > > Jan > > > > > > > > > > > > Index: audio/Makefile > > > > === > > > > RCS file: /cvs/ports/audio/Makefile,v > > > > retrieving revision 1.391 > > > > diff -u -p -r1.391 Makefile > > > > --- audio/Makefile17 Sep 2017 16:45:29 - 1.391 > > > > +++ audio/Makefile20 Sep 2017 13:10:19 - > > > > @@ -142,7 +142,6 @@ > > > > SUBDIR += ocp > > > > SUBDIR += oggtag > > > > SUBDIR += openal > > > > - SUBDIR += opencore-amr > > > > SUBDIR += opennap > > > > SUBDIR += opus > > > > SUBDIR += opus-tools > > > > Index: audio/sox/Makefile > > > > === > > > > RCS file: /cvs/ports/audio/sox/Makefile,v > > > > retrieving revision 1.68 > > > > diff -u -p -r1.68 Makefile > > > > --- audio/sox/Makefile22 Sep 2016 19:58:22 - 1.68 > > > > +++ audio/sox/Makefile20 Sep 2017 13:10:19 - > > > > @@ -5,21 +5,19 @@ BROKEN-hppa = bend.c:155:12: internal co > > > > COMMENT= Sound eXchange, the Swiss Army knife of audio manipulation > > > > > > > > DISTNAME=sox-14.4.2 > > > > -REVISION=2 > > > > +REVISION=3 > > > > SHARED_LIBS += sox 4.0 # 3.0 > > > > > > > > CATEGORIES= audio > > > > HOMEPAGE=http://sox.sourceforge.net/ > > > > MAINTAINER= Jan Stary > > > > > > > > -# code is GPLv2+, however as opencore is under Apache License we > must use > > > > -# sox under the terms of GPLv3 to avoid license conflict. > > > > +# GPLv2+ > > > > PERMIT_PACKAGE_CDROM=Yes > > > > > > > > WANTLIB += c m z sndio > > > > WANTLIB += FLAC gsm mad id3tag mp3lame ogg > > > > WANTLIB += sndfile vorbis vorbisenc vorbisfile > > > > -WANTLIB += opencore-amrnb opencore-amrwb > > > > WANTLIB += opus opusfile twolame wavpack > > > > WANTLIB += iconv png > > > > > > > > @@ -35,7 +33,6 @@ LIB_DEPENDS=\ > > > > audio/libogg\ > > > > audio/libsndfile\ > > > > audio/libvorbis \ > > > > - audio/opencore-amr \ > > > > audio/opus \ > > > > audio/opusfile \ > > > > audio/twolame \ > > > > @@ -75,8 +72,8 @@ CONFIGURE_ARGS+=\ > > > > --with-oggvorbis\ > > > > --with-opus \ > > > > --with-flac \ > > > > - --with-amrwb\ > > > > - --with-amrnb\ > > > > + --without-amrwb \ > > > > + --without-amrnb \ > > > > --with-wavpack \ > > > > --with-sndfile \ > > > > --with-mp3 \ > > > > Index: multimedia/imagination/Makefile > > > > === > > > > RCS file: /cvs/ports/multimedia/imagination/Makefile,v > > > > retrieving revision 1.12 > > > > diff -u -p -r1.12 Makefile > > > > --- multimedia/imagination/Makefile 22 Sep 2016 21:30:17 > - 1.12 > > > > +++ multimedia/imagination/Makefile 20 Sep 2017 13:10:34 - > > > > @@ -2,7 +2,7 @@ > > > > > > > > COMMENT =lightweight and simple DVD slide show maker > > > > DISTNAME = imagination-3.0 > > > > -REVISION = 5 > > > > +REVISION = 6 > > > > > > > > CATEGORIES = multimedia > > > > > > > > @@ -17,8 +17,8 @@ WANTLIB += FLAC X11 Xcomposite Xcursor X > > > > WANTLIB += Xinerama Xrandr Xrender atk-1.0 c cairo expat ffi > fontconfig > > > > WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 > > > > WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gsm gthread-2.0 > gtk-x11-2.0 > > > > -WANTLIB += harfbuzz iconv id3tag intl m mad mp3lame ogg > opencore-amrnb > > > > -WANTLIB += opencore-amrwb opus opusfile pango-1.0 pangocairo-1.0 > > > > +WANTLIB += harfbuzz iconv id3tag intl m mad mp3lame ogg > > > > +WANTLIB += opus opusfile pango-1.0 pangocairo-1.0 > > > > WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs > > > >
Re: drop opencore-amr?
ping On Jan 28 09:08:24, h...@stare.cz wrote: > ping > > On Nov 01 14:49:04, h...@stare.cz wrote: > > ping > > > > On Sep 20 15:13:33, h...@stare.cz wrote: > > > On Sep 20 15:05:01, h...@stare.cz wrote: > > > > Below is a diff that unhooks opencore-amr from audio/Makefile > > > > and removes the dependency from audio/sox, multimedia/imagination, > > > > and telephony/pjsua. Please correct me where I missed something. > > > > > > On Sep 20 13:11:38, s...@spacehopper.org wrote: > > > > multimedia/imagination just picks up the library dependency from sox. > > > > Regen wantlib and bump REVISION to fix. > > > > For telephony/pjsua just remove the dep/wantlib, add > > > > --disable-opencore-amr to CONFIGURE_ARGS, and bump. > > > > > > Better diff below, except I don't know how to convey > > > the actual removal of the audio/opencore-amr directory in a diff. > > > > > > Jan > > > > > > > > > Index: audio/Makefile > > > === > > > RCS file: /cvs/ports/audio/Makefile,v > > > retrieving revision 1.391 > > > diff -u -p -r1.391 Makefile > > > --- audio/Makefile17 Sep 2017 16:45:29 - 1.391 > > > +++ audio/Makefile20 Sep 2017 13:10:19 - > > > @@ -142,7 +142,6 @@ > > > SUBDIR += ocp > > > SUBDIR += oggtag > > > SUBDIR += openal > > > - SUBDIR += opencore-amr > > > SUBDIR += opennap > > > SUBDIR += opus > > > SUBDIR += opus-tools > > > Index: audio/sox/Makefile > > > === > > > RCS file: /cvs/ports/audio/sox/Makefile,v > > > retrieving revision 1.68 > > > diff -u -p -r1.68 Makefile > > > --- audio/sox/Makefile22 Sep 2016 19:58:22 - 1.68 > > > +++ audio/sox/Makefile20 Sep 2017 13:10:19 - > > > @@ -5,21 +5,19 @@ BROKEN-hppa = bend.c:155:12: internal co > > > COMMENT= Sound eXchange, the Swiss Army knife of audio manipulation > > > > > > DISTNAME=sox-14.4.2 > > > -REVISION=2 > > > +REVISION=3 > > > SHARED_LIBS += sox 4.0 # 3.0 > > > > > > CATEGORIES= audio > > > HOMEPAGE=http://sox.sourceforge.net/ > > > MAINTAINER= Jan Stary > > > > > > -# code is GPLv2+, however as opencore is under Apache License we must use > > > -# sox under the terms of GPLv3 to avoid license conflict. > > > +# GPLv2+ > > > PERMIT_PACKAGE_CDROM=Yes > > > > > > WANTLIB += c m z sndio > > > WANTLIB += FLAC gsm mad id3tag mp3lame ogg > > > WANTLIB += sndfile vorbis vorbisenc vorbisfile > > > -WANTLIB += opencore-amrnb opencore-amrwb > > > WANTLIB += opus opusfile twolame wavpack > > > WANTLIB += iconv png > > > > > > @@ -35,7 +33,6 @@ LIB_DEPENDS=\ > > > audio/libogg\ > > > audio/libsndfile\ > > > audio/libvorbis \ > > > - audio/opencore-amr \ > > > audio/opus \ > > > audio/opusfile \ > > > audio/twolame \ > > > @@ -75,8 +72,8 @@ CONFIGURE_ARGS+=\ > > > --with-oggvorbis\ > > > --with-opus \ > > > --with-flac \ > > > - --with-amrwb\ > > > - --with-amrnb\ > > > + --without-amrwb \ > > > + --without-amrnb \ > > > --with-wavpack \ > > > --with-sndfile \ > > > --with-mp3 \ > > > Index: multimedia/imagination/Makefile > > > === > > > RCS file: /cvs/ports/multimedia/imagination/Makefile,v > > > retrieving revision 1.12 > > > diff -u -p -r1.12 Makefile > > > --- multimedia/imagination/Makefile 22 Sep 2016 21:30:17 - > > > 1.12 > > > +++ multimedia/imagination/Makefile 20 Sep 2017 13:10:34 - > > > @@ -2,7 +2,7 @@ > > > > > > COMMENT =lightweight and simple DVD slide show maker > > > DISTNAME = imagination-3.0 > > > -REVISION = 5 > > > +REVISION = 6 > > > > > > CATEGORIES = multimedia > > > > > > @@ -17,8 +17,8 @@ WANTLIB += FLAC X11 Xcomposite Xcursor X > > > WANTLIB += Xinerama Xrandr Xrender atk-1.0 c cairo expat ffi fontconfig > > > WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 > > > WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gsm gthread-2.0 gtk-x11-2.0 > > > -WANTLIB += harfbuzz iconv id3tag intl m mad mp3lame ogg opencore-amrnb > > > -WANTLIB += opencore-amrwb opus opusfile pango-1.0 pangocairo-1.0 > > > +WANTLIB += harfbuzz iconv id3tag intl m mad mp3lame ogg > > > +WANTLIB += opus opusfile pango-1.0 pangocairo-1.0 > > > WANTLIB += pangoft2-1.0 pcre pixman-1 png pthread pthread-stubs > > > WANTLIB += sndfile sndio sox twolame vorbis vorbisenc vorbisfile > > > WANTLIB += wavpack xcb xcb-render xcb-shm z > > > Index: telephony/pjsua/Makefile > > > === > > > RCS file: /cvs/ports/telephony/
Re: UPDATE: x11/st
> On 16. Mar 2018, at 18:31, Klemens Nanni wrote:
>
> On Fri, Mar 16, 2018 at 09:29:50AM +0100, Rafael Sadowski wrote:
>> Simple update to the latest stable version, Ok? Comments?
> Some comments inline with an updated diff in the end, st continues to
> work for me on amd64.
>
>> Index: patches/patch-Makefile
>> ===
>> RCS file: /cvs/ports/x11/st/patches/patch-Makefile,v
>> retrieving revision 1.4
>> diff -u -p -u -p -r1.4 patch-Makefile
>> --- patches/patch-Makefile 9 Jul 2015 22:07:23 - 1.4
>> +++ patches/patch-Makefile 16 Mar 2018 07:51:56 -
>> @@ -1,44 +1,43 @@
>> $OpenBSD: patch-Makefile,v 1.4 2015/07/09 22:07:23 czarkoff Exp $
>> Makefile.orig Tue Jul 7 22:26:44 2015
>> -+++ MakefileThu Jul 9 00:05:58 2015
>> -@@ -18,14 +18,12 @@ config.h:
>> +Index: Makefile
>> +--- Makefile.orig
>> Makefile
>> +@@ -19,7 +19,7 @@ config.h:
>> cp config.def.h config.h
>>
>> .c.o:
>> -- @echo CC $<
>> -- @${CC} -c ${CFLAGS} $<
>> -+ ${CC} -c ${CFLAGS} $<
> These s,{,(, are useless.
I believe this is about removing the @ to silence things.
>> -
>> - ${OBJ}: config.h config.mk
>> -
>> - st: ${OBJ}
>> -- @echo CC -o $@
>> -- @${CC} -o $@ ${OBJ} ${LDFLAGS}
>> -+ ${CC} -o $@ ${OBJ} ${LDFLAGS}
>> +- $(CC) $(STCFLAGS) -c $<
>> ++ ${CC} ${STCFLAGS} -c $<
> Same here.
>
>> +
>> + st.o: config.h st.h win.h
>> + x.o: arg.h st.h win.h
>> +@@ -27,7 +27,7 @@ x.o: arg.h st.h win.h
>> + $(OBJ): config.h config.mk
>> +
>> + st: $(OBJ)
>> +- $(CC) -o $@ $(OBJ) $(STLDFLAGS)
>> ++ ${CC} -o $@ ${OBJ} ${STLDFLAGS}
> And here.
>
>>
>> clean:
>> -@echo cleaning
>> -@@ -40,16 +38,13 @@ dist: clean
>> -@rm -rf st-${VERSION}
>> -
>> - install: all
>> -- @echo installing executable file to ${DESTDIR}${PREFIX}/bin
>> -- @mkdir -p ${DESTDIR}${PREFIX}/bin
>> -- @cp -f st ${DESTDIR}${PREFIX}/bin
>> -- @chmod 755 ${DESTDIR}${PREFIX}/bin/st
>> -- @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
>> -- @mkdir -p ${DESTDIR}${MANPREFIX}/man1
>> -- @sed "s/VERSION/${VERSION}/g" < st.1 > ${DESTDIR}${MANPREFIX}/man1/st.1
>> -- @chmod 644 ${DESTDIR}${MANPREFIX}/man1/st.1
>> -- @echo Please see the README file regarding the terminfo entry of st.
>> -- @tic -s st.info
>> +rm -f st $(OBJ) st-$(VERSION).tar.gz
>> +@@ -41,13 +41,14 @@ dist: clean
>> +rm -rf st-$(VERSION)
>> +
>> + install: st
>> +- mkdir -p $(DESTDIR)$(PREFIX)/bin
>> +- cp -f st $(DESTDIR)$(PREFIX)/bin
>> +- chmod 755 $(DESTDIR)$(PREFIX)/bin/st
>> +- mkdir -p $(DESTDIR)$(MANPREFIX)/man1
>> +${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
>> +${BSD_INSTALL_PROGRAM} st ${DESTDIR}${PREFIX}/bin
>> +${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
>> +sed "s/VERSION/$(VERSION)/g" < st.1 > $(DESTDIR)$(MANPREFIX)/man1/st.1
>> +- chmod 644 $(DESTDIR)$(MANPREFIX)/man1/st.1
>> +- tic -sx st.info
>> +sed "s/VERSION/${VERSION}/g" < st.1 > st.1.tmp
>> +mv st.1.tmp st.1
>> +${BSD_INSTALL_MAN} st.1 ${DESTDIR}${MANPREFIX}/man1
>> +tic -s -o ${DESTDIR}${PREFIX}/share/terminfo st.info
>> +@echo Please see the README file regarding the terminfo entry of st.
> Instead of patching the Makefile, we can simply roll our own do-install,
> that makes it much easier.
This suggestion came up several times in the past. I’m not really against it,
but for consistency I would prefer to keep suckless ports handled similar (dwm,
dmenu, lsw, tabbed, …). Currently, they do the same: patching the Makefiles.
IMHO, it’s easier to detect the rather often occurring changes this way.
>From my experience, suckless community keeps their Makefile changes in-sync
across the different tools. So, if we go this route we probably want to change
the
other ports as well.
Last time this came up czarkoff@ even had the idea to create a suckless ports
module, but that might be a bit over-engineering.
>> Index: patches/patch-config_mk
>> ===
>> RCS file: /cvs/ports/x11/st/patches/patch-config_mk,v
>> retrieving revision 1.9
>> diff -u -p -u -p -r1.9 patch-config_mk
>> --- patches/patch-config_mk 5 Apr 2017 21:29:57 - 1.9
>> +++ patches/patch-config_mk 16 Mar 2018 07:51:56 -
>> @@ -1,12 +1,13 @@
>> $OpenBSD: patch-config_mk,v 1.9 2017/04/05 21:29:57 juanfra Exp $
>> config.mk.orig Thu Aug 11 16:25:58 2016
>> -+++ config.mk Tue Mar 28 12:27:10 2017
>> -@@ -4,24 +4,21 @@ VERSION = 0.7
>> +Index: config.mk
>> +--- config.mk.orig
>> config.mk
>> +@@ -4,24 +4,21 @@ VERSION = 0.8
>> # Customize below to fit your system
>>
>> # paths
>> -PREFIX = /usr/local
>> --MANPREFIX = ${PREFIX}/share/man
>> +-MANPREFIX = $(PREFIX)/share/man
>> +PREFIX ?= /usr/local
>> +MANPREFIX = ${PREFIX}/man
> Just pass those via MAKE_ENV.
>
>>
>> @@ -16,23 +17,23 @@ $OpenBSD: patch-config_mk,v 1.9 2017/04/
>> +X11LIB = ${X11BASE}/lib
[UPDATE] textproc/ruby-kramdown to 1.16.2
Hi ports@,
Here is a diff to update ruby-kramdown to 1.16.2.
The main reason why I would like to update it is that recent versions
support using Rouge (see previously submitted textproc/ruby-rouge port)
for syntax highlighting.
Comments? OK?
Index: Makefile
===
RCS file: /cvs/ports/textproc/ruby-kramdown/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile20 Nov 2017 20:57:17 - 1.7
+++ Makefile16 Mar 2018 22:21:55 -
@@ -2,8 +2,7 @@
COMMENT= fast, pure Ruby Markdown parser
-DISTNAME= kramdown-1.0.2
-REVISION = 2
+DISTNAME= kramdown-1.16.2
CATEGORIES=textproc
Index: distinfo
===
RCS file: /cvs/ports/textproc/ruby-kramdown/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo13 May 2013 06:33:06 - 1.3
+++ distinfo16 Mar 2018 22:21:55 -
@@ -1,2 +1,2 @@
-SHA256 (kramdown-1.0.2.gem) = cwg0ttVyrmd1L0nlZwr1Exil2po4bMv9KpK6Kew6YNw=
-SIZE (kramdown-1.0.2.gem) = 214528
+SHA256 (kramdown-1.16.2.gem) = 6g/+Sy4oaLl2C0qi9za4TlXsf5Sac9PzsC7nAO7FeVY=
+SIZE (kramdown-1.16.2.gem) = 258048
Index: pkg/PLIST
===
RCS file: /cvs/ports/textproc/ruby-kramdown/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 13 May 2013 06:33:06 - 1.3
+++ pkg/PLIST 16 Mar 2018 22:21:56 -
@@ -23,10 +23,10 @@ ${GEM_LIB}/gems/${DISTNAME}/data/kramdow
${GEM_LIB}/gems/${DISTNAME}/data/kramdown/document.html
${GEM_LIB}/gems/${DISTNAME}/data/kramdown/document.latex
${GEM_LIB}/gems/${DISTNAME}/doc/
+${GEM_LIB}/gems/${DISTNAME}/doc/_design.scss
${GEM_LIB}/gems/${DISTNAME}/doc/bg.png
-${GEM_LIB}/gems/${DISTNAME}/doc/default.scss.css
+${GEM_LIB}/gems/${DISTNAME}/doc/default.scss
${GEM_LIB}/gems/${DISTNAME}/doc/default.template
-${GEM_LIB}/gems/${DISTNAME}/doc/design.scss.css
${GEM_LIB}/gems/${DISTNAME}/doc/documentation.page
${GEM_LIB}/gems/${DISTNAME}/doc/documentation.template
${GEM_LIB}/gems/${DISTNAME}/doc/index.page
@@ -38,20 +38,34 @@ ${GEM_LIB}/gems/${DISTNAME}/doc/news.pag
${GEM_LIB}/gems/${DISTNAME}/doc/options.page
${GEM_LIB}/gems/${DISTNAME}/doc/quickref.page
${GEM_LIB}/gems/${DISTNAME}/doc/sidebar.template
+${GEM_LIB}/gems/${DISTNAME}/doc/sitemap.sitemap
${GEM_LIB}/gems/${DISTNAME}/doc/syntax.page
${GEM_LIB}/gems/${DISTNAME}/doc/tests.page
${GEM_LIB}/gems/${DISTNAME}/doc/virtual
${GEM_LIB}/gems/${DISTNAME}/lib/
${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/
${GEM_LIB}/gems/${DISTNAME}/lib/kramdown.rb
-${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/compatibility.rb
${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter/
${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter.rb
${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter/base.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter/hash_ast.rb
${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter/html.rb
${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter/kramdown.rb
${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter/latex.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter/man.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter/math_engine/
+${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter/math_engine/itex2mml.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter/math_engine/mathjax.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter/math_engine/mathjaxnode.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter/math_engine/ritex.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter/math_engine/sskatex.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter/pdf.rb
${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter/remove_html_tags.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter/syntax_highlighter/
+${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter/syntax_highlighter.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter/syntax_highlighter/coderay.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter/syntax_highlighter/minted.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter/syntax_highlighter/rouge.rb
${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/converter/toc.rb
${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/document.rb
${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/element.rb
@@ -60,6 +74,7 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/kramdown
${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/parser/
${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/parser.rb
${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/parser/base.rb
+${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/parser/gfm.rb
${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/parser/html.rb
${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/parser/kramdown/
${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/parser/kramdown.rb
@@ -90,9 +105,12 @@ ${GEM_LIB}/gems/${DISTNAME}/lib/kramdown
${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/parser/markdown.rb
${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/utils/
${GEM_LIB}/gems/${DISTNAME}/lib/kramdown/utils.
Re: UPDATE: x11/st
Much better then my approach. Build and run fine on amd64.
ok rsadowski@
On Sat Mar 17, 2018 at 08:26:41AM +0100, Klemens Nanni wrote:
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/st/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- Makefile 26 Sep 2017 23:03:53 - 1.15
> +++ Makefile 17 Mar 2018 07:19:36 -
> @@ -2,12 +2,12 @@
>
> COMMENT= simple X terminal
>
> -DISTNAME=st-0.7
> -REVISION=1
> +V= 0.8
> +DISTNAME=st-${V}
>
> CATEGORIES= x11
>
> -HOMEPAGE=http://st.suckless.org/
> +HOMEPAGE=https://st.suckless.org/
>
> MAINTAINER= Joerg Jung
>
> @@ -17,11 +17,18 @@ PERMIT_PACKAGE_CDROM= Yes
> # uses pledge()
> WANTLIB= c m util X11 Xft fontconfig freetype z
>
> -MASTER_SITES=http://dl.suckless.org/st/
> +MASTER_SITES=https://dl.suckless.org/st/
>
> -MAKE_ENV=LDFLAGS="${LDFLAGS}"
> -FAKE_FLAGS= DESTDIR=""
> +MAKE_ENV=LDFLAGS="${LDFLAGS}" \
> + X11INC=${X11BASE}/include \
> + X11LIB=${X11BASE}/lib
>
> NO_TEST= Yes
> +
> +do-install:
> + ${INSTALL_PROGRAM} ${WRKSRC}/st ${PREFIX}/bin/
> + ${INSTALL_MAN} ${WRKSRC}/st.1 ${PREFIX}/man/man1/
> + sed -i s/VERSION/${V}/g ${PREFIX}/man/man1/st.1
> + tic -s -x -o ${PREFIX}/share/terminfo ${WRKSRC}/st.info
>
> .include
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/st/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- distinfo 9 Oct 2016 18:47:49 - 1.9
> +++ distinfo 17 Mar 2018 07:19:36 -
> @@ -1,2 +1,2 @@
> -SHA256 (st-0.7.tar.gz) = 94cNkGzMmIkm7vLMmJUKmcx4cltoXpNMQiwDwSNOYAA=
> -SIZE (st-0.7.tar.gz) = 42418
> +SHA256 (st-0.8.tar.gz) = dzU5INB9ZsaEoPV+w3wmcMQv3FyHHWOCtwFgHNxZdXY=
> +SIZE (st-0.8.tar.gz) = 45401
> Index: patches/patch-Makefile
> ===
> RCS file: patches/patch-Makefile
> diff -N patches/patch-Makefile
> --- patches/patch-Makefile9 Jul 2015 22:07:23 - 1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,44 +0,0 @@
> -$OpenBSD: patch-Makefile,v 1.4 2015/07/09 22:07:23 czarkoff Exp $
> Makefile.origTue Jul 7 22:26:44 2015
> -+++ Makefile Thu Jul 9 00:05:58 2015
> -@@ -18,14 +18,12 @@ config.h:
> - cp config.def.h config.h
> -
> - .c.o:
> --@echo CC $<
> --@${CC} -c ${CFLAGS} $<
> -+${CC} -c ${CFLAGS} $<
> -
> - ${OBJ}: config.h config.mk
> -
> - st: ${OBJ}
> --@echo CC -o $@
> --@${CC} -o $@ ${OBJ} ${LDFLAGS}
> -+${CC} -o $@ ${OBJ} ${LDFLAGS}
> -
> - clean:
> - @echo cleaning
> -@@ -40,16 +38,13 @@ dist: clean
> - @rm -rf st-${VERSION}
> -
> - install: all
> --@echo installing executable file to ${DESTDIR}${PREFIX}/bin
> --@mkdir -p ${DESTDIR}${PREFIX}/bin
> --@cp -f st ${DESTDIR}${PREFIX}/bin
> --@chmod 755 ${DESTDIR}${PREFIX}/bin/st
> --@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
> --@mkdir -p ${DESTDIR}${MANPREFIX}/man1
> --@sed "s/VERSION/${VERSION}/g" < st.1 > ${DESTDIR}${MANPREFIX}/man1/st.1
> --@chmod 644 ${DESTDIR}${MANPREFIX}/man1/st.1
> --@echo Please see the README file regarding the terminfo entry of st.
> --@tic -s st.info
> -+${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
> -+${BSD_INSTALL_PROGRAM} st ${DESTDIR}${PREFIX}/bin
> -+${BSD_INSTALL_MAN_DIR} ${DESTDIR}${MANPREFIX}/man1
> -+sed "s/VERSION/${VERSION}/g" < st.1 > st.1.tmp
> -+mv st.1.tmp st.1
> -+${BSD_INSTALL_MAN} st.1 ${DESTDIR}${MANPREFIX}/man1
> -+tic -s -o ${DESTDIR}${PREFIX}/share/terminfo st.info
> -
> - uninstall:
> - @echo removing executable file from ${DESTDIR}${PREFIX}/bin
> Index: patches/patch-config_def_h
> ===
> RCS file: /cvs/ports/x11/st/patches/patch-config_def_h,v
> retrieving revision 1.8
> diff -u -p -r1.8 patch-config_def_h
> --- patches/patch-config_def_h9 Oct 2016 18:47:49 - 1.8
> +++ patches/patch-config_def_h17 Mar 2018 07:19:36 -
> @@ -1,15 +1,7 @@
> $OpenBSD: patch-config_def_h,v 1.8 2016/10/09 18:47:49 czarkoff Exp $
> config.def.h.origSat Oct 8 21:48:13 2016
> -+++ config.def.h Sat Oct 8 21:48:37 2016
> -@@ -5,7 +5,7 @@
> - *
> - * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
> - */
> --static char font[] = "Liberation
> Mono:pixelsize=12:antialias=true:autohint=true";
> -+static char font[] = "DejaVu Sans
> Mono:pixelsize=12:antialias=true:autohint=false";
> - static int borderpx = 2;
> -
> - /*
> +Index: config.def.h
> +--- config.def.h.orig
> config.def.h
> @@ -92,7 +92,7 @@ static const char
Re: UPDATE: databases/redis 4.0.2 -> 4.0.8
On 2018/03/17 08:33, Klemens Nanni wrote:
> Numerous critical bugs have piled up including data corruption, see
> https://raw.githubusercontent.com/antirez/redis/4.0/00-RELEASENOTES
>
> Works fine in my setup, all tests passing on amd64.
>
> Patches have been dropped or simplified a lot by passing variables
> through MAKE_ENV or adding to post-install instead,
> patch-src_mkreleasehdr_sh was useless on its own already.
>
> Whitespace fixes, switch to HTTPS and minor reordering included, too.
>
> Feedback? OK?
It's a lot to change in one go. The version update makes sense, but
I'm not sure about the rest of the shuffling (and in any event,
that sort of thing is better separated from a routine update).
> -MASTER_SITES = http://download.redis.io/releases/
> +MASTER_SITES = https://download.redis.io/releases/
curl: (7) Failed to connect to download.redis.io port 443: Connection refused
> +MAKE_FLAGS = DEBUG=${DEBUG} \
> + DEBUG_FLAGS=${DEBUG} \
> + DEPENDENCY_TARGETS="hiredis linenoise" \
> + INSTALL_SBIN="${PREFIX}/sbin" \
> + MALLOC=libc \
> + OPT= \
> + OPTIMIZATION= \
> V=1
Overrides seem sensible for things like DEBUG (but should be quoted).
For things like DEPENDENCY_TARGETS it's better if a change in the upstream
Makefile causes a patch failure during an update because it will need to
be adapted anyway.
How about just
Index: Makefile
===
RCS file: /cvs/ports/databases/redis/Makefile,v
retrieving revision 1.100
diff -u -p -r1.100 Makefile
--- Makefile11 Jan 2018 19:27:02 - 1.100
+++ Makefile17 Mar 2018 09:49:31 -
@@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.100 2018/01/11 19:27:02 rpe Exp $
COMMENT = persistent key-value database
-DISTNAME = redis-4.0.2
+DISTNAME = redis-4.0.8
CATEGORIES = databases
-HOMEPAGE = http://redis.io/
-REVISION = 0
+HOMEPAGE = https://redis.io/
MAINTAINER = David Coppa
Index: distinfo
===
RCS file: /cvs/ports/databases/redis/distinfo,v
retrieving revision 1.78
diff -u -p -r1.78 distinfo
--- distinfo22 Sep 2017 05:46:35 - 1.78
+++ distinfo17 Mar 2018 09:49:31 -
@@ -1,2 +1,2 @@
-SHA256 (redis-4.0.2.tar.gz) = saCRXbyRuXnQbfGXf+WUw/qbGJ8fPTh0OilIyfdjSBM=
-SIZE (redis-4.0.2.tar.gz) = 1713990
+SHA256 (redis-4.0.8.tar.gz) = /ww4uMFWMZJJ/sYeUBjPW1/mOmW2FpC+x5j0yZjCMq0=
+SIZE (redis-4.0.8.tar.gz) = 1729973
[NEW] textproc/ruby-rouge
Hi ports@, Here is a new port: textproc/ruby-rouge >From DESCR: Rouge is a pure-ruby syntax highlighter. It can highlight 100 different languages, and output HTML or ANSI 256-color text. Its HTML output is compatible with stylesheets designed for pygments. Comments? OK? ruby-rouge.tar.gz Description: application/tar-gz
[PATCH] textproc/ripgrep bump to 0.8.1
Hey,
This bumps ripgrep to 0.8.1. It also adds a build-time dependency on
asciidoc for building the manpage. Tested on amd64.
Please CC me, etc.
Thanks!!
Index: Makefile
===
RCS file: /cvs/ports/textproc/ripgrep/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile30 Jan 2018 03:27:54 - 1.7
+++ Makefile17 Mar 2018 09:13:45 -
@@ -4,7 +4,7 @@ COMMENT = line oriented search tool usi
GH_ACCOUNT = BurntSushi
GH_PROJECT = ripgrep
-GH_TAGNAME = 0.7.1
+GH_TAGNAME = 0.8.1
CATEGORIES = textproc sysutils
@@ -17,56 +17,58 @@ SEPARATE_BUILD =Yes
MODULES = devel/cargo
+BUILD_DEPENDS += textproc/asciidoc
+
# as devel/cargo MODULES adds DISTFILES, GH_* didn't
DISTFILES += ${DISTNAME}${EXTRACT_SUFX}
-MODCARGO_CRATES += aho-corasick-0.6.3 # Unlicense/MIT
-MODCARGO_CRATES += ansi_term-0.9.0 # MIT
-MODCARGO_CRATES += atty-0.2.3 # MIT
-MODCARGO_CRATES += bitflags-0.9.1 # MIT/Apache-2.0
-MODCARGO_CRATES += bytecount-0.1.7 # Apache-2.0/MIT
+MODCARGO_CRATES += aho-corasick-0.6.4 # Unlicense/MIT
+MODCARGO_CRATES += ansi_term-0.10.2# MIT
+MODCARGO_CRATES += atty-0.2.6 # MIT
+MODCARGO_CRATES += bitflags-1.0.1 # MIT/Apache-2.0
+MODCARGO_CRATES += bytecount-0.3.1 # Apache-2.0/MIT
MODCARGO_CRATES += cfg-if-0.1.2# MIT/Apache-2.0
-MODCARGO_CRATES += clap-2.26.2 # MIT
-MODCARGO_CRATES += crossbeam-0.2.10# Apache-2.0/MIT
-MODCARGO_CRATES += encoding_rs-0.7.1 # MIT/Apache-2.0
-MODCARGO_CRATES += env_logger-0.4.3# MIT/Apache-2.0
-MODCARGO_CRATES += fnv-1.0.5 # Apache-2.0 / MIT
-MODCARGO_CRATES += fs2-0.4.2 # MIT/Apache-2.0
-MODCARGO_CRATES += kernel32-sys-0.2.2 # MIT
-MODCARGO_CRATES += lazy_static-0.2.9 # MIT/Apache-2.0
-MODCARGO_CRATES += libc-0.2.32 # MIT/Apache-2.0
-MODCARGO_CRATES += log-0.3.8 # MIT/Apache-2.0
-MODCARGO_CRATES += memchr-1.0.2# Unlicense/MIT
-MODCARGO_CRATES += memchr-2.0.0# Unlicense/MIT
-MODCARGO_CRATES += memmap-0.5.2# MIT/Apache-2.0
-MODCARGO_CRATES += num_cpus-1.7.0 # MIT/Apache-2.0
-MODCARGO_CRATES += redox_syscall-0.1.31# MIT
+MODCARGO_CRATES += clap-2.30.0 # MIT
+MODCARGO_CRATES += crossbeam-0.3.2 # Apache-2.0/MIT
+MODCARGO_CRATES += encoding_rs-0.7.2 # MIT/Apache-2.0
+MODCARGO_CRATES += fnv-1.0.6 # Apache-2.0 / MIT
+MODCARGO_CRATES+= fuchsia-zircon-0.3.3# BSD-3-Clause
+MODCARGO_CRATES+= fuchsia-zircon-sys-0.3.3# BSD-3-Clause
+MODCARGO_CRATES+= glob-0.2.11 # MIT/Apache-2.0
+MODCARGO_CRATES += lazy_static-1.0.0 # MIT/Apache-2.0
+MODCARGO_CRATES += libc-0.2.36 # MIT/Apache-2.0
+MODCARGO_CRATES += log-0.4.1 # MIT/Apache-2.0
+MODCARGO_CRATES += memchr-2.0.1# Unlicense/MIT
+MODCARGO_CRATES += memmap-0.6.2# MIT/Apache-2.0
+MODCARGO_CRATES += num_cpus-1.8.0 # MIT/Apache-2.0
+MODCARGO_CRATES+= rand-0.4.2 # MIT/Apache-2.0
+MODCARGO_CRATES+= rand-0.3.22 # MIT/Apache-2.0
+MODCARGO_CRATES += redox_syscall-0.1.37# MIT
MODCARGO_CRATES += redox_termios-0.1.1 # MIT
-MODCARGO_CRATES += regex-0.2.2 # MIT/Apache-2.0
-MODCARGO_CRATES += regex-syntax-0.4.1 # MIT/Apache-2.0
-MODCARGO_CRATES += same-file-1.0.0 # Unlicense/MIT
-MODCARGO_CRATES += simd-0.1.1 # MIT/Apache-2.0
-MODCARGO_CRATES += simd-0.2.0 # MIT/Apache-2.0
-MODCARGO_CRATES += strsim-0.6.0# MIT
-MODCARGO_CRATES += term_size-0.3.0 # MIT OR Apache-2.0
+MODCARGO_CRATES += regex-0.2.6 # MIT/Apache-2.0
+MODCARGO_CRATES += regex-syntax-0.4.2 # MIT/Apache-2.0
+MODCARGO_CRATES += same-file-1.0.2 # Unlicense/MIT
+MODCARGO_CRATES += simd-0.2.1 # MIT/Apache-2.0
+MODCARGO_CRATES += strsim-0.7.0# MIT
+MODCARGO_CRATES+= tempdir-0.3.5 # MIT/Apache-2.0
MODCARGO_CRATES += termion-1.5.1 # MIT
-MODCARGO_CRATES += textwrap-0.8.0 # MIT
-MODCARGO_CRATES += thread_local-0.3.4 # Apache-2.0/MIT
+MODCARGO_CRATES += textwrap-0.9.0 # MIT
+MODCARGO_CRATES += thread_local-0.3.5 # Apache-2.0/MIT
MODCARGO_CRATES += unicode-width-0.1.4 # MIT/Apache-2.0
MODCARGO_CRATES += unreachable-1.0.0 # MIT / Apache-2.0
MODCARGO_CRATES += utf8-ranges-1.0.0 # Unlicense/MIT
-MODCARGO_CRATES += vec_map-0.8.0 # MIT/Apache-2.0
MODCARGO_CRATES += void-1.0.2 # MIT
-MODCARGO_CRATES += walkdir-2.0.1 # Unlicense/MIT
-MODCARGO_CRATES += winapi-0.2.8# MIT
-MODCARGO_CRATES += winapi-build-0.1.1 # MIT
+MODCARGO_CRATES += walkdir-2.1.4 # Unlicense/MIT
+MODCARGO_CRATES += winapi-0.3.4# MIT
+MODCARGO_CRATES+=
UPDATE: databases/redis 4.0.2 -> 4.0.8
Numerous critical bugs have piled up including data corruption, see
https://raw.githubusercontent.com/antirez/redis/4.0/00-RELEASENOTES
Works fine in my setup, all tests passing on amd64.
Patches have been dropped or simplified a lot by passing variables
through MAKE_ENV or adding to post-install instead,
patch-src_mkreleasehdr_sh was useless on its own already.
Whitespace fixes, switch to HTTPS and minor reordering included, too.
Feedback? OK?
Index: Makefile
===
RCS file: /cvs/ports/databases/redis/Makefile,v
retrieving revision 1.100
diff -u -p -r1.100 Makefile
--- Makefile11 Jan 2018 19:27:02 - 1.100
+++ Makefile17 Mar 2018 07:31:42 -
@@ -1,24 +1,31 @@
# $OpenBSD: Makefile,v 1.100 2018/01/11 19:27:02 rpe Exp $
COMMENT = persistent key-value database
-DISTNAME = redis-4.0.2
+DISTNAME = redis-4.0.8
+
CATEGORIES = databases
-HOMEPAGE = http://redis.io/
-REVISION = 0
-MAINTAINER = David Coppa
+HOMEPAGE = https://redis.io/
+
+MAINTAINER = David Coppa
# BSD
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += c ${MODLUA_WANTLIB} m pthread
+WANTLIB += c ${MODLUA_WANTLIB} m pthread
-MASTER_SITES = http://download.redis.io/releases/
+MASTER_SITES = https://download.redis.io/releases/
MODULES = lang/lua \
lang/tcl
-MAKE_FLAGS = CC=${CC} \
+MAKE_FLAGS = DEBUG=${DEBUG} \
+ DEBUG_FLAGS=${DEBUG} \
+ DEPENDENCY_TARGETS="hiredis linenoise" \
+ INSTALL_SBIN="${PREFIX}/sbin" \
+ MALLOC=libc \
+ OPT= \
+ OPTIMIZATION= \
V=1
FAKE_FLAGS = INSTALL="${INSTALL_PROGRAM}" \
@@ -36,18 +43,16 @@ DBDIR = ${VARBASE}/redis
SUBST_VARS += DBDIR
pre-configure:
- cp ${WRKSRC}/deps/lua/src/fpconv.? ${WRKSRC}/src/
- cp ${WRKSRC}/deps/lua/src/strbuf.? ${WRKSRC}/src/
- cp ${WRKSRC}/deps/lua/src/lua_*.c ${WRKSRC}/src/
- rm -rf ${WRKSRC}/deps/jemalloc
- rm -rf ${WRKSRC}/deps/lua
+ cp ${WRKSRC}/deps/lua/src/{lua_*.c,{fpconv,strbuf}.?} ${WRKSRC}/src/
+ rm -rf ${WRKSRC}/deps/{jemalloc,lua}
${SUBST_CMD} ${WRKSRC}/src/Makefile
post-install:
+ mv ${PREFIX}/bin/redis-{server,sentinel} ${PREFIX}/sbin
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/redis
${SUBST_DATA} ${WRKSRC}/redis.conf \
- ${PREFIX}/share/examples/redis/redis.conf
+ ${PREFIX}/share/examples/redis/redis.conf
${SUBST_DATA} ${WRKSRC}/sentinel.conf \
- ${PREFIX}/share/examples/redis/sentinel.conf
+ ${PREFIX}/share/examples/redis/sentinel.conf
.include
Index: distinfo
===
RCS file: /cvs/ports/databases/redis/distinfo,v
retrieving revision 1.78
diff -u -p -r1.78 distinfo
--- distinfo22 Sep 2017 05:46:35 - 1.78
+++ distinfo17 Mar 2018 07:31:42 -
@@ -1,2 +1,2 @@
-SHA256 (redis-4.0.2.tar.gz) = saCRXbyRuXnQbfGXf+WUw/qbGJ8fPTh0OilIyfdjSBM=
-SIZE (redis-4.0.2.tar.gz) = 1713990
+SHA256 (redis-4.0.8.tar.gz) = /ww4uMFWMZJJ/sYeUBjPW1/mOmW2FpC+x5j0yZjCMq0=
+SIZE (redis-4.0.8.tar.gz) = 1729973
Index: patches/patch-deps_hiredis_Makefile
===
RCS file: /cvs/ports/databases/redis/patches/patch-deps_hiredis_Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 patch-deps_hiredis_Makefile
--- patches/patch-deps_hiredis_Makefile 9 Aug 2017 09:16:09 - 1.7
+++ patches/patch-deps_hiredis_Makefile 17 Mar 2018 07:31:42 -
@@ -1,31 +1,9 @@
$OpenBSD: patch-deps_hiredis_Makefile,v 1.7 2017/08/09 09:16:09 dcoppa Exp $
+
Index: deps/hiredis/Makefile
--- deps/hiredis/Makefile.orig
+++ deps/hiredis/Makefile
-@@ -38,9 +38,9 @@ export REDIS_TEST_CONFIG
- # Fallback to gcc when $CC is not in $PATH.
- CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo
gcc')
- CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo
g++')
--OPTIMIZATION?=-O3
-+# OPTIMIZATION?=-O3
- WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings
--DEBUG_FLAGS?= -g -ggdb
-+# DEBUG_FLAGS?= -g -ggdb
- REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(ARCH)
- REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
-
-@@ -167,6 +167,10 @@ endif
-
- INSTALL?= cp -a
-
-+ifndef INSTALL_DIR
-+ INSTALL_DIR= mkdir -p
-+endif
-+
- $(PKGCONFNAME): hiredis.h
- @echo "Generating $@ for pkgconfig..."
- @echo prefix=$(PREFIX) > $@
-@@ -181,7 +185,7 @@ $(PKGCONFNAME): hiredis.h
+@@ -181,12 +181,12 @@ $(PKGCONFNAME): hiredis.h
@echo Cflags: -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@
install: $(D
Re: UPDATE: x11/st
On Fri, Mar 16, 2018 at 06:31:56PM +0100, Klemens Nanni wrote:
> On Fri, Mar 16, 2018 at 09:29:50AM +0100, Rafael Sadowski wrote:
> > Simple update to the latest stable version, Ok? Comments?
> Some comments inline with an updated diff in the end, st continues to
> work for me on amd64.
>
New diff as promised keeping INCS/LIBS/*FLAGS as Rafael did already
except with CFLAGS passed. I also fixed two of my own mistakes, see
inline comments.
This looks good to me now.
> > @@ -16,23 +17,23 @@ $OpenBSD: patch-config_mk,v 1.9 2017/04/
> > +X11LIB = ${X11BASE}/lib
> >
> > # includes and libs
> > --INCS = -I. -I/usr/include -I${X11INC} \
> > +-INCS = -I$(X11INC) \
> > - `pkg-config --cflags fontconfig` \
> > - `pkg-config --cflags freetype2`
> > --LIBS = -L/usr/lib -lc -L${X11LIB} -lm -lrt -lX11 -lutil -lXft \
> > -- `pkg-config --libs fontconfig` \
> > +-LIBS = -L$(X11LIB) -lm -lrt -lX11 -lutil -lXft \
> > +- `pkg-config --libs fontconfig` \
> > - `pkg-config --libs freetype2`
> > +INCS != pkg-config --cflags fontconfig
> > +LIBS = -lm -lX11 -lutil -lXft
> > +LIBS +!= pkg-config --libs fontconfig
That's fine.
> > # flags
> > --CPPFLAGS = -DVERSION=\"${VERSION}\" -D_XOPEN_SOURCE=600
> > --CFLAGS += -g -std=c99 -pedantic -Wall -Wvariadic-macros -Os ${INCS}
> > ${CPPFLAGS}
> > --LDFLAGS += -g ${LIBS}
> > +-CPPFLAGS = -DVERSION=\"$(VERSION)\" -D_XOPEN_SOURCE=600
> > +-STCFLAGS = $(INCS) $(CPPFLAGS) $(CFLAGS)
> > +-STLDFLAGS = $(LIBS) $(LDFLAGS)
> > +CPPFLAGS = -DVERSION=\"${VERSION}\" -D_XOPEN_SOURCE=600 -D_BSD_SOURCE
> > -+CFLAGS += -std=c99 ${INCS} ${CPPFLAGS}
> > -+LDFLAGS += ${LIBS}
> > ++STCFLAGS += -std=c99 ${INCS} ${CPPFLAGS}
> > ++STLDFLAGS += ${LIBS}
> These might be handled in a clever way as well, but for now I've left
> these hunks untouched; will check later.
Did you leave CFLAGS out intentionally?
> +MAKE_ENV= LDFLAGS="${LDFLAGS}" \
> + PREFIX=${PREFIX} \
> + MANPREFIX=${PREFIX}/man \
PREFIX and MANPREFIX are obsolete with do-install.
> +SUBST_VARS= V
> +
> +pre-configure:
> + ${SUBST_CMD} ${WRKSRC}/st.1
> +
> +do-install:
> + ${INSTALL_PROGRAM} ${WRKSRC}/st ${PREFIX}/bin/
> + ${INSTALL_MAN} ${WRKSRC}/st.1 ${PREFIX}/man/man1/
Sloppy thinking on my part: it's VERSION not V, but SUBST_CMD wouldn't
work either way since it's looking for ${VAR} not VAR.
Index: Makefile
===
RCS file: /cvs/ports/x11/st/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile26 Sep 2017 23:03:53 - 1.15
+++ Makefile17 Mar 2018 07:19:36 -
@@ -2,12 +2,12 @@
COMMENT= simple X terminal
-DISTNAME= st-0.7
-REVISION= 1
+V= 0.8
+DISTNAME= st-${V}
CATEGORIES=x11
-HOMEPAGE= http://st.suckless.org/
+HOMEPAGE= https://st.suckless.org/
MAINTAINER=Joerg Jung
@@ -17,11 +17,18 @@ PERMIT_PACKAGE_CDROM= Yes
# uses pledge()
WANTLIB= c m util X11 Xft fontconfig freetype z
-MASTER_SITES= http://dl.suckless.org/st/
+MASTER_SITES= https://dl.suckless.org/st/
-MAKE_ENV= LDFLAGS="${LDFLAGS}"
-FAKE_FLAGS=DESTDIR=""
+MAKE_ENV= LDFLAGS="${LDFLAGS}" \
+ X11INC=${X11BASE}/include \
+ X11LIB=${X11BASE}/lib
NO_TEST= Yes
+
+do-install:
+ ${INSTALL_PROGRAM} ${WRKSRC}/st ${PREFIX}/bin/
+ ${INSTALL_MAN} ${WRKSRC}/st.1 ${PREFIX}/man/man1/
+ sed -i s/VERSION/${V}/g ${PREFIX}/man/man1/st.1
+ tic -s -x -o ${PREFIX}/share/terminfo ${WRKSRC}/st.info
.include
Index: distinfo
===
RCS file: /cvs/ports/x11/st/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo9 Oct 2016 18:47:49 - 1.9
+++ distinfo17 Mar 2018 07:19:36 -
@@ -1,2 +1,2 @@
-SHA256 (st-0.7.tar.gz) = 94cNkGzMmIkm7vLMmJUKmcx4cltoXpNMQiwDwSNOYAA=
-SIZE (st-0.7.tar.gz) = 42418
+SHA256 (st-0.8.tar.gz) = dzU5INB9ZsaEoPV+w3wmcMQv3FyHHWOCtwFgHNxZdXY=
+SIZE (st-0.8.tar.gz) = 45401
Index: patches/patch-Makefile
===
RCS file: patches/patch-Makefile
diff -N patches/patch-Makefile
--- patches/patch-Makefile 9 Jul 2015 22:07:23 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,44 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.4 2015/07/09 22:07:23 czarkoff Exp $
Makefile.orig Tue Jul 7 22:26:44 2015
-+++ Makefile Thu Jul 9 00:05:58 2015
-@@ -18,14 +18,12 @@ config.h:
- cp config.def.h config.h
-
- .c.o:
-- @echo CC $<
-- @${CC} -c ${CFLAGS} $<
-+ ${CC} -c ${CFLAGS} $<
-
- ${OBJ}: config.h config.mk
-
- st: ${OBJ}
-- @echo CC -o $@
-- @${CC} -o $@ ${OBJ} ${LDFLAGS}
