NEW: devel/include-what-you-use
Now that the llvm update went in it is possible to consider importing include-what-you-use. A tool to try to detect uneeded include files. It can be used with: make -k CC=/usr/local/bin/include-what-you-use It is possible to specify preferred headers for symbols. The builtin default table for doing that is patched to adapt to OpenBSD headers and can be further tweaked as needed. -- Include what you use means this: for every symbol (type, function variable, or macro) that you use in foo.cc, either foo.cc or foo.h should #include a .h file that exports the declaration of that symbol. The include-what-you-use tool is a program that can be built with the clang libraries in order to analyze #includes of source files to find include-what-you-use violations, and suggest fixes for them. The main goal of include-what-you-use is to remove superfluous #includes. It does this both by figuring out what #includes are not actually needed for this file (for both .cc and .h files), and replacing #includes with forward-declares when possible. include-what-you-use.tgz Description: application/tar-gz
Re: devel/autogen update
Michael McConville wrote: > For some reason, it picks up guile if available and uses it even if > guile2 (which is the only one that works here) is installed. I didn't > see a configure option to force guile2. If only guile2 is installed, it > works as expected. What's the best way of dealing with this? I should probably give a little more information on this, as I spent a while on it: When guile 1.x is present, the configure script still recognizes and chooses guile 2. Moreover, the correct pkg-config seems to be used, as the guile 2 include headers are visible in the cc commands. I tried looking into where things are failing, but it uses all sorts of unfamiliar GNU build gunk (I think it might even bootstrap).
devel/autogen update
I was trying to port GNU Complexity, but our autogen version is too old. Below is an initial patch to update it. I've been planning to run it through a bulk build, but my build machine has been giving me issues. I'll get to it pretty soon, but if anyone else can once it's ready, I'd appreciate it. For some reason, it picks up guile if available and uses it even if guile2 (which is the only one that works here) is installed. I didn't see a configure option to force guile2. If only guile2 is installed, it works as expected. What's the best way of dealing with this? Two tests fail, which I haven't had a chance to look into yet. The existing port fails one test, but the test suite seems to have changed significantly. None of the patches seemed to be needed anymore. Index: Makefile === RCS file: /cvs/ports/devel/autogen/Makefile,v retrieving revision 1.19 diff -u -p -r1.19 Makefile --- Makefile16 Mar 2015 18:07:39 - 1.19 +++ Makefile16 Mar 2016 02:03:09 - @@ -3,30 +3,32 @@ COMMENT= automatic text creation from templates CATEGORIES=devel -V= 5.8.7 +V= 5.18.7 DISTNAME= autogen-${V} REVISION= 4 SHARED_LIBS += opts 27.5 # .27.5 -SHARED_LIBS += guileopts1.0 # .0.1 HOMEPAGE= http://autogen.sourceforge.net/ -MASTER_SITES= ${MASTER_SITE_GNU:=autogen/rel${V}/} +MASTER_SITES= ${MASTER_SITE_GNU:=autogen/} + +EXTRACT_SUFX= .tar.xz # GPLv2 PERMIT_PACKAGE_CDROM=Yes -WANTLIB += c gmp guile ltdl lzma m pthread xml2 z +WANTLIB += c gmp guile-2.0 ltdl lzma m pthread xml2 z ffi gc unistring MODULES= devel/gettext -LIB_DEPENDS= lang/guile \ +LIB_DEPENDS= lang/guile2 \ textproc/libxml CONFIGURE_STYLE=gnu CONFIGURE_ARGS=--without-libregex \ --includedir=${PREFIX}/include/autogen \ ${ENABLE_SHARED} +USE_GMAKE= Yes MAKE_FLAGS+= INFO_DEPS= USE_GROFF =Yes .include Index: distinfo === RCS file: /cvs/ports/devel/autogen/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo18 Jan 2015 03:13:08 - 1.4 +++ distinfo16 Mar 2016 02:03:09 - @@ -1,2 +1,2 @@ -SHA256 (autogen-5.8.7.tar.gz) = E9UkHa3KEXCTqGTFkDMBWFlV9J6LJ2aqujEXZbZ6XFc= -SIZE (autogen-5.8.7.tar.gz) = 1279984 +SHA256 (autogen-5.18.7.tar.xz) = p6WApeGJMcs0GyVc7C/uLf2BvqXdvw2K1yJwPhmqpAU= +SIZE (autogen-5.18.7.tar.xz) = 1021400 Index: patches/patch-agen5_defLoad_c === RCS file: patches/patch-agen5_defLoad_c diff -N patches/patch-agen5_defLoad_c --- patches/patch-agen5_defLoad_c 9 Dec 2006 18:28:53 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,31 +0,0 @@ -$OpenBSD: patch-agen5_defLoad_c,v 1.1 2006/12/09 18:28:53 kili Exp $ - -# Fix use after realloc. - agen5/defLoad.c.orig Sun Sep 24 04:58:59 2006 -+++ agen5/defLoad.cSun Nov 19 18:30:20 2006 -@@ -418,6 +418,7 @@ readDefines( void ) - */ - if (sizeLeft == 0) { - tScanCtx* p; -+char *oldPzData; - - /* - * IF it is a regular file, then we are done -@@ -430,6 +431,7 @@ readDefines( void ) - * Try to reallocate our input buffer. - */ - dataSize += (sizeLeft = 0x1000); -+oldPzData = pBaseCtx->pzData; - p = (tScanCtx*)AGREALOC( (void*)pBaseCtx, - dataSize+4+sizeof( *pBaseCtx ), - "expanded file buffer" ); -@@ -442,7 +444,7 @@ readDefines( void ) - if (p != pBaseCtx) { - p->pzScan = \ - p->pzData = (char*)(p+1); --pzData = p->pzData + (pzData - pBaseCtx->pzData); -+pzData = p->pzData + (pzData - oldPzData); - pBaseCtx = p; - } - } Index: patches/patch-agen5_test_error_test === RCS file: patches/patch-agen5_test_error_test diff -N patches/patch-agen5_test_error_test --- patches/patch-agen5_test_error_test 9 Dec 2006 18:28:53 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,15 +0,0 @@ -$OpenBSD: patch-agen5_test_error_test,v 1.1 2006/12/09 18:28:53 kili Exp $ - -# Cope with the additional abort message (don't panic -- this test -# intentionally checks abort behaviour). - agen5/test/error.test.orig Sun Sep 24 04:11:15 2006 -+++ agen5/test/error.test Fri Nov 17 20:15:03 2006 -@@ -103,6 +103,7 @@ AutoGen aborting on signal - processing template error2.tpl - on line 2 -for function EXPR (11) -+Abort trap (core dumped) - _EOF_ - - sed '/THIS TEXT/,/ESAC/d;s,this is never seen,<= `die testing death` =>,' \ Index:
Re: [update] SABnzbd to 1.0.0
On Tue, Mar 15, 2016 at 11:42:56PM +, Stuart Henderson wrote: > There is a proper uploaded tarball, > https://github.com/sabnzbd/sabnzbd/releases/download/1.0.0/SABnzbd-1.0.0-src.tar.gz > - please use this rather than a tag-based checkout (get rid of the GH_ > variables). This better? Index: news/sabnzbd/Makefile === RCS file: /cvs/ports/news/sabnzbd/Makefile,v retrieving revision 1.7 diff -u -p -u -r1.7 Makefile --- news/sabnzbd/Makefile 2 Nov 2015 11:56:54 - 1.7 +++ news/sabnzbd/Makefile 16 Mar 2016 01:14:33 - @@ -1,18 +1,18 @@ # $OpenBSD: Makefile,v 1.7 2015/11/02 11:56:54 espie Exp $ COMMENT = retrieve and process nzb-files via web interface -VERSION = 0.7.20 +VERSION = 1.0.0 DISTNAME = SABnzbd-${VERSION}-src PKGNAME = sabnzbd-${VERSION} CATEGORIES = news HOMEPAGE = http://sabnzbd.org/ MAINTAINER = Marcus Glocker-REVISION = 0 # GPLv2 PERMIT_PACKAGE_CDROM = Yes -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=sabnzbdplus/} +MASTER_SITES = https://github.com/sabnzbd/sabnzbd/releases/download/${VERSION}/ +EXTRACT_SUFX = .tar.gz MODULES = lang/python Index: news/sabnzbd/distinfo === RCS file: /cvs/ports/news/sabnzbd/distinfo,v retrieving revision 1.3 diff -u -p -u -r1.3 distinfo --- news/sabnzbd/distinfo 17 Apr 2015 11:43:09 - 1.3 +++ news/sabnzbd/distinfo 16 Mar 2016 01:14:33 - @@ -1,2 +1,2 @@ -SHA256 (SABnzbd-0.7.20-src.tar.gz) = ILOkYToOze3k/f62KK6AbkWKwab7aEMGMo3U7R+vh0I= -SIZE (SABnzbd-0.7.20-src.tar.gz) = 2389762 +SHA256 (SABnzbd-1.0.0-src.tar.gz) = dXPfr9bztR6Jn0dDbeDgs9joOlaOKm8PPaCqofPUz6o= +SIZE (SABnzbd-1.0.0-src.tar.gz) = 2973807 Index: news/sabnzbd/pkg/PLIST === RCS file: /cvs/ports/news/sabnzbd/pkg/PLIST,v retrieving revision 1.3 diff -u -p -u -r1.3 PLIST --- news/sabnzbd/pkg/PLIST 17 Apr 2015 11:43:09 - 1.3 +++ news/sabnzbd/pkg/PLIST 16 Mar 2016 01:14:34 - @@ -9,29 +9,32 @@ bin/sabnzbd @group lib/python${MODPY_VERSION}/site-packages/sabnzbd/ lib/python${MODPY_VERSION}/site-packages/sabnzbd/ABOUT.txt -lib/python${MODPY_VERSION}/site-packages/sabnzbd/CHANGELOG.txt lib/python${MODPY_VERSION}/site-packages/sabnzbd/COPYRIGHT.txt lib/python${MODPY_VERSION}/site-packages/sabnzbd/GPL2.txt lib/python${MODPY_VERSION}/site-packages/sabnzbd/GPL3.txt lib/python${MODPY_VERSION}/site-packages/sabnzbd/INSTALL.txt lib/python${MODPY_VERSION}/site-packages/sabnzbd/ISSUES.txt +lib/python${MODPY_VERSION}/site-packages/sabnzbd/LICENSE.txt lib/python${MODPY_VERSION}/site-packages/sabnzbd/PKG-INFO lib/python${MODPY_VERSION}/site-packages/sabnzbd/README.txt lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABHelper.py lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABHelper.pyc lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.py lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.pyc -lib/python${MODPY_VERSION}/site-packages/sabnzbd/Sample-PostProc.cmd -lib/python${MODPY_VERSION}/site-packages/sabnzbd/Sample-PostProc.sh lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/ lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/LICENSE.txt +lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/Patch-for-CP-3.8.0.diff lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/VERSION.txt lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__init__.py lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__init__.pyc -lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcgifs.py -lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcgifs.pyc +lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__main__.py +lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__main__.pyc lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpchecker.py lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpchecker.pyc +lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat.py +lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat.pyc +lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat_subprocess.py +lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat_subprocess.pyc lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpconfig.py lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpconfig.pyc lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpdispatch.py @@ -42,6 +45,10 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cplogging.pyc
[update] textproc/multimarkdown
Hi ports@, The attached patch brings textproc/multimarkdown up to the latest release (5.1.0). It ditches a bunch of patches, some of which are no longer necessary and some of which I tried and failed to sell to the upstream. Works okay for me on i386. Sadly I have no other -current machines right now. Pax, -A -- http://haqistan.net/~attila | att...@stalphonsos.com | 0xE6CC1EDB Index: Makefile === RCS file: /cvs/ports/textproc/multimarkdown/Makefile,v retrieving revision 1.2 diff -u -p -r1.2 Makefile --- Makefile 5 Apr 2015 13:31:15 - 1.2 +++ Makefile 16 Mar 2016 01:00:52 - @@ -1,13 +1,13 @@ # $OpenBSD: Makefile,v 1.2 2015/04/05 13:31:15 sthen Exp $ -V = 4.7.1 +V = 5.1.0 COMMENT = marked-up plain text to formatted document converter DISTNAME = ${GH_PROJECT}-${V} PKGNAME = multimarkdown-${V} CATEGORIES = textproc GH_ACCOUNT = fletcher -GH_PROJECT = MultiMarkdown-4 +GH_PROJECT = MultiMarkdown-5 GH_TAGNAME = ${V} HOMEPAGE = http://fletcherpenney.net/multimarkdown/ @@ -21,14 +21,18 @@ WANTLIB += c BUILD_DEPENDS = devel/greg USE_GMAKE = Yes -ALL_TARGET = ALL -MAKE_FLAGS = CFLAGS="${CFLAGS} -include GLibFacade.h -DHAVE_ARC4RANDOM" \ - GREG=${LOCALBASE}/bin/greg +# avoid using cmake, not necc for us +ALL_TARGET = deprecated + +# golf MAKE_FLAGS down to 80chars.. :-| +_i = -include +_incs = ${_i} src/GLibFacade.h ${_i} src/version.h ${_i} src/parser.h +MAKE_FLAGS = CFLAGS="${CFLAGS} ${_incs}" # Test files aren't included in distfile. NO_TEST = Yes do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/multimarkdown ${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/build/multimarkdown ${PREFIX}/bin/ .include Index: distinfo === RCS file: /cvs/ports/textproc/multimarkdown/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 24 Mar 2015 19:16:13 - 1.1.1.1 +++ distinfo 16 Mar 2016 01:00:52 - @@ -1,2 +1,2 @@ -SHA256 (MultiMarkdown-4-4.7.1.tar.gz) = gy5dzm+hv/TWfmSsLMJPCSCujZEoDlPqh5I3odQ/SGU= -SIZE (MultiMarkdown-4-4.7.1.tar.gz) = 120896 +SHA256 (MultiMarkdown-5-5.1.0.tar.gz) = ZdT8mzDrZq9vYLN8HzJBlf3xqSb/umBoLd9+/MH4eGg= +SIZE (MultiMarkdown-5-5.1.0.tar.gz) = 135170 Index: patches/patch-Makefile === RCS file: /cvs/ports/textproc/multimarkdown/patches/patch-Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-Makefile --- patches/patch-Makefile 24 Mar 2015 19:16:13 - 1.1.1.1 +++ patches/patch-Makefile 16 Mar 2016 01:00:52 - @@ -1,37 +1,40 @@ -$OpenBSD: patch-Makefile,v 1.1.1.1 2015/03/24 19:16:13 okan Exp $ +$OpenBSD$ -Make it possible to pass GREG=/usr/local/bin/greg in on the -command line and avoid git submodules. - Makefile.orig Mon Mar 23 18:21:56 2015 -+++ Makefile Mon Mar 23 18:32:22 2015 -@@ -32,18 +32,25 @@ ifeq ($(MAKECMDGOALS),static) - LDFLAGS += -static -static-libgcc - endif - --GREG= greg/greg -+# OUR_GREG: the version of greg in a submodule -+# GREG: the path to greg we want to use for parser.leg -+# -+# This way we can pass GREG=/usr/local/bin/greg in on -+# the command line if we have greg installed already. - -+OUR_GREG=greg/greg -+GREG?=$(OUR_GREG) -+ - ALL : $(PROGRAM) enumMap.txt - static : $(PROGRAM) enumMap.txt - - %.o : %.c parser.h - $(CC) -c $(CFLAGS) -o $@ $< - --parser.c : parser.leg greg/greg parser.h -- greg/greg -o parser.c parser.leg -+parser.c : parser.leg $(GREG) parser.h -+ $(GREG) -o parser.c parser.leg - --$(GREG): greg -+$(OUR_GREG): greg - $(MAKE) -C greg +Patch up Makefile so we can use it instead of cmake. +--- Makefile.orig Mon Feb 22 20:05:02 2016 Makefile Tue Mar 15 18:56:50 2016 +@@ -1,6 +1,6 @@ + BUILD_DIR = build + +-GREG = submodules/greg/greg ++GREG = /usr/local/bin/greg + + # The release target will perform additional optimization + .PHONY : release +@@ -81,7 +81,7 @@ $(GREG): + $(MAKE) -C submodules/greg + + # Create build directory if it doesn't exist +-$(BUILD_DIR): CHANGELOG ++$(BUILD_DIR): + -mkdir $(BUILD_DIR) 2>/dev/null + -cd $(BUILD_DIR); rm -rf * + +@@ -100,7 +100,7 @@ CHANGELOG: + # + # I don't recommend this approach, but it should work in a pinch + +-CFLAGS ?= -Wall -g -O3 -include src/GLibFacade.h -include src/version.h -include src/parser.h ++#CFLAGS ?= -Wall -g -O3 -include src/GLibFacade.h -include src/version.h -include src/parser.h + PROGRAM = multimarkdown + + OBJS = build/multimarkdown.o build/parse_utilities.o build/parser.o build/GLibFacade.o build/writer.o build/text.o build/html.o build/latex.o build/memoir.o build/beamer.o build/lyx.o build/lyxbeamer.o build/opml.o build/odf.o build/critic.o build/rng.o build/rtf.o build/transclude.o build/toc.o +@@ -119,7 +119,7 @@ src/parser.c: src/parser.leg $(GREG) src/parser.h + $(GREG) -o src/parser.c src/parser.leg + + .PHONY : deprecated +-deprecated: $(GREG) build/$(PROGRAM) ++deprecated:
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/03/15 18:38:39 Modified files: www/racktables : Makefile Added files: www/racktables/patches: patch-wwwroot_inc_code_php Log message: fix upstream typo in racktables
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/03/15 18:17:01 Modified files: textproc/p5-PDF-API2: Makefile distinfo textproc/p5-PDF-API2/pkg: PLIST Removed files: textproc/p5-PDF-API2/patches: patch-lib_PDF_API2_Basic_PDF_File_pm patch-lib_PDF_API2_Basic_PDF_Filter_FlateDecode_pm Log message: update to p5-PDF-API2-2.027
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: j...@cvs.openbsd.org2016/03/15 18:04:16 Modified files: mail/offlineimap: Makefile distinfo Log message: Update to offlineimap-6.7.0, from maintainer Remi Locherer
Re: [update] SABnzbd to 1.0.0
There is a proper uploaded tarball, https://github.com/sabnzbd/sabnzbd/releases/download/1.0.0/SABnzbd-1.0.0-src.tar.gz - please use this rather than a tag-based checkout (get rid of the GH_ variables). On 2016/03/16 12:36, Carlin Bingham wrote: > Updates from 0.7.20 to 1.0.0 > > Release notes: https://github.com/sabnzbd/sabnzbd/releases/tag/1.0.0 > > > > Index: Makefile > === > RCS file: /cvs/ports/news/sabnzbd/Makefile,v > retrieving revision 1.7 > diff -u -p -u -r1.7 Makefile > --- Makefile 2 Nov 2015 11:56:54 - 1.7 > +++ Makefile 15 Mar 2016 23:21:09 - > @@ -1,18 +1,20 @@ > # $OpenBSD: Makefile,v 1.7 2015/11/02 11:56:54 espie Exp $ > > COMMENT =retrieve and process nzb-files via web interface > -VERSION =0.7.20 > +VERSION =1.0.0 > DISTNAME = SABnzbd-${VERSION}-src > PKGNAME =sabnzbd-${VERSION} > CATEGORIES = news > HOMEPAGE = http://sabnzbd.org/ > MAINTAINER = Marcus Glocker> -REVISION = 0 > > # GPLv2 > PERMIT_PACKAGE_CDROM = Yes > > -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=sabnzbdplus/} > +GH_ACCOUNT = sabnzbd > +GH_PROJECT = sabnzbd > +GH_TAGNAME = ${VERSION} > +MASTER_SITES = ${MASTER_SITES_GITHUB} > > MODULES =lang/python > > @@ -29,7 +31,7 @@ NO_BUILD = Yes > NO_TEST =Yes > PKG_ARCH = * > > -WRKSRC = ${WRKDIR}/SABnzbd-${VERSION} > +WRKSRC = ${WRKDIR}/sabnzbd-${VERSION} > > do-install: > ${INSTALL_DATA_DIR} \ > Index: distinfo > === > RCS file: /cvs/ports/news/sabnzbd/distinfo,v > retrieving revision 1.3 > diff -u -p -u -r1.3 distinfo > --- distinfo 17 Apr 2015 11:43:09 - 1.3 > +++ distinfo 15 Mar 2016 23:21:09 - > @@ -1,2 +1,2 @@ > -SHA256 (SABnzbd-0.7.20-src.tar.gz) = > ILOkYToOze3k/f62KK6AbkWKwab7aEMGMo3U7R+vh0I= > -SIZE (SABnzbd-0.7.20-src.tar.gz) = 2389762 > +SHA256 (SABnzbd-1.0.0-src.tar.gz) = > CkM98/DubLnaTEfa250M29dV41h4CSOwfgioPFkgAf0= > +SIZE (SABnzbd-1.0.0-src.tar.gz) = 5367046 > Index: pkg/PLIST > === > RCS file: /cvs/ports/news/sabnzbd/pkg/PLIST,v > retrieving revision 1.3 > diff -u -p -u -r1.3 PLIST > --- pkg/PLIST 17 Apr 2015 11:43:09 - 1.3 > +++ pkg/PLIST 15 Mar 2016 23:21:09 - > @@ -9,29 +9,34 @@ bin/sabnzbd > @group > lib/python${MODPY_VERSION}/site-packages/sabnzbd/ > lib/python${MODPY_VERSION}/site-packages/sabnzbd/ABOUT.txt > -lib/python${MODPY_VERSION}/site-packages/sabnzbd/CHANGELOG.txt > lib/python${MODPY_VERSION}/site-packages/sabnzbd/COPYRIGHT.txt > +lib/python${MODPY_VERSION}/site-packages/sabnzbd/Dockerfile > lib/python${MODPY_VERSION}/site-packages/sabnzbd/GPL2.txt > lib/python${MODPY_VERSION}/site-packages/sabnzbd/GPL3.txt > lib/python${MODPY_VERSION}/site-packages/sabnzbd/INSTALL.txt > lib/python${MODPY_VERSION}/site-packages/sabnzbd/ISSUES.txt > +lib/python${MODPY_VERSION}/site-packages/sabnzbd/LICENSE.txt > lib/python${MODPY_VERSION}/site-packages/sabnzbd/PKG-INFO > -lib/python${MODPY_VERSION}/site-packages/sabnzbd/README.txt > +lib/python${MODPY_VERSION}/site-packages/sabnzbd/README.md > +lib/python${MODPY_VERSION}/site-packages/sabnzbd/README.mkd > lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABHelper.py > lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABHelper.pyc > lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.py > lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.pyc > -lib/python${MODPY_VERSION}/site-packages/sabnzbd/Sample-PostProc.cmd > -lib/python${MODPY_VERSION}/site-packages/sabnzbd/Sample-PostProc.sh > lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/ > lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/LICENSE.txt > +lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/Patch-for-CP-3.8.0.diff > lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/VERSION.txt > lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__init__.py > lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__init__.pyc > -lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcgifs.py > -lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcgifs.pyc > +lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__main__.py > +lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__main__.pyc > lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpchecker.py > lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpchecker.pyc > +lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat.py
[update] SABnzbd to 1.0.0
Updates from 0.7.20 to 1.0.0 Release notes: https://github.com/sabnzbd/sabnzbd/releases/tag/1.0.0 Index: Makefile === RCS file: /cvs/ports/news/sabnzbd/Makefile,v retrieving revision 1.7 diff -u -p -u -r1.7 Makefile --- Makefile2 Nov 2015 11:56:54 - 1.7 +++ Makefile15 Mar 2016 23:21:09 - @@ -1,18 +1,20 @@ # $OpenBSD: Makefile,v 1.7 2015/11/02 11:56:54 espie Exp $ COMMENT = retrieve and process nzb-files via web interface -VERSION = 0.7.20 +VERSION = 1.0.0 DISTNAME = SABnzbd-${VERSION}-src PKGNAME = sabnzbd-${VERSION} CATEGORIES = news HOMEPAGE = http://sabnzbd.org/ MAINTAINER = Marcus Glocker-REVISION = 0 # GPLv2 PERMIT_PACKAGE_CDROM = Yes -MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=sabnzbdplus/} +GH_ACCOUNT = sabnzbd +GH_PROJECT = sabnzbd +GH_TAGNAME = ${VERSION} +MASTER_SITES = ${MASTER_SITES_GITHUB} MODULES = lang/python @@ -29,7 +31,7 @@ NO_BUILD =Yes NO_TEST = Yes PKG_ARCH = * -WRKSRC = ${WRKDIR}/SABnzbd-${VERSION} +WRKSRC = ${WRKDIR}/sabnzbd-${VERSION} do-install: ${INSTALL_DATA_DIR} \ Index: distinfo === RCS file: /cvs/ports/news/sabnzbd/distinfo,v retrieving revision 1.3 diff -u -p -u -r1.3 distinfo --- distinfo17 Apr 2015 11:43:09 - 1.3 +++ distinfo15 Mar 2016 23:21:09 - @@ -1,2 +1,2 @@ -SHA256 (SABnzbd-0.7.20-src.tar.gz) = ILOkYToOze3k/f62KK6AbkWKwab7aEMGMo3U7R+vh0I= -SIZE (SABnzbd-0.7.20-src.tar.gz) = 2389762 +SHA256 (SABnzbd-1.0.0-src.tar.gz) = CkM98/DubLnaTEfa250M29dV41h4CSOwfgioPFkgAf0= +SIZE (SABnzbd-1.0.0-src.tar.gz) = 5367046 Index: pkg/PLIST === RCS file: /cvs/ports/news/sabnzbd/pkg/PLIST,v retrieving revision 1.3 diff -u -p -u -r1.3 PLIST --- pkg/PLIST 17 Apr 2015 11:43:09 - 1.3 +++ pkg/PLIST 15 Mar 2016 23:21:09 - @@ -9,29 +9,34 @@ bin/sabnzbd @group lib/python${MODPY_VERSION}/site-packages/sabnzbd/ lib/python${MODPY_VERSION}/site-packages/sabnzbd/ABOUT.txt -lib/python${MODPY_VERSION}/site-packages/sabnzbd/CHANGELOG.txt lib/python${MODPY_VERSION}/site-packages/sabnzbd/COPYRIGHT.txt +lib/python${MODPY_VERSION}/site-packages/sabnzbd/Dockerfile lib/python${MODPY_VERSION}/site-packages/sabnzbd/GPL2.txt lib/python${MODPY_VERSION}/site-packages/sabnzbd/GPL3.txt lib/python${MODPY_VERSION}/site-packages/sabnzbd/INSTALL.txt lib/python${MODPY_VERSION}/site-packages/sabnzbd/ISSUES.txt +lib/python${MODPY_VERSION}/site-packages/sabnzbd/LICENSE.txt lib/python${MODPY_VERSION}/site-packages/sabnzbd/PKG-INFO -lib/python${MODPY_VERSION}/site-packages/sabnzbd/README.txt +lib/python${MODPY_VERSION}/site-packages/sabnzbd/README.md +lib/python${MODPY_VERSION}/site-packages/sabnzbd/README.mkd lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABHelper.py lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABHelper.pyc lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.py lib/python${MODPY_VERSION}/site-packages/sabnzbd/SABnzbd.pyc -lib/python${MODPY_VERSION}/site-packages/sabnzbd/Sample-PostProc.cmd -lib/python${MODPY_VERSION}/site-packages/sabnzbd/Sample-PostProc.sh lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/ lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/LICENSE.txt +lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/Patch-for-CP-3.8.0.diff lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/VERSION.txt lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__init__.py lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__init__.pyc -lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcgifs.py -lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcgifs.pyc +lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__main__.py +lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/__main__.pyc lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpchecker.py lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpchecker.pyc +lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat.py +lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat.pyc +lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat_subprocess.py +lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpcompat_subprocess.pyc lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpconfig.py lib/python${MODPY_VERSION}/site-packages/sabnzbd/cherrypy/_cpconfig.pyc
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/03/15 17:25:51 Modified files: sysutils/rsyslog: distinfo sysutils/rsyslog/pkg: PLIST-main PLIST-mysql PLIST-pgsql Added files: sysutils/rsyslog/files: rsyslog.conf sysutils/rsyslog/patches: patch-grammar_lexer_l patch-plugins_mmexternal_mmexternal_c patch-tools_rsyslogd_c Removed files: sysutils/rsyslog/patches: patch-doc_Makefile_in patch-plugins_imudp_imudp_c patch-runtime_nsd_gtls_c patch-runtime_stringbuf_c patch-tools_Makefile_in patch-tools_syslogd_c sysutils/rsyslog/pkg: DESCR-docs PLIST-docs Log message: update to rsyslog-8.16.0, add sample config from chris@ not heavily tested, but positive feedback from chris with pgsql logging, and the version we had was ancient.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/03/15 17:25:33 Modified files: sysutils/rsyslog: Makefile Log message: update to rsyslog-8.16.0, add sample config from chris@ not heavily tested, but positive feedback from chris with pgsql logging, and the version we had was ancient.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/03/15 17:22:13 Modified files: sysutils/librelp: Makefile distinfo Log message: update to librelp-1.2.9, needed for rsyslog update
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/03/15 17:20:18 Modified files: devel/quirks : Makefile devel/quirks/files: Quirks.pm Log message: register cqcam removal
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/03/15 17:18:42 Removed files: graphics/cqcam : Makefile distinfo graphics/cqcam/patches: patch-Makefile_in patch-configure patch-libcqcam-port_C graphics/cqcam/pkg: DESCR MESSAGE PLIST Log message: Remove cqcam, it's software for ancient parallel-port QuickCam webcams, is i386-only, setuid-root and uses iopl. "As the author of the port 14 years ago, I'm fine with it being deleted" jcs@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/03/15 17:19:10 Modified files: graphics : Makefile Log message: -cqcam
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2016/03/15 16:56:27 Modified files: infrastructure/mk: bsd.port.mk Log message: tell make-plist to never generate PFRAG.shared; ok sthen@ espie@
Re: Fix update-plist
On Tue, Mar 15, 2016 at 11:19:13PM +0100, Christian Weisgerber wrote: > Well, put a bandaid on it. > > Currently update-plist will still spit out PFRAG.shared files when > it finds .so modules. This is no longer useful. The proper fix > would be to rip out all the PFRAG.shared handling from make-plist, > but I don't feel like going in there (for now at least). Please don't go in there, there are a lot of reasons not to. > Let's just call make-plist with SHARED_ONLY=Yes, which disables > PFRAG.shared generation. Okay > Index: bsd.port.mk > === > RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v > retrieving revision 1.1308 > diff -u -p -r1.1308 bsd.port.mk > --- bsd.port.mk 15 Mar 2016 20:58:58 - 1.1308 > +++ bsd.port.mk 15 Mar 2016 22:11:06 - > @@ -2412,7 +2412,7 @@ _internal-plist _internal-update-plist: > PORTSDIR_PATH=${PORTSDIR_PATH} \ > FLAVORS='${FLAVORS}' MULTI_PACKAGES='${MULTI_PACKAGES}' \ > OKAY_FILES='${_FAKE_COOKIE} ${_INSTALL_PRE_COOKIE} > ${WRKINST}/.saved_libs' \ > - SHARED_ONLY="${SHARED_ONLY}" \ > + SHARED_ONLY=Yes \ > OWNER=$$(id -u) \ > GROUP=$$(id -g) \ > ${_FAKESUDO} ${_PERLSCRIPT}/make-plist \ > -- > Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/03/15 16:22:05 Modified files: sysutils/freeipmi: Makefile sysutils/freeipmi/patches: patch-libfreeipmi_Makefile_in sysutils/freeipmi/pkg: DESCR PLIST Removed files: sysutils/freeipmi/patches: patch-configure patch-libfreeipmi_driver_ipmi-kcs-driver_c patch-libfreeipmi_libfreeipmi_pc_in patch-libipmiconsole_libipmiconsole_pc_in Log message: Remove wilfried@'s _iopl patches from freeipmi, in-band support is now available via /dev/ipmi0 (if enabled in the kernel) which is less dangerous than securelevel=-1 and direct io writes.
Fix update-plist
Well, put a bandaid on it. Currently update-plist will still spit out PFRAG.shared files when it finds .so modules. This is no longer useful. The proper fix would be to rip out all the PFRAG.shared handling from make-plist, but I don't feel like going in there (for now at least). Let's just call make-plist with SHARED_ONLY=Yes, which disables PFRAG.shared generation. Index: bsd.port.mk === RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v retrieving revision 1.1308 diff -u -p -r1.1308 bsd.port.mk --- bsd.port.mk 15 Mar 2016 20:58:58 - 1.1308 +++ bsd.port.mk 15 Mar 2016 22:11:06 - @@ -2412,7 +2412,7 @@ _internal-plist _internal-update-plist: PORTSDIR_PATH=${PORTSDIR_PATH} \ FLAVORS='${FLAVORS}' MULTI_PACKAGES='${MULTI_PACKAGES}' \ OKAY_FILES='${_FAKE_COOKIE} ${_INSTALL_PRE_COOKIE} ${WRKINST}/.saved_libs' \ - SHARED_ONLY="${SHARED_ONLY}" \ + SHARED_ONLY=Yes \ OWNER=$$(id -u) \ GROUP=$$(id -g) \ ${_FAKESUDO} ${_PERLSCRIPT}/make-plist \ -- Christian "naddy" Weisgerber na...@mips.inka.de
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/03/15 16:12:15 Modified files: www/nghttp2: Makefile distinfo www/nghttp2/patches: patch-Makefile_in Log message: update to nghttp2-1.8.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2016/03/15 15:55:46 Modified files: graphics/feh : Makefile Log message: no more no_shared archs
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: aw...@cvs.openbsd.org 2016/03/15 15:47:36 Modified files: graphics : Makefile Log message: Add graphics/cstitch to the build
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2016/03/15 15:45:16 Modified files: infrastructure/mk: bsd.port.arch.mk Log message: NO_SHARED_LIBS is no longer used in the ports tree
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: aw...@cvs.openbsd.org 2016/03/15 15:45:11 Log message: Import graphics/cstitch convert images to cross stitch patterns OK sthen@ Status: Vendor Tag: awolk Release Tags: awolk_20160315 N ports/graphics/cstitch/Makefile N ports/graphics/cstitch/distinfo N ports/graphics/cstitch/pkg/PLIST N ports/graphics/cstitch/pkg/DESCR No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: pas...@cvs.openbsd.org 2016/03/15 15:33:19 Added files: devel/llvm/patches: patch-lib_Support_Unix_Signals_inc Log message: Do not #include if it is not needed. found by naddy@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2016/03/15 15:13:32 Modified files: lang/tcl/8.5 : Makefile lang/tcl/8.5/pkg: PLIST lang/tcl/8.6 : Makefile lang/tcl/8.6/pkg: PLIST x11/tk/8.5 : Makefile x11/tk/8.5/pkg : PLIST x11/tk/8.6 : Makefile x11/tk/8.6/pkg : PLIST Removed files: lang/tcl/8.5/pkg: PFRAG.shared lang/tcl/8.6/pkg: PFRAG.shared x11/tk/8.5/pkg : PFRAG.shared x11/tk/8.6/pkg : PFRAG.shared Log message: get rid of NO_SHARED_LIBS and PFRAG.shared
Re: Maven-based projects vs. our build process
On 2016/03/15 16:34, Jiri B wrote: > On Tue, Mar 15, 2016 at 12:56:22PM -0400, Bryan C. Everly wrote: > > Hi, > > > > I have several maven-based projects that I'd like to create ports for, but > > our build process makes that challenging. > > > > Maven (for those who don't know) likes to download additional files as it > > compiles which is a non-starter for our build process. A solution that I > > have found to work around this is to run maven once, let it cache the files > > locally, turn them into a tarball which I then place in my "files" > > directory and make the real port run maven in offline mode from the cached > > files in the tarball. > > > > This process works, but it sure seems awkward. > > > > Does anyone have any suggestions on how I could make this better? > > Packaging java, ruby, node.js apps which many dependencies is nightmare > for everybody. IIRC Fedora must have for each dependency separate package > but I have heard recently that inside Fedora/RHEL thins are changing > and some projects are permitted to have one big package including all > its deps. The problem is - who and how will be those dependencies > maintained? Yes this is a complete pain. I wanted to port oxidized (ruby) but it wants certain versions of deps which don't match versions in-tree and knowing the ecosystem it's highly likely that changing the deps will break something else using them.. > It doesn't answer your question. But it seems that if an app can be > installed via its own framework (npm, cabal, pip), some devs prefer > not to package it - at least I have the feeling about haskell, node.js > ports. pip/cpan things are usually sane enough to make into ports. Ruby is mixed. npm and go are pretty awkward, and it looks like maven is similarly awkward (though with the offline mode it seems less difficult than I thought it might be). btw, ian@ has been looking at maven recently.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2016/03/15 15:12:07 Modified files: lang/swi-prolog: Makefile lang/swi-prolog/pkg: PLIST Removed files: lang/swi-prolog/pkg: PFRAG.shared Log message: replace after-bsd.port.mk hack with PROPERTIES check, regen PLIST
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2016/03/15 14:58:58 Modified files: infrastructure/mk: bsd.port.mk Log message: remove NO_SHARED_LIBS; ok espie@ and successful bulk build
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2016/03/15 14:51:11 Modified files: devel/libdvdread: Makefile Added files: devel/libdvdread/patches: patch-src_ifo_read_c Log message: Fix a use after free. From upstream git. This makes ogle usable again and stops vlc from aborting at exit. ok espie@ (maintainer), jca@
Re: Maven-based projects vs. our build process
On Tue, Mar 15, 2016 at 12:56:22PM -0400, Bryan C. Everly wrote: > Hi, > > I have several maven-based projects that I'd like to create ports for, but > our build process makes that challenging. > > Maven (for those who don't know) likes to download additional files as it > compiles which is a non-starter for our build process. A solution that I > have found to work around this is to run maven once, let it cache the files > locally, turn them into a tarball which I then place in my "files" > directory and make the real port run maven in offline mode from the cached > files in the tarball. > > This process works, but it sure seems awkward. > > Does anyone have any suggestions on how I could make this better? Packaging java, ruby, node.js apps which many dependencies is nightmare for everybody. IIRC Fedora must have for each dependency separate package but I have heard recently that inside Fedora/RHEL thins are changing and some projects are permitted to have one big package including all its deps. The problem is - who and how will be those dependencies maintained? It doesn't answer your question. But it seems that if an app can be installed via its own framework (npm, cabal, pip), some devs prefer not to package it - at least I have the feeling about haskell, node.js ports. j.
devel/libdvdread: fix use after free
Hi, this fixes an obvious use after free in libdvdread. With this diff, ogle is usable again and vlc doesn't abort on exit. Ok? Ciao, Kili Index: Makefile === RCS file: /cvs/ports/devel/libdvdread/Makefile,v retrieving revision 1.27 diff -u -p -r1.27 Makefile --- Makefile27 Apr 2015 12:17:06 - 1.27 +++ Makefile15 Mar 2016 19:24:12 - @@ -4,6 +4,7 @@ COMMENT = accessing DVD files VER = 5.0.3 DISTNAME = libdvdread-${VER} +REVISION = 0 CATEGORIES = devel MASTER_SITES = http://download.videolan.org/pub/videolan/libdvdread/${VER}/ EXTRACT_SUFX = .tar.bz2 Index: patches/patch-src_ifo_read_c === RCS file: patches/patch-src_ifo_read_c diff -N patches/patch-src_ifo_read_c --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_ifo_read_c15 Mar 2016 19:24:12 - @@ -0,0 +1,19 @@ +$OpenBSD$ + +Fix write after free. + +From git commit 4e269e52103a0422a3954ecc2f1901dec5fb4f0d (Petri +Hintukainen) + +--- src/ifo_read.c.origWed Jan 21 17:22:42 2015 src/ifo_read.c Tue Mar 15 20:06:08 2016 +@@ -1118,8 +1118,8 @@ void ifoFree_TT_SRPT(ifo_handle_t *ifofile) { + + if(ifofile->tt_srpt) { + free(ifofile->tt_srpt->title); +-free(ifofile->tt_srpt); + ifofile->tt_srpt->title = NULL; ++free(ifofile->tt_srpt); + ifofile->tt_srpt = NULL; + } + }
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2016/03/15 13:41:18 Modified files: lang/ghc : Makefile lang/ghc/files : Process.hsc Log message: - Change the first argument to pledge (the promises) to Maybe String, following the recent change to pledge(2) (passing NULL doesn't change the value). - Use maybeWith instead of pattern matching to distinguish between Nothing and Just x. - Add some minimal documentation.
Re: UPDATE: ledger 3.1.1
On Mon, Mar 14, 2016 at 06:12:27PM -0500, Matthew Martin wrote: > Compiles and works for my ledger file (but I started using ledger after > your first mail). Only tests 1, 3, 4, and 5 pass for me; the other 339 > fail. Is this expected? > Well. The patch below fixes all tests except a handful that need python. Readding python breaks the build process however. I will look into this further, but for now NO_TEST = Yes Regards, Florian Index: Makefile === RCS file: /cvs/ports/productivity/ledger/Makefile,v retrieving revision 1.14 diff -u -p -u -r1.14 Makefile --- Makefile7 Aug 2013 21:58:00 - 1.14 +++ Makefile15 Mar 2016 18:00:03 - @@ -1,44 +1,51 @@ # $OpenBSD: Makefile,v 1.14 2013/08/07 21:58:00 naddy Exp $ COMMENT= command line double-entry accounting ledger +V= 3.1.1 -DISTNAME= ledger-2.6.3 -REVISION= 2 +DISTNAME= ${GH_PROJECT}-${V} CATEGORIES=productivity HOMEPAGE= http://www.ledger-cli.org/ MAINTAINER=Sergey Bronnikov-SHARED_LIBS= amounts 0.0 +SHARED_LIBS= ledger 0.0 # BSD PERMIT_PACKAGE_CDROM= Yes -MASTER_SITES= https://github.com/downloads/jwiegley/ledger/ +GH_ACCOUNT = ledger +GH_PROJECT = ledger +GH_TAGNAME = v${V} + +WANTLIB+= boost_date_time-mt boost_filesystem-mt boost_iostreams-mt +WANTLIB+= boost_regex-mt boost_system-mt boost_unit_test_framework-mt +WANTLIB+= c estdc++ gmp>=4 m mpfr pthread + +BUILD_DEPENDS= lang/gcc/4.9,-c++>=4.9 \ + devel/cmake + +LIB_DEPENDS= devel/boost \ + devel/gmp \ + devel/mpfr \ + ${MODGCC4_CPPLIBDEP} -WANTLIB= c gmp>=4 m pcre stdc++ +MODULES= devel/cmake \ + gcc4 -LIB_DEPENDS= devel/gmp \ - devel/pcre +MODGCC4_LANGS= c++ +MODGCC4_ARCHS= * SEPARATE_BUILD=Yes +CONFIGURE_ENV= CC=egcc CXX=eg++ +CONFIGURE_ARGS=-DUSE_PYTHON=OFF -DBUILD_LIBRARY=ON -CONFIGURE_STYLE=gnu -CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - EMACS=no -CONFIGURE_ARGS=--disable-xml \ - --disable-ofx +NO_TEST = Yes post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ledger - ${INSTALL_DATA} ${WRKSRC}/scripts/* ${PREFIX}/share/doc/ledger -.for f in ledger.texi ledger.vim - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/ledger -.endfor ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ledger - ${INSTALL_DATA} ${WRKSRC}/sample.dat ${PREFIX}/share/examples/ledger + ${INSTALL_DATA} ${WRKSRC}/test/input/sample.dat ${PREFIX}/share/examples/ledger .include Index: distinfo === RCS file: /cvs/ports/productivity/ledger/distinfo,v retrieving revision 1.5 diff -u -p -u -r1.5 distinfo --- distinfo18 Jan 2015 03:14:59 - 1.5 +++ distinfo15 Mar 2016 18:00:03 - @@ -1,2 +1,2 @@ -SHA256 (ledger-2.6.3.tar.gz) = s+zQF0o1ALuW/gR2F7HuhwzFGW3rAjA5PZM9zq639xc= -SIZE (ledger-2.6.3.tar.gz) = 660752 +SHA256 (ledger-3.1.1.tar.gz) = kPBlYatpKxktRtZ7wQYVjanGxoE8w4SLUDJDqd/YVIo= +SIZE (ledger-3.1.1.tar.gz) = 842364 Index: patches/patch-src_CMakeLists_txt === RCS file: patches/patch-src_CMakeLists_txt diff -N patches/patch-src_CMakeLists_txt --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_CMakeLists_txt15 Mar 2016 18:00:03 - @@ -0,0 +1,53 @@ +$OpenBSD$ +--- src/CMakeLists.txt.origMon Jan 11 16:59:38 2016 src/CMakeLists.txt Tue Mar 15 17:26:08 2016 +@@ -263,21 +263,21 @@ include(GNUInstallDirs) + + if (BUILD_LIBRARY) + set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}") +- add_library(libledger SHARED ${LEDGER_SOURCES}) +- add_ledger_library_dependencies(libledger) +- set_target_properties(libledger PROPERTIES +-PREFIX "" ++ add_library(ledger SHARED ${LEDGER_SOURCES}) ++ add_ledger_library_dependencies(ledger) ++ set_target_properties(ledger PROPERTIES + INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}" + VERSION ${Ledger_VERSION_MAJOR} + SOVERSION ${Ledger_VERSION_MAJOR}) + +- add_executable(ledger main.cc global.cc) +- target_link_libraries(ledger libledger) ++ add_executable(ledger-bin main.cc global.cc) ++ set_target_properties(ledger-bin PROPERTIES OUTPUT_NAME ledger) ++ target_link_libraries(ledger-bin ledger) + if (CMAKE_SYSTEM_NAME STREQUAL Darwin AND HAVE_BOOST_PYTHON) +-target_link_libraries(ledger ${PYTHON_LIBRARIES}) ++target_link_libraries(ledger-bin ${PYTHON_LIBRARIES}) + endif() + +- install(TARGETS libledger DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ install(TARGETS ledger DESTINATION ${CMAKE_INSTALL_LIBDIR}) + install(FILES ${LEDGER_INCLUDES} + DESTINATION
Re: Maven-based projects vs. our build process
On Tue, Mar 15, 2016 at 12:56:22PM -0400, Bryan C. Everly wrote: > Hi, > > I have several maven-based projects that I'd like to create ports for, but > our build process makes that challenging. > > Maven (for those who don't know) likes to download additional files as it > compiles which is a non-starter for our build process. A solution that I > have found to work around this is to run maven once, let it cache the files > locally, turn them into a tarball which I then place in my "files" > directory and make the real port run maven in offline mode from the cached > files in the tarball. Upload the tarball to somewhere and use {pre,post,do}-configure,build,etc to build the port. (look in man bsd.port.mk) You can use various distfiles per port. > > This process works, but it sure seems awkward. > > Does anyone have any suggestions on how I could make this better? > > Or even better, perhaps I'm missing an understanding of part of the build > infrastructure that I could get educated on. :-) > > Thanks, > Bryan -- Juan Francisco Cantero Hurtado http://juanfra.info
Maven-based projects vs. our build process
Hi, I have several maven-based projects that I'd like to create ports for, but our build process makes that challenging. Maven (for those who don't know) likes to download additional files as it compiles which is a non-starter for our build process. A solution that I have found to work around this is to run maven once, let it cache the files locally, turn them into a tarball which I then place in my "files" directory and make the real port run maven in offline mode from the cached files in the tarball. This process works, but it sure seems awkward. Does anyone have any suggestions on how I could make this better? Or even better, perhaps I'm missing an understanding of part of the build infrastructure that I could get educated on. :-) Thanks, Bryan
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2016/03/15 10:50:17 Removed files: audio/mpg123/patches: patch-src_common_c patch-src_libout123_module_c patch-src_metaprint_c patch-src_mpg123-id3dump_c Log message: no longer required since stdio.h revision 1.51
Re: [NEW] databases/liquibase
Stuart, Thanks so much for the feedback. I have incorporated all of the suggested changes in the attached tarball. Can I get an ok on this and have someone please commit on my behalf? Thanks, Bryan On Sun, Mar 13, 2016 at 5:24 PM, Stuart Hendersonwrote: > | COMMENT = Manage sql database schemas via config files > > please lowercase M (and I'd uppercase SQL..) > > | MODJAVA_VER = 1.7 > > is 1.7 a hard dep? 1.7+ is better if it works with 1.8. > > | +LIQUIBASE_HOME=/usr/local/share/java/classes/liquibase > > /usr/local -> ${LOCALBASE} > > | See http://liquibase.org for full documentation. > > This will be followed directly by "WWW: http://liquibase.org/; in > pkg_info output, is the duplication needed? > > Also please follow the standard layout for README, see > ports/infrastructure/templates/README.template. > liquibase.tgz Description: GNU Zip compressed data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: lan...@cvs.openbsd.org 2016/03/15 09:10:56 Removed files: www/mozilla-firefox/patches: patch-browser_base_content_aboutcerterror_aboutCertError_xhtml Log message: Forgot to cvs rm the patch cliking on the ssl exception button. Didnt apply anymore anyway. Reported by nigel@, thanks!
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2016/03/15 09:07:36 Modified files: www/varnish: Makefile distinfo www/varnish/pkg: PLIST Log message: Update for Varnish to 4.1.2: https://github.com/varnishcache/varnish-cache/blob/4.1/doc/changes.rst OK benoit@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gonz...@cvs.openbsd.org 2016/03/15 09:03:57 Modified files: sysutils/logstalgia: Makefile distinfo sysutils/logstalgia/patches: patch-src_logstalgia_cpp Log message: Update for Logstalgia to 1.0.7: Added window frame toggle (F11). Fixed crash when taking a screenshot with an odd resolution. Handle exception when user defined regular expression is invalid. Fixed --hide-url-prefix not working (jettero). +Switch to SDL2 OK kirby@
Re: textproc/vislcg3 broken?
On 2016/03/14 22:04, Antoine Jacoutot wrote: > I haven't followed ports too closely these past few days but textproc/vislcg3 > failed in my last bulk. Building icu4c with gcc 4.9 or with clang fixes vislcg3, but then breaks other things unless they are also built with gcc 4.9 or clang, and will result in a whole bunch of things pulling in conflicting libraries, both stdc++ (often via Mesa's libGLU) and estdc++. (i.e. taking us back to approximately the place we were before gcc 4.2 was imported to base - which we were able to sidestep for a while with the older version of clang that was able to compile newer programs than 4.2.1 while still using base's libstdc++ - which we can no longer do following the change in the clang port to using libestdc++). The most "correct" fixes that I can see would either be to use libc++/clang in base, or build all c++ (including that in xenocara) with ports compilers and linked with estdc++. Untested but I wonder if removing --std=c++0x from CXXFLAGS in icu4c's pkg-config files might help as a dirty workaround for now...
NEW: net/nagios/check_rabbitmq
Hi, cat pkg/DESCR: This package contains a set of nagios checks useful for monitoring a RabbitMQ server. They use the RabbitMQ management interface with is over HTTP and therefore have a very light profile on the nagios server. I'm using it with Icinga2. While creating the port, took inspiration of the net/nagios/check_sip plugin. The package name is nagios-plugins-rabbitmq, following the name of the github project, if preferred, it could also named check_rabbitmq. comments, reviews OKs, welcome. cheers, Sebastian check_rabbitmq.tar.gz Description: application/gzip
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/03/15 06:42:08 Modified files: databases/mariadb: Makefile distinfo databases/mariadb/patches: patch-storage_connect_reldef_cpp databases/mariadb/pkg: PLIST-main PLIST-tests Removed files: databases/mariadb/patches: patch-storage_innobase_include_os0sync_h patch-storage_xtradb_include_os0sync_h Log message: Update to mariadb-10.0.24, from Brad. I've tested on macppc/amd64, and thanks to Markus Lude for testing on sparc64.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2016/03/15 06:36:51 Modified files: devel/p5-Canary-Stability: Makefile distinfo Log message: update to p5-Canary-Stability-2011
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2016/03/15 05:01:57 Modified files: net/farstream : Makefile distinfo Log message: update to farstream-0.2.8
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2016/03/15 04:25:31 Modified files: graphics/gthumb: Makefile distinfo Log message: update to gthumb-3.4.2
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2016/03/15 04:11:25 Modified files: www/epiphany : Makefile distinfo Log message: update to epiphany-3.18.5
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2016/03/15 03:47:49 Modified files: mail/evolution : Makefile distinfo Log message: Update to evolution-3.18.5.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: piro...@cvs.openbsd.org 2016/03/15 03:00:51 Modified files: www/youtube-dl : Makefile distinfo www/youtube-dl/pkg: PLIST Log message: Update to youtube-dl 2016.03.14 New extractors: - audioboom - dw - makerschannel - minoto - usatoday
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2016/03/15 02:34:52 Modified files: productivity/tryton/account: Makefile distinfo Log message: Update to trytond-module-account-3.2.8.
Re: llvm/Makefile 1.110
On Tue, Mar 15, 2016 at 09:18:18AM +0100, hans wrote: > http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/devel/llvm/Makefile > http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/devel/llvm/Makefile.diff?r1=1.109=1.110=h > > The commit message for 1.110 talks about arranging the -L arguments > but the actual diff seems to only contain REVISION = 0 > yes, because at the same time, the commit included also changes in devel/llvm/patches/patch-tools_clang_lib_Driver_Tools_cpp file. http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/devel/llvm/patches/patch-tools_clang_lib_Driver_Tools_cpp -- Sebastien Marie
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2016/03/15 02:35:09 Modified files: productivity/tryton/stock_supply_day: Makefile distinfo Log message: Update to trytond-module-stock_supply_day-3.2.3.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2016/03/15 02:34:21 Modified files: productivity/tryton/trytond: Makefile distinfo Log message: Update to trytond-3.2.14.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2016/03/15 02:34:35 Modified files: productivity/tryton/tryton: Makefile distinfo Log message: Update to tryton-3.2.14.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2016/03/15 02:26:06 Modified files: emulators/qemu/patches: patch-configure Log message: Tweak for CFLAGS handling. No change in resulting binary. from Brad (maintainer)
llvm/Makefile 1.110
http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/devel/llvm/Makefile http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/devel/llvm/Makefile.diff?r1=1.109=1.110=h The commit message for 1.110 talks about arranging the -L arguments but the actual diff seems to only contain REVISION = 0 Jan