Re: NEW: security/qgpgme; Update security/gpgme, mail/trojita; remove: x11/kde-applications/gpgmepp
On Sun, Mar 18, 2018 at 12:43:41PM +, Stuart Henderson wrote: > I think this one is post-release. So, definitely post-release. You'll also need to bump all gpgme consumers, since they all fail to package because the dependency changes: -@depend security/gpgme:gpgme-*:gpgme-1.9.0p0 +@depend security/gpgme,-main:gpgme-*:gpgme-1.10.0
Re: Update devel/tkcvs from 6.0 to 8.2.3
On Mon, Mar 19, 2018 at 12:31 PM, Todd T. Fries wrote: > Feel free to take maintainership also, I'm not using this anymore. > > Thanks, > > Penned by Stuart Henderson on 20180319 5:35.24, we have: > | On 2018/03/18 21:25, Currell Berry wrote: > | > Thank you for your help -- here is another revision of the patches -- > | > the first one for tkcvs and the second one for kde4/dev-scripts. > | > | There's not much point including a copy of tkdiff here, it's identical > | to the standalone one. Let's remove it in favour of a dep and get rid > | of the conflict. > | > | Couple of other tweaks: rewrap DESCR (no more lines but flows better), > | put HOMEPAGE in the normal place, use https, drop the "only" from > | license information as it's not clear in the distfile (it's not done > | correctly anyway as there's no copyright assignment but at least the > | intent is clear - and v6.0 that we have in tree has nothing in the > | distfile at all except for a small piece of code reused from something > | else so what's in-tree now is wrong for sure). > | > | Ok @Todd I'll give it a go at being maintainer for this if that's ok with others. Below is another version of the patch incorporating the new feedback. Note that the patch below also includes the small changes to the tkdiff port and the kde-dev-scripts port removing their respective @conflicts with tkcvs. -Currell Index: devel/tkcvs/Makefile === RCS file: /cvs/ports/devel/tkcvs/Makefile,v retrieving revision 1.33 diff -u -p -r1.33 Makefile --- devel/tkcvs/Makefile 22 Jan 2015 18:41:16 - 1.33 +++ devel/tkcvs/Makefile 20 Mar 2018 01:53:01 - @@ -1,28 +1,28 @@ # $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 CATEGORIES= devel -MAINTAINER= Todd T. Fries +HOMEPAGE= https://www.twobarleycorns.net/tkcvs.html +MAINTAINER= Currell Berry + +# License GPLv2 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/} \ + https://www.twobarleycorns.net/ MODULES= x11/tk -RUN_DEPENDS= ${MODTK_RUN_DEPENDS} +RUN_DEPENDS= ${MODTK_RUN_DEPENDS} devel/tkdiff 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} + cd ${PREFIX}/bin && ${MODTCL_WISH_ADJ} tkcvs .include Index: devel/tkcvs/distinfo === RCS file: /cvs/ports/devel/tkcvs/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- devel/tkcvs/distinfo 18 Jan 2015 03:13:48 - 1.4 +++ devel/tkcvs/distinfo 20 Mar 2018 01:53:01 - @@ -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: devel/tkcvs/patches/patch-doinstall_tcl === RCS file: devel/tkcvs/patches/patch-doinstall_tcl diff -N devel/tkcvs/patches/patch-doinstall_tcl --- /dev/null 1 Jan 1970 00:00:00 - +++ devel/tkcvs/patches/patch-doinstall_tcl 20 Mar 2018 01:53:01 - @@ -0,0 +1,21 @@ +$OpenBSD$ +don't install integrated tkdiff -- instead we depend on the tkdiff package. +Index: doinstall.tcl +--- doinstall.tcl.orig doinstall.tcl +@@ -69,12 +69,12 @@ proc doinstall { INSTALLROOT } { + set destfile [file join $BINDIR $TKCVS] + puts "Installing $TKCVS in $BINDIR" + file copy -force [file join tkcvs tkcvs.tcl] [file join $BINDIR $TKCVS] +- puts "Installing $TKDIFF in $BINDIR" +- file copy -force [file join tkdiff tkdiff] [file join $BINDIR $TKDIFF] ++ # puts "Installing $TKDIFF in $BINDIR" ++ # file copy -force [file join tkdiff tkdiff] [file join $BINDIR $TKDIFF] + + if {$tcl_platform(platform) == "unix"} { + file attributes $destfile -permissions 0755 +-file attributes [file join $BINDIR $TKDIFF] -permissions 0755 ++# file attributes [file join $BINDIR $TKDIFF] -permissions 0755 + file mkdir $MANDIR + puts "Installing manpage tkcvs.1 in $MANDIR" + file copy -force [file join tkcvs tkcvs.1] $MANDIR Index: devel/tkcvs/patches/patch-tkcvs_cvs_tcl === RCS file: devel/tkcvs/patches/patch-tkcvs_cvs_tcl diff -N devel/tkcvs/patches/patch-tkcvs_cvs_tcl --- devel/tkcvs/patches/patch
Re: upgrade ABCDE request - 2.9.1
On 2018-03-19 15.29.26 -0700, jungle Boogie wrote: > On 19 March 2018 at 15:06, Stuart Henderson wrote: > > btw, this was updated to 2.8.1 before, but it broke things quite badly > > so it was reverted.. > > Do you know if the regressions on the previous version were reported > upstream? This is the thread: https://marc.info/?l=openbsd-ports&m=151722260128733&w=2
Re: upgrade ABCDE request - 2.9.1
On 19 March 2018 at 15:06, Stuart Henderson wrote: > > btw, this was updated to 2.8.1 before, but it broke things quite badly > so it was reverted.. > > Oh, wow. I didn't know about abcde before today. I found the version in pkg quite useful for ripping a CD and noticed it was a little outdated. Do you know if the regressions on the previous version were reported upstream? -- --- inum: 883510009027723 sip: jungleboo...@sip2sip.info
Re: upgrade ABCDE request - 2.9.1
On 2018/03/19 15:01, jungle Boogie wrote: > Hi All, > > abcde was released the 9th of March: > https://abcde.einval.com/wiki/ > > Currently available in ports/packages is abcde version 2.7.2v0. > > Would it be possible for someone to have this updated? > > Thanks for the consideration. > > -- > --- > inum: 883510009027723 > sip: jungleboo...@sip2sip.info > btw, this was updated to 2.8.1 before, but it broke things quite badly so it was reverted..
upgrade ABCDE request - 2.9.1
Hi All, abcde was released the 9th of March: https://abcde.einval.com/wiki/ Currently available in ports/packages is abcde version 2.7.2v0. Would it be possible for someone to have this updated? Thanks for the consideration. -- --- inum: 883510009027723 sip: jungleboo...@sip2sip.info
Re: [NEW] converters/p5-Sereal-Encoder
On Tue, Mar 06, 2018 at 02:28:12PM +0100, Alexander Bluhm wrote: > On Sun, Feb 25, 2018 at 04:13:38PM +0100, Frederic Cambus wrote: > > Here is a new port: converters/p5-Sereal-Encoder > > I had some problems with linking -lzstd especially when this package > was installed. I would recommend to add archivers/zstd as lib > dependency and always use the library from the existing package. > > Also for the included Devel::CheckLib we have a package. I prefer > to add dependencies and remove the included stuff. Then I am sure > which software is used after all this build magic. That makes sense to me, thanks for pointing this out. > I think the following things should change: > - There are some source files with different license, the comment > should include them. > - add zstd to wantlib > - depend on devel/p5-Devel-CheckLib and archivers/zstd > - according to Makefile.PL p5-Sereal-Decoder version >=4.002 is > needed for testing. I prefer to keep the version in sync with > our test dependecies. > - remove the unused Devel/CheckLib and zstd > - patch to search for libraries in /usr/local > > I have included my proposed changes for p5-Sereal-Encoder. Again, thanks for this. I applied the same changes to p5-Sereal-Decoder, attaching updated tarballs. p5-Sereal-Encoder.tar.gz Description: application/tar-gz p5-Sereal-Decoder.tar.gz Description: application/tar-gz
Re: [PATCH] erlang tools
On 2018/03/19 21:39, Stuart Henderson wrote: > OK sthen@ too late with my ok I see ;-)
Re: [PATCH] erlang tools
OK sthen@ On 2018/03/18 09:07, Bill Karh wrote: > Ports, > > Here's a patch to help the erlang tools find their versioned selves. Before > the patch a simple command line compile would fail: > > $ erlc16 user_default.erl > erlc: Error 2 executing 'erl'. > > With this patch: > $ erlc16 user_default.erl > > (it works) > > Tested on amd64 for erlang16 through erlang19. No problems building rebar, > tsung, or erl-mochiweb with this patch. > > Thanks, > Bill Karh > Index: Makefile.inc > === > RCS file: /depot/cvs/openbsd/ports/lang/erlang/Makefile.inc,v > retrieving revision 1.15 > diff -u -p -r1.15 Makefile.inc > --- Makefile.inc 9 Dec 2017 21:28:58 - 1.15 > +++ Makefile.inc 13 Mar 2018 17:03:28 - > @@ -78,7 +78,13 @@ gen-versions: extract > > pre-configure: > ${SUBST_CMD} ${WRKSRC}/make/install_bin \ > + ${WRKSRC}/Makefile.in \ > + ${WRKSRC}/erts/etc/common/ct_run.c \ > + ${WRKSRC}/erts/etc/common/dialyzer.c \ > + ${WRKSRC}/erts/etc/common/erlc.c \ >${WRKSRC}/erts/etc/common/escript.c \ > + ${WRKSRC}/erts/etc/common/typer.c \ > + ${WRKSRC}/lib/dialyzer/src/dialyzer_plt.erl \ >${WRKSRC}/lib/wx/configure.in > > post-install: > Index: 16/Makefile > === > RCS file: /depot/cvs/openbsd/ports/lang/erlang/16/Makefile,v > retrieving revision 1.19 > diff -u -p -r1.19 Makefile > --- 16/Makefile 9 Dec 2017 21:28:58 - 1.19 > +++ 16/Makefile 3 Mar 2018 19:46:00 - > @@ -12,7 +12,7 @@ DISTNAME= otp_src_${V} > PKGNAME-main=erlang-16b.03 > PKGNAME-wx= erlang-wx-16b.03 > > -REVISION-main= 13 > +REVISION-main= 14 > REVISION-wx= 2 > > VERSION_SPEC=>=16v0,<17v0 > Index: 16/patches/patch-Makefile_in > === > RCS file: 16/patches/patch-Makefile_in > diff -N 16/patches/patch-Makefile_in > --- /dev/null 1 Jan 1970 00:00:00 - > +++ 16/patches/patch-Makefile_in 15 Mar 2018 17:01:52 - > @@ -0,0 +1,15 @@ > +$OpenBSD$ > + > +Create symlink so the build can handle versioned binaries > + > +Index: Makefile.in > +--- Makefile.in.orig > Makefile.in > +@@ -516,6 +516,7 @@ $(BOOTSTRAP_ROOT)/bootstrap/bin/erl: $(ERL_TOP)/erts/e > + $(ERL_TOP)/erts/etc/unix/erl.src.src > \ > + $(BOOTSTRAP_ROOT)/bootstrap/bin/erl > + @chmod 755 $(BOOTSTRAP_ROOT)/bootstrap/bin/erl > ++@(cd $(BOOTSTRAP_ROOT)/bootstrap/bin && $(LN_S) ./erl erl${MAJ_V}) > + > + $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc: $(ERL_TOP)/bin/$(TARGET)/erlc > $(BOOTSTRAP_ROOT)/bootstrap/target > + @rm -f $(BOOTSTRAP_ROOT)/bootstrap/bin/erlc > Index: 16/patches/patch-erts_etc_common_ct_run_c > === > RCS file: 16/patches/patch-erts_etc_common_ct_run_c > diff -N 16/patches/patch-erts_etc_common_ct_run_c > --- /dev/null 1 Jan 1970 00:00:00 - > +++ 16/patches/patch-erts_etc_common_ct_run_c 15 Mar 2018 16:56:42 - > @@ -0,0 +1,16 @@ > +$OpenBSD$ > + > +Let erlang test runner handle versioned binaries. > + > +Index: erts/etc/common/ct_run.c > +--- erts/etc/common/ct_run.c.orig > erts/etc/common/ct_run.c > +@@ -49,7 +49,7 @@ static int eargc; /* Number of arguments in > eargv. */ > + #else > + # define QUOTE(s) s > + # define IS_DIRSEP(c) ((c) == '/') > +-# define ERL_NAME "erl" > ++# define ERL_NAME "erl${MAJ_V}" > + #endif > + > + #define UNSHIFT(s) eargc++, eargv--; eargv[0] = QUOTE(s) > Index: 16/patches/patch-erts_etc_common_dialyzer_c > === > RCS file: 16/patches/patch-erts_etc_common_dialyzer_c > diff -N 16/patches/patch-erts_etc_common_dialyzer_c > --- /dev/null 1 Jan 1970 00:00:00 - > +++ 16/patches/patch-erts_etc_common_dialyzer_c 15 Mar 2018 16:56:08 > - > @@ -0,0 +1,16 @@ > +$OpenBSD$ > + > +Let static analyzer handle versioned binaries. > + > +Index: erts/etc/common/dialyzer.c > +--- erts/etc/common/dialyzer.c.orig > erts/etc/common/dialyzer.c > +@@ -49,7 +49,7 @@ static int eargc; /* Number of arguments in > eargv. */ > + #else > + # define QUOTE(s) s > + # define IS_DIRSEP(c) ((c) == '/') > +-# define ERL_NAME "erl" > ++# define ERL_NAME "erl${MAJ_V}" > + #endif > + > + #define UNSHIFT(s) eargc++, eargv--; eargv[0] = QUOTE(s) > Index: 16/patches/patch-erts_etc_common_erlc_c > === > RCS file: 16/patches/patch-erts_etc_common_erlc_c > diff -N 16/patches/patch-erts_etc_common_erlc_c > --- /dev/null 1 Jan 1970 00:00:00 - > +++ 16/patches/patch-erts_etc_common_erlc_c 15 Mar 2018 16:55:01 - > @@ -0,0 +1,16 @@ > +$OpenBSD$ > + > +Let erlang
Re: UPDATE security/gpgme
On Mon, Mar 19, 2018 at 05:32:35PM +0100, Rafael Sadowski wrote: > On Fri Feb 23, 2018 at 01:04:24PM +, Stuart Henderson wrote: > > On 2018/02/23 13:52, Björn Ketelaars wrote: > > > Enclosed a diff for bringing gpgme to the latest version [0]. No issues > > > found with 'make test', or while build testing numerous consumers. > > > > rsadowski has a larger diff to update and add qgpgme, that I or someone > > else needs to look at .. (subject "Re: NEW: security/qgpgme; Update > > security/gpgme, mail/trojita; remove: x11/kde-applications/gpgmepp") > > > > Maybe something for pre 6.3? This diff includes a fix spotted by landry@ > in a bulk. We need the gpg2 link at the build process. Given the amount of ports that depend on gpgme, an update is not in reasonable before the lock now. Fixing the target (and the comment) only, maybe more :)
Re: UPDATE security/gpgme
On Fri Feb 23, 2018 at 01:04:24PM +, Stuart Henderson wrote: > On 2018/02/23 13:52, Björn Ketelaars wrote: > > Enclosed a diff for bringing gpgme to the latest version [0]. No issues > > found with 'make test', or while build testing numerous consumers. > > rsadowski has a larger diff to update and add qgpgme, that I or someone > else needs to look at .. (subject "Re: NEW: security/qgpgme; Update > security/gpgme, mail/trojita; remove: x11/kde-applications/gpgmepp") > Maybe something for pre 6.3? This diff includes a fix spotted by landry@ in a bulk. We need the gpg2 link at the build process. Index: Makefile === RCS file: /cvs/ports/security/gpgme/Makefile,v retrieving revision 1.40 diff -u -p -u -p -r1.40 Makefile --- Makefile30 Jan 2018 15:06:37 - 1.40 +++ Makefile19 Mar 2018 16:30:17 - @@ -2,11 +2,10 @@ COMMENT= GnuPG Made Easy -DISTNAME= gpgme-1.9.0 -REVISION= 0 +DISTNAME= gpgme-1.10.0 CATEGORIES=security devel -SHARED_LIBS += gpgme21.0 # 29.0 +SHARED_LIBS += gpgme22.0 # 29.0 HOMEPAGE= https://www.gnupg.org/software/gpgme/index.html @@ -34,7 +33,7 @@ LIB_DEPENDS= devel/gettext \ # `./t-support.h:160: GPGME: Invalid crypto engine' # https://dev.gnupg.org/T3512 TEST_DEPENDS +=security/gnupg2 -pre-test: +pre-build: ln -sf ${LOCALBASE}/bin/gpg2 ${WRKDIR}/bin/gpg # needed for the regression tests Index: distinfo === RCS file: /cvs/ports/security/gpgme/distinfo,v retrieving revision 1.13 diff -u -p -u -p -r1.13 distinfo --- distinfo2 Dec 2017 12:44:33 - 1.13 +++ distinfo19 Mar 2018 16:30:17 - @@ -1,2 +1,2 @@ -SHA256 (gpgme-1.9.0.tar.bz2) = Gyn+24v613XnDq+sWwWQYhaDstmGnbmUVo5kAfQDTOs= -SIZE (gpgme-1.9.0.tar.bz2) = 1344222 +SHA256 (gpgme-1.10.0.tar.bz2) = Go/tEZfDuZw19AMGa7NEomIk0pKvwEjP38TM1WkKBpM= +SIZE (gpgme-1.10.0.tar.bz2) = 1370162
Re: Update devel/tkcvs from 6.0 to 8.2.3
Feel free to take maintainership also, I'm not using this anymore. Thanks, Penned by Stuart Henderson on 20180319 5:35.24, we have: | On 2018/03/18 21:25, Currell Berry wrote: | > Thank you for your help -- here is another revision of the patches -- | > the first one for tkcvs and the second one for kde4/dev-scripts. | | There's not much point including a copy of tkdiff here, it's identical | to the standalone one. Let's remove it in favour of a dep and get rid | of the conflict. | | Couple of other tweaks: rewrap DESCR (no more lines but flows better), | put HOMEPAGE in the normal place, use https, drop the "only" from | license information as it's not clear in the distfile (it's not done | correctly anyway as there's no copyright assignment but at least the | intent is clear - and v6.0 that we have in tree has nothing in the | distfile at all except for a small piece of code reused from something | else so what's in-tree now is wrong for sure). | | | | Index: devel/tkcvs/Makefile | === | RCS file: /cvs/ports/devel/tkcvs/Makefile,v | retrieving revision 1.33 | diff -u -p -r1.33 Makefile | --- devel/tkcvs/Makefile 22 Jan 2015 18:41:16 - 1.33 | +++ devel/tkcvs/Makefile 19 Mar 2018 10:26:33 - | @@ -1,28 +1,30 @@ | # $OpenBSD: Makefile,v 1.33 2015/01/22 18:41:16 naddy Exp $ | | COMMENT= graphical frontend to CVS | -DISTNAME=tkcvs-6.0 | -REVISION = 5 | +DISTNAME=tkcvs-8.2.3 | CATEGORIES= devel | | +HOMEPAGE=https://www.twobarleycorns.net/tkcvs.html | + | MAINTAINER= Todd T. Fries | | +# GPLv2 | 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/} \ | + https://www.twobarleycorns.net/ | | MODULES= x11/tk | -RUN_DEPENDS= ${MODTK_RUN_DEPENDS} | -BUILD_DEPENDS= ${RUN_DEPENDS} | +BUILD_DEPENDS= ${MODTK_RUN_DEPENDS} | +RUN_DEPENDS= ${MODTK_RUN_DEPENDS} \ | + devel/tkdiff | | 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} | + rm ${PREFIX}/bin/tkdiff | + cd ${PREFIX}/bin && ${MODTCL_WISH_ADJ} tkcvs | | .include | Index: devel/tkcvs/distinfo | === | RCS file: /cvs/ports/devel/tkcvs/distinfo,v | retrieving revision 1.4 | diff -u -p -r1.4 distinfo | --- devel/tkcvs/distinfo 18 Jan 2015 03:13:48 - 1.4 | +++ devel/tkcvs/distinfo 19 Mar 2018 10:26:33 - | @@ -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: devel/tkcvs/patches/patch-tkcvs_cvs_tcl | === | RCS file: devel/tkcvs/patches/patch-tkcvs_cvs_tcl | diff -N devel/tkcvs/patches/patch-tkcvs_cvs_tcl | --- devel/tkcvs/patches/patch-tkcvs_cvs_tcl 26 Oct 2007 20:44:35 - 1.1 | +++ /dev/null 1 Jan 1970 00:00:00 - | @@ -1,12 +0,0 @@ | -$OpenBSD: patch-tkcvs_cvs_tcl,v 1.1 2007/10/26 20:44:35 ajacoutot Exp $ | tkcvs/cvs.tcl.orig Sat May 25 04:54:58 1996 | -+++ tkcvs/cvs.tclFri Oct 26 22:41:28 2007 | -@@ -285,7 +285,7 @@ proc cvs_commit {revision comment args} { | - # -sj | - set errstr "You must select files to be committed with CVS version" | - set errstr "$errstr $cvscfg(cvsver)." | -- set errstr "$errstr\n\nEither select a list of files or upgrade | -+ set errstr "$errstr\n\nEither select a list of files or upgrade" | - set errstr "$errstr your CVS to version 1.3" | - cvserror "$errstr" | - return | Index: devel/tkcvs/patches/patch-tkcvs_doinstall | === | RCS file: devel/tkcvs/patches/patch-tkcvs_doinstall | diff -N devel/tkcvs/patches/patch-tkcvs_doinstall | --- devel/tkcvs/patches/patch-tkcvs_doinstall 13 Mar 2009 13:36:57 - 1.2 | +++ /dev/null 1 Jan 1970 00:00:00 - | @@ -1,131 +0,0 @@ | -$OpenBSD: patch-tkcvs_doinstall,v 1.2 2009/03/13 13:36:57 sthen Exp $ | tkcvs/doinstall.orig Tue Jan 9 21:17:52 1996 | -+++ tkcvs/doinstall Fri Mar 13 13:28:27 2009 | -@@ -2,39 +2,32 @@ | - # | - # $Id: patch-tkcvs_doinstall,v 1.2 2009/03/13 13:36:57 sthen Exp $ | - # | -- | -+PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALBASE}/bin | - # Some rational and reasonable defaults. | - | --IN
Re: NEW: devel/qp
On Mon, Mar 19, 2018 at 12:01:20AM -0600, Anthony J. Bentley wrote: > On Mon, Feb 26, 2018 at 2:18 AM, Anthony J. Bentley > wrote: > > On Wed, Feb 14, 2018 at 2:11 AM, Anthony J. Bentley > > wrote: > >> On Sat, Jan 27, 2018 at 8:12 PM, Anthony J. Bentley > >> wrote: > >>> On Fri, Jan 5, 2018 at 2:27 AM, Anthony J. Bentley > >>> wrote: > QP/C (Quantum Platform in C) is a lightweight, open source software > framework/RTOS for building reactive real-time embedded applications as > systems of cooperating, event-driven active objects (actors). The QP/C > framework is a member of a larger QP family consisting of QP/C, QP/C++, > and > QP-nano frameworks, which are all strictly quality controlled, thoroughly > documented, and commercially licensable. > > > This port includes QP/C and QP/C++, but not QP-nano, as it doesn't > include a POSIX port like the others. > > I've seen this framework used in several embedded projects. If you > want to test it, there are some simple examples (which don't make > sense to install) under examples/posix that you can compile with > "gmake INCLUDES=-I/usr/local/include/qpc" (or qpcpp). > > ok? > > Anyone? Builds and installs fine here. OK abieber@ -- PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A 4AF0 1F81 112D 62A9 ADCE
Re: Update devel/tkcvs from 6.0 to 8.2.3
On 2018/03/18 21:25, Currell Berry wrote: > Thank you for your help -- here is another revision of the patches -- > the first one for tkcvs and the second one for kde4/dev-scripts. There's not much point including a copy of tkdiff here, it's identical to the standalone one. Let's remove it in favour of a dep and get rid of the conflict. Couple of other tweaks: rewrap DESCR (no more lines but flows better), put HOMEPAGE in the normal place, use https, drop the "only" from license information as it's not clear in the distfile (it's not done correctly anyway as there's no copyright assignment but at least the intent is clear - and v6.0 that we have in tree has nothing in the distfile at all except for a small piece of code reused from something else so what's in-tree now is wrong for sure). Index: devel/tkcvs/Makefile === RCS file: /cvs/ports/devel/tkcvs/Makefile,v retrieving revision 1.33 diff -u -p -r1.33 Makefile --- devel/tkcvs/Makefile22 Jan 2015 18:41:16 - 1.33 +++ devel/tkcvs/Makefile19 Mar 2018 10:26:33 - @@ -1,28 +1,30 @@ # $OpenBSD: Makefile,v 1.33 2015/01/22 18:41:16 naddy Exp $ COMMENT= graphical frontend to CVS -DISTNAME= tkcvs-6.0 -REVISION = 5 +DISTNAME= tkcvs-8.2.3 CATEGORIES=devel +HOMEPAGE= https://www.twobarleycorns.net/tkcvs.html + MAINTAINER=Todd T. Fries +# GPLv2 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/} \ + https://www.twobarleycorns.net/ MODULES= x11/tk -RUN_DEPENDS= ${MODTK_RUN_DEPENDS} -BUILD_DEPENDS= ${RUN_DEPENDS} +BUILD_DEPENDS= ${MODTK_RUN_DEPENDS} +RUN_DEPENDS= ${MODTK_RUN_DEPENDS} \ + devel/tkdiff 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} + rm ${PREFIX}/bin/tkdiff + cd ${PREFIX}/bin && ${MODTCL_WISH_ADJ} tkcvs .include Index: devel/tkcvs/distinfo === RCS file: /cvs/ports/devel/tkcvs/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- devel/tkcvs/distinfo18 Jan 2015 03:13:48 - 1.4 +++ devel/tkcvs/distinfo19 Mar 2018 10:26:33 - @@ -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: devel/tkcvs/patches/patch-tkcvs_cvs_tcl === RCS file: devel/tkcvs/patches/patch-tkcvs_cvs_tcl diff -N devel/tkcvs/patches/patch-tkcvs_cvs_tcl --- devel/tkcvs/patches/patch-tkcvs_cvs_tcl 26 Oct 2007 20:44:35 - 1.1 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,12 +0,0 @@ -$OpenBSD: patch-tkcvs_cvs_tcl,v 1.1 2007/10/26 20:44:35 ajacoutot Exp $ tkcvs/cvs.tcl.orig Sat May 25 04:54:58 1996 -+++ tkcvs/cvs.tcl Fri Oct 26 22:41:28 2007 -@@ -285,7 +285,7 @@ proc cvs_commit {revision comment args} { - # -sj - set errstr "You must select files to be committed with CVS version" - set errstr "$errstr $cvscfg(cvsver)." -- set errstr "$errstr\n\nEither select a list of files or upgrade -+ set errstr "$errstr\n\nEither select a list of files or upgrade" - set errstr "$errstr your CVS to version 1.3" - cvserror "$errstr" - return Index: devel/tkcvs/patches/patch-tkcvs_doinstall === RCS file: devel/tkcvs/patches/patch-tkcvs_doinstall diff -N devel/tkcvs/patches/patch-tkcvs_doinstall --- devel/tkcvs/patches/patch-tkcvs_doinstall 13 Mar 2009 13:36:57 - 1.2 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,131 +0,0 @@ -$OpenBSD: patch-tkcvs_doinstall,v 1.2 2009/03/13 13:36:57 sthen Exp $ tkcvs/doinstall.orig Tue Jan 9 21:17:52 1996 -+++ tkcvs/doinstallFri Mar 13 13:28:27 2009 -@@ -2,39 +2,32 @@ - # - # $Id: patch-tkcvs_doinstall,v 1.2 2009/03/13 13:36:57 sthen Exp $ - # -- -+PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALBASE}/bin - # Some rational and reasonable defaults. - --INSTALLDIR=/usr/local/lib --BINDIR=/usr/local/bin --MANDIR=/usr/local/man/mann -+INSTALLDIR=${LOCALBASE}/libdata -+BINDIR=${LOCALBASE}/bin -+MANDIR=${LOCALBASE}/man/mann - - INSTALL_PROG=./install-sh - - # This must be an X based editor -- do NOT use vi except via an xterm - # or shelltool. - --EDITOR=nedit -+EDITOR=xedit - - # Find a Tk interpreter. - --WISH=`which wish4.0` --if [ ! -f $WISH ]; then -- WISH=`which wish4.1` --fi --if [ ! -f $WISH ]; then -+WISH=${MODTK_B