Re: UPDATE: devel/quilt 0.66
On Mon, Apr 08, 2019 at 10:40:50AM +0200, Jeremie Courreges-Anglas wrote:
> On Wed, Apr 03 2019, "Kent R. Spillner" wrote:
> > On Tue, Apr 02, 2019 at 09:46:31PM -0400, Brian Callahan wrote:
> >> Couple things:
> >> 1. Patch applied with fuzz so re-run `make update-patches'
> >> 2. When I ran `make update-plist' the PLIST got updated.
> >> It added a 7z wrapper. So looks like either
> >> archivers/p7zip has to be added to the deps or
> >> --without-7z in the configure args.
>
> I don't think we should add a RUN_DEPENDS on p7zip.
>
> We *could* add a BUILD_DEPENDS to avoid the warning message and have the
> compat symlink shipped by the package. But we have only one '7z'
> executable in base + ports so the compat symlink doesn't help much.
>
> A RUN_DEPENDS on p7zip means 7MB of extra binaries for a rather limited
> use case IMO. By following the same logic we would add archivers/bzip2,
> archivers/xz, archivers/lzip etc to RUN_DEPENDS.
Good point, I'll just disable 7z support. Ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/quilt/Makefile,v
retrieving revision 1.12
diff -u -p -p -u -r1.12 Makefile
--- Makefile17 Nov 2017 15:20:00 - 1.12
+++ Makefile23 Apr 2019 15:32:06 -
@@ -2,8 +2,7 @@
COMMENT= manage large numbers of patches
-DISTNAME= quilt-0.65
-REVISION= 0
+DISTNAME= quilt-0.66
CATEGORIES=devel
HOMEPAGE= http://savannah.nongnu.org/projects/quilt/
@@ -39,6 +38,7 @@ CONFIGURE_ARGS= --with-date=${LOCALBASE
--with-md5sum=${LOCALBASE}/bin/gmd5sum \
--with-patch=${LOCALBASE}/bin/gpatch \
--with-sed=${LOCALBASE}/bin/gsed \
+ --without-7z \
--without-patch-wrapper \
--without-rpmbuild
Index: distinfo
===
RCS file: /cvs/ports/devel/quilt/distinfo,v
retrieving revision 1.5
diff -u -p -p -u -r1.5 distinfo
--- distinfo17 Nov 2017 14:59:18 - 1.5
+++ distinfo23 Apr 2019 15:32:06 -
@@ -1,2 +1,2 @@
-SHA256 (quilt-0.65.tar.gz) = 9svHiOXLuzgaPG6rW5785nx3aoZip3lcdDL9J6oJaBk=
-SIZE (quilt-0.65.tar.gz) = 410780
+SHA256 (quilt-0.66.tar.gz) = MUsxmm/rE7+dD5/6fOZoOwaRnnNKQSdQh+pFfMncbgc=
+SIZE (quilt-0.66.tar.gz) = 413069
Index: patches/patch-test_delete_test
===
RCS file: /cvs/ports/devel/quilt/patches/patch-test_delete_test,v
retrieving revision 1.4
diff -u -p -p -u -r1.4 patch-test_delete_test
--- patches/patch-test_delete_test 10 Feb 2015 16:02:05 - 1.4
+++ patches/patch-test_delete_test 23 Apr 2019 15:32:06 -
@@ -1,6 +1,7 @@
$OpenBSD: patch-test_delete_test,v 1.4 2015/02/10 16:02:05 kspillner Exp $
test/delete.test.orig Fri Feb 28 07:15:45 2014
-+++ test/delete.test Mon Feb 9 14:00:08 2015
+Index: test/delete.test
+--- test/delete.test.orig
test/delete.test
@@ -79,7 +79,7 @@ Test the delete command.
# running as root, but you shouldn't do that anyway.
$ quilt delete "test3"
@@ -8,5 +9,5 @@ $OpenBSD: patch-test_delete_test,v 1.4 2
- >~ .*find: [`']?\./dir'?: Permission denied
+ >~ ${LOCALBASE}/bin/gfind: [`']?\./dir'?: Permission denied
- $ chmod a+rx .pc/test3/dir
+ $ chmod a+rx %{QUILT_PC}/test3/dir
Index: patches/patch-test_failbackup_test
===
RCS file: patches/patch-test_failbackup_test
diff -N patches/patch-test_failbackup_test
--- patches/patch-test_failbackup_test 17 Nov 2017 14:59:18 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-test_failbackup_test,v 1.1 2017/11/17 14:59:18 jca Exp $
-
-Index: test/failbackup.test
test/failbackup.test.orig
-+++ test/failbackup.test
-@@ -16,7 +16,7 @@ What happens when refresh fails because of a permissio
- $ cat > test.txt
- < This is updated test.txt.
- $ quilt refresh --backup
-- >~ mv: cannot move [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?:
Permission denied
-+ >~ mv: rename [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?: Permission
denied
- $ echo %{?}
- > 1
-
Re: UPDATE: devel/quilt 0.66
On Tue, Apr 02, 2019 at 09:46:31PM -0400, Brian Callahan wrote:
> Couple things:
> 1. Patch applied with fuzz so re-run `make update-patches'
> 2. When I ran `make update-plist' the PLIST got updated.
> It added a 7z wrapper. So looks like either
> archivers/p7zip has to be added to the deps or
> --without-7z in the configure args.
Sorry about that! Updated diff below.
Ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/quilt/Makefile,v
retrieving revision 1.12
diff -u -p -p -u -r1.12 Makefile
--- Makefile17 Nov 2017 15:20:00 - 1.12
+++ Makefile3 Apr 2019 15:37:57 -
@@ -2,8 +2,7 @@
COMMENT= manage large numbers of patches
-DISTNAME= quilt-0.65
-REVISION= 0
+DISTNAME= quilt-0.66
CATEGORIES=devel
HOMEPAGE= http://savannah.nongnu.org/projects/quilt/
@@ -16,7 +15,8 @@ MASTER_SITES= ${MASTER_SITE_SAVANNAH:=q
USE_GMAKE= Yes
-RUN_DEPENDS= devel/gpatch \
+RUN_DEPENDS= archivers/p7zip \
+ devel/gpatch \
lang/gawk \
misc/findutils \
misc/gnugetopt \
Index: distinfo
===
RCS file: /cvs/ports/devel/quilt/distinfo,v
retrieving revision 1.5
diff -u -p -p -u -r1.5 distinfo
--- distinfo17 Nov 2017 14:59:18 - 1.5
+++ distinfo3 Apr 2019 15:37:57 -
@@ -1,2 +1,2 @@
-SHA256 (quilt-0.65.tar.gz) = 9svHiOXLuzgaPG6rW5785nx3aoZip3lcdDL9J6oJaBk=
-SIZE (quilt-0.65.tar.gz) = 410780
+SHA256 (quilt-0.66.tar.gz) = MUsxmm/rE7+dD5/6fOZoOwaRnnNKQSdQh+pFfMncbgc=
+SIZE (quilt-0.66.tar.gz) = 413069
Index: patches/patch-test_delete_test
===
RCS file: /cvs/ports/devel/quilt/patches/patch-test_delete_test,v
retrieving revision 1.4
diff -u -p -p -u -r1.4 patch-test_delete_test
--- patches/patch-test_delete_test 10 Feb 2015 16:02:05 - 1.4
+++ patches/patch-test_delete_test 3 Apr 2019 15:37:57 -
@@ -1,6 +1,7 @@
$OpenBSD: patch-test_delete_test,v 1.4 2015/02/10 16:02:05 kspillner Exp $
test/delete.test.orig Fri Feb 28 07:15:45 2014
-+++ test/delete.test Mon Feb 9 14:00:08 2015
+Index: test/delete.test
+--- test/delete.test.orig
test/delete.test
@@ -79,7 +79,7 @@ Test the delete command.
# running as root, but you shouldn't do that anyway.
$ quilt delete "test3"
@@ -8,5 +9,5 @@ $OpenBSD: patch-test_delete_test,v 1.4 2
- >~ .*find: [`']?\./dir'?: Permission denied
+ >~ ${LOCALBASE}/bin/gfind: [`']?\./dir'?: Permission denied
- $ chmod a+rx .pc/test3/dir
+ $ chmod a+rx %{QUILT_PC}/test3/dir
Index: patches/patch-test_failbackup_test
===
RCS file: patches/patch-test_failbackup_test
diff -N patches/patch-test_failbackup_test
--- patches/patch-test_failbackup_test 17 Nov 2017 14:59:18 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-test_failbackup_test,v 1.1 2017/11/17 14:59:18 jca Exp $
-
-Index: test/failbackup.test
test/failbackup.test.orig
-+++ test/failbackup.test
-@@ -16,7 +16,7 @@ What happens when refresh fails because of a permissio
- $ cat > test.txt
- < This is updated test.txt.
- $ quilt refresh --backup
-- >~ mv: cannot move [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?:
Permission denied
-+ >~ mv: rename [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?: Permission
denied
- $ echo %{?}
- > 1
-
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/quilt/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -p -u -r1.5 PLIST
--- pkg/PLIST 17 Nov 2017 15:09:05 - 1.5
+++ pkg/PLIST 3 Apr 2019 15:37:57 -
@@ -26,6 +26,7 @@ share/quilt/add
share/quilt/annotate
share/quilt/applied
share/quilt/compat/
+share/quilt/compat/7z
share/quilt/compat/awk
share/quilt/compat/date
share/quilt/compat/diff
UPDATE: devel/quilt 0.66
Quilt 0.66 was just released last Friday, mostly bugfixes.
Ok?
Index: Makefile
===
RCS file: /cvs/ports/devel/quilt/Makefile,v
retrieving revision 1.12
diff -u -p -p -u -r1.12 Makefile
--- Makefile17 Nov 2017 15:20:00 - 1.12
+++ Makefile31 Mar 2019 16:42:24 -
@@ -2,8 +2,7 @@
COMMENT= manage large numbers of patches
-DISTNAME= quilt-0.65
-REVISION= 0
+DISTNAME= quilt-0.66
CATEGORIES=devel
HOMEPAGE= http://savannah.nongnu.org/projects/quilt/
Index: distinfo
===
RCS file: /cvs/ports/devel/quilt/distinfo,v
retrieving revision 1.5
diff -u -p -p -u -r1.5 distinfo
--- distinfo17 Nov 2017 14:59:18 - 1.5
+++ distinfo31 Mar 2019 16:42:24 -
@@ -1,2 +1,2 @@
-SHA256 (quilt-0.65.tar.gz) = 9svHiOXLuzgaPG6rW5785nx3aoZip3lcdDL9J6oJaBk=
-SIZE (quilt-0.65.tar.gz) = 410780
+SHA256 (quilt-0.66.tar.gz) = MUsxmm/rE7+dD5/6fOZoOwaRnnNKQSdQh+pFfMncbgc=
+SIZE (quilt-0.66.tar.gz) = 413069
Index: patches/patch-test_failbackup_test
===
RCS file: patches/patch-test_failbackup_test
diff -N patches/patch-test_failbackup_test
--- patches/patch-test_failbackup_test 17 Nov 2017 14:59:18 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-test_failbackup_test,v 1.1 2017/11/17 14:59:18 jca Exp $
-
-Index: test/failbackup.test
test/failbackup.test.orig
-+++ test/failbackup.test
-@@ -16,7 +16,7 @@ What happens when refresh fails because of a permissio
- $ cat > test.txt
- < This is updated test.txt.
- $ quilt refresh --backup
-- >~ mv: cannot move [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?:
Permission denied
-+ >~ mv: rename [`']?%{P}test.diff'? to [`']?%{P}test.diff~'?: Permission
denied
- $ echo %{?}
- > 1
-
NEW: productivity/timewarrior
On Mon, Aug 01, 2016 at 12:16:40PM -0500, Kent R. Spillner wrote:
> timewarrior is a new command line time tracking util from the same
> people behind taskwarrior. Attached & included below is a port for
> the newly released v1.0.0.beta1. I think it makes sense to wait
> to import until the final release, but would appreciate feedback in
> the meantime.
timewarrior v1.0.0 was just released. Ok?
Index: Makefile
===
RCS file: Makefile
diff -N Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ Makefile23 Aug 2016 17:19:28 -
@@ -0,0 +1,36 @@
+# $OpenBSD: Makefile,v 1.7 2016/03/04 10:11:22 kirby Exp $
+
+COMMENT = command line time tracking application
+
+DISTNAME = timew-1.0.0
+CATEGORIES = productivity
+
+HOMEPAGE = http://www.taskwarrior.org/
+
+MAINTAINER = Kent R. Spillner
+
+MASTER_SITES = ${HOMEPAGE}/download/
+
+# MIT
+PERMIT_PACKAGE_CDROM = Yes
+
+MODULES = gcc4 \
+ devel/cmake
+
+MODGCC4_LANGS =c++
+MODGCC4_ARCHS =*
+
+WANTLIB += c gnutls m pthread
+
+LIB_DEPENDS = security/gnutls
+
+CONFIGURE_ARGS += -DTIMEW_DOCDIR=share/timewarrior \
+ -DTIMEW_MAN1DIR=man/man1 \
+ -DTIMEW_MAN5DIR=man/man5
+
+CONFIGURE_ENV += CFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+NO_TEST = Yes
+
+.include
Index: distinfo
===
RCS file: distinfo
diff -N distinfo
--- /dev/null 1 Jan 1970 00:00:00 -
+++ distinfo23 Aug 2016 17:19:37 -
@@ -0,0 +1,2 @@
+SHA256 (timew-1.0.0.tar.gz) = rAJ5EOHoNlvdIYqLQjibJtAX0408llFsQI221aROC7U=
+SIZE (timew-1.0.0.tar.gz) = 140539
Index: pkg/DESCR
===
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/DESCR 6 Jul 2016 15:18:58 -
@@ -0,0 +1,3 @@
+Timewarrior is a command line time tracking application, which allows
+you to record time spent on activities. You may be tracking your time
+for curiosity, or because your work requires it.
Index: pkg/PLIST
===
RCS file: pkg/PLIST
diff -N pkg/PLIST
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/PLIST 29 Jun 2016 17:19:09 -
@@ -0,0 +1,19 @@
+@comment $OpenBSD$
+@bin bin/timew
+@man man/man1/timew.1
+share/timewarrior/
+share/timewarrior/AUTHORS
+share/timewarrior/COPYING
+share/timewarrior/ChangeLog
+share/timewarrior/INSTALL
+share/timewarrior/LICENSE
+share/timewarrior/NEWS
+share/timewarrior/README.md
+share/timewarrior/doc/
+share/timewarrior/doc/holidays/
+share/timewarrior/doc/holidays/README
+share/timewarrior/doc/holidays/holidays.en-US
+share/timewarrior/doc/holidays/refresh
+share/timewarrior/doc/themes/
+share/timewarrior/doc/themes/README
+share/timewarrior/doc/themes/dark.theme
Re: RFC: productivity/timewarrior
On Mon, Aug 01, 2016 at 12:16:40PM -0500, Kent R. Spillner wrote:
> timewarrior is a new command line time tracking util from the same
> people behind taskwarrior. Attached & included below is a port for
> the newly released v1.0.0.beta1. I think it makes sense to wait
> to import until the final release, but would appreciate feedback in
> the meantime.
Whoops, forgot the attachment. :(
Index: Makefile
===
RCS file: Makefile
diff -N Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ Makefile1 Aug 2016 16:15:47 -
@@ -0,0 +1,36 @@
+# $OpenBSD: Makefile,v 1.7 2016/03/04 10:11:22 kirby Exp $
+
+COMMENT = command line time tracking application
+
+DISTNAME = timew-1.0.0.beta1
+CATEGORIES = productivity
+
+HOMEPAGE = http://www.taskwarrior.org/
+
+MAINTAINER = Kent R. Spillner
+
+MASTER_SITES = ${HOMEPAGE}/download/
+
+# MIT
+PERMIT_PACKAGE_CDROM = Yes
+
+MODULES = gcc4 \
+ devel/cmake
+
+MODGCC4_LANGS =c++
+MODGCC4_ARCHS =*
+
+WANTLIB += c gnutls m pthread
+
+LIB_DEPENDS = security/gnutls
+
+CONFIGURE_ARGS += -DTIMEW_DOCDIR=share/timewarrior \
+ -DTIMEW_MAN1DIR=man/man1 \
+ -DTIMEW_MAN5DIR=man/man5
+
+CONFIGURE_ENV += CFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+NO_TEST = Yes
+
+.include
Index: distinfo
===
RCS file: distinfo
diff -N distinfo
--- /dev/null 1 Jan 1970 00:00:00 -
+++ distinfo1 Aug 2016 16:15:55 -
@@ -0,0 +1,2 @@
+SHA256 (timew-1.0.0.beta1.tar.gz) =
B5WOU4KlNTLuYrlpoEfybclyacpl6Is41ThCxOsBcL4=
+SIZE (timew-1.0.0.beta1.tar.gz) = 140219
Index: pkg/DESCR
===
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/DESCR 6 Jul 2016 15:18:58 -
@@ -0,0 +1,3 @@
+Timewarrior is a command line time tracking application, which allows
+you to record time spent on activities. You may be tracking your time
+for curiosity, or because your work requires it.
Index: pkg/PLIST
===
RCS file: pkg/PLIST
diff -N pkg/PLIST
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/PLIST 29 Jun 2016 17:19:09 -
@@ -0,0 +1,19 @@
+@comment $OpenBSD$
+@bin bin/timew
+@man man/man1/timew.1
+share/timewarrior/
+share/timewarrior/AUTHORS
+share/timewarrior/COPYING
+share/timewarrior/ChangeLog
+share/timewarrior/INSTALL
+share/timewarrior/LICENSE
+share/timewarrior/NEWS
+share/timewarrior/README.md
+share/timewarrior/doc/
+share/timewarrior/doc/holidays/
+share/timewarrior/doc/holidays/README
+share/timewarrior/doc/holidays/holidays.en-US
+share/timewarrior/doc/holidays/refresh
+share/timewarrior/doc/themes/
+share/timewarrior/doc/themes/README
+share/timewarrior/doc/themes/dark.theme
timew-1.0.0.beta1.tar.gz
Description: application/tar-gz
RFC: productivity/timewarrior
timewarrior is a new command line time tracking util from the same
people behind taskwarrior. Attached & included below is a port for
the newly released v1.0.0.beta1. I think it makes sense to wait
to import until the final release, but would appreciate feedback in
the meantime.
Index: Makefile
===
RCS file: Makefile
diff -N Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ Makefile1 Aug 2016 16:15:47 -
@@ -0,0 +1,36 @@
+# $OpenBSD: Makefile,v 1.7 2016/03/04 10:11:22 kirby Exp $
+
+COMMENT = command line time tracking application
+
+DISTNAME = timew-1.0.0.beta1
+CATEGORIES = productivity
+
+HOMEPAGE = http://www.taskwarrior.org/
+
+MAINTAINER = Kent R. Spillner
+
+MASTER_SITES = ${HOMEPAGE}/download/
+
+# MIT
+PERMIT_PACKAGE_CDROM = Yes
+
+MODULES = gcc4 \
+ devel/cmake
+
+MODGCC4_LANGS =c++
+MODGCC4_ARCHS =*
+
+WANTLIB += c gnutls m pthread
+
+LIB_DEPENDS = security/gnutls
+
+CONFIGURE_ARGS += -DTIMEW_DOCDIR=share/timewarrior \
+ -DTIMEW_MAN1DIR=man/man1 \
+ -DTIMEW_MAN5DIR=man/man5
+
+CONFIGURE_ENV += CFLAGS="-I${LOCALBASE}/include" \
+ LDFLAGS="-L${LOCALBASE}/lib"
+
+NO_TEST = Yes
+
+.include
Index: distinfo
===
RCS file: distinfo
diff -N distinfo
--- /dev/null 1 Jan 1970 00:00:00 -
+++ distinfo1 Aug 2016 16:15:55 -
@@ -0,0 +1,2 @@
+SHA256 (timew-1.0.0.beta1.tar.gz) =
B5WOU4KlNTLuYrlpoEfybclyacpl6Is41ThCxOsBcL4=
+SIZE (timew-1.0.0.beta1.tar.gz) = 140219
Index: pkg/DESCR
===
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/DESCR 6 Jul 2016 15:18:58 -
@@ -0,0 +1,3 @@
+Timewarrior is a command line time tracking application, which allows
+you to record time spent on activities. You may be tracking your time
+for curiosity, or because your work requires it.
Index: pkg/PLIST
===
RCS file: pkg/PLIST
diff -N pkg/PLIST
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/PLIST 29 Jun 2016 17:19:09 -
@@ -0,0 +1,19 @@
+@comment $OpenBSD$
+@bin bin/timew
+@man man/man1/timew.1
+share/timewarrior/
+share/timewarrior/AUTHORS
+share/timewarrior/COPYING
+share/timewarrior/ChangeLog
+share/timewarrior/INSTALL
+share/timewarrior/LICENSE
+share/timewarrior/NEWS
+share/timewarrior/README.md
+share/timewarrior/doc/
+share/timewarrior/doc/holidays/
+share/timewarrior/doc/holidays/README
+share/timewarrior/doc/holidays/holidays.en-US
+share/timewarrior/doc/holidays/refresh
+share/timewarrior/doc/themes/
+share/timewarrior/doc/themes/README
+share/timewarrior/doc/themes/dark.theme
[UPDATE] productivity/taskwarrior v2.5.1
This diff updates taskwarrior to v2.5.1. This is just a bugfix release
with no new features, but all of our patches were upstreamed and can go
away (yay!).
I've been running this for a week on amd64 without issue, and this diff
is ok MAINTAINER. Ok?
Index: Makefile
===
RCS file: /work/cvsroot/ports/productivity/taskwarrior/Makefile,v
retrieving revision 1.19
diff -p -u -r1.19 Makefile
--- Makefile23 Dec 2015 16:05:20 - 1.19
+++ Makefile25 Feb 2016 18:09:23 -
@@ -2,7 +2,7 @@
COMMENT = command line todo list manager
-VERSION = 2.5.0
+VERSION = 2.5.1
DISTNAME = task-${VERSION}
PKGNAME = taskwarrior-${VERSION}
CATEGORIES = productivity
Index: distinfo
===
RCS file: /work/cvsroot/ports/productivity/taskwarrior/distinfo,v
retrieving revision 1.10
diff -p -u -r1.10 distinfo
--- distinfo23 Dec 2015 16:05:20 - 1.10
+++ distinfo25 Feb 2016 18:09:29 -
@@ -1,2 +1,2 @@
-SHA256 (task-2.5.0.tar.gz) = TY5nQVppkxCMEbju75m3apka8Rsih0rbt642fgkzRjY=
-SIZE (task-2.5.0.tar.gz) = 900285
+SHA256 (task-2.5.1.tar.gz) = 2HvO5YEG64p5uFDpq8FT2Yt54A1Q6t4NY5FxVJhPKhU=
+SIZE (task-2.5.1.tar.gz) = 903428
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt21 May 2015 15:06:09 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,25 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.3 2015/05/21 15:06:09 czarkoff Exp $
CMakeLists.txt.origTue May 19 18:41:21 2015
-+++ CMakeLists.txt Tue May 19 18:41:23 2015
-@@ -124,10 +124,10 @@ check_struct_has_member ("struct tm" tm_gmtoff time.h
- check_struct_has_member ("struct stat" st_birthtime "sys/types.h;sys/stat.h"
HAVE_ST_BIRTHTIME)
-
- message ("-- Looking for libuuid")
--if (DARWIN OR FREEBSD)
-+if (DARWIN OR FREEBSD OR OPENBSD)
- # Apple and FreeBSD include the uuid functions in their libc, rather than
libuuid
- check_function_exists (uuid_unparse_lower HAVE_UUID_UNPARSE_LOWER)
--else (DARWIN OR FREEBSD)
-+else (DARWIN OR FREEBSD OR OPENBSD)
- find_path(UUID_INCLUDE_DIR uuid/uuid.h)
- find_library (UUID_LIBRARY NAMES uuid)
- if (UUID_INCLUDE_DIR AND UUID_LIBRARY)
-@@ -140,7 +140,7 @@ else (DARWIN OR FREEBSD)
- else (UUID_INCLUDE_DIR AND UUID_LIBRARY)
- message (FATAL_ERROR "-- libuuid not found.")
- endif (UUID_INCLUDE_DIR AND UUID_LIBRARY)
--endif (DARWIN OR FREEBSD)
-+endif (DARWIN OR FREEBSD OR OPENBSD)
-
- if (HAVE_UUID_UNPARSE_LOWER)
- message ("-- Found libuuid")
Index: patches/patch-src_util_cpp
===
RCS file: patches/patch-src_util_cpp
diff -N patches/patch-src_util_cpp
--- patches/patch-src_util_cpp 21 May 2015 15:06:09 - 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_util_cpp,v 1.3 2015/05/21 15:06:09 czarkoff Exp $
src/util.cpp.orig Sun May 10 22:57:49 2015
-+++ src/util.cpp Wed May 20 16:31:35 2015
-@@ -27,7 +27,7 @@
- #include
- // If is included, put it after , because it includes
- // , and therefore would ignore the _WITH_GETLINE.
--#ifdef FREEBSD
-+#if defined (FREEBSD) || defined (OPENBSD)
- #define _WITH_GETLINE
- #endif
- #include
-@@ -185,7 +185,7 @@ int autoComplete (
- // representation is always lowercase anyway.
- // For the implementation details, refer to
- // http://svnweb.freebsd.org/base/head/sys/kern/kern_uuid.c
--#ifdef FREEBSD
-+#if defined (FREEBSD) || defined (OPENBSD)
- const std::string uuid ()
- {
- uuid_t id;
Index: patches/patch-src_util_h
===
RCS file: patches/patch-src_util_h
diff -N patches/patch-src_util_h
--- patches/patch-src_util_h21 May 2015 15:06:09 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_util_h,v 1.1 2015/05/21 15:06:09 czarkoff Exp $
src/util.h.origTue May 19 23:36:56 2015
-+++ src/util.h Tue May 19 23:37:41 2015
-@@ -32,7 +32,7 @@
- #include
- #include
- #include
--#ifdef FREEBSD
-+#if defined (FREEBSD) || defined (OPENBSD)
- #include
- #else
- #include
Index: pkg/PLIST
===
RCS file: /work/cvsroot/ports/productivity/taskwarrior/pkg/PLIST,v
retrieving revision 1.8
diff -p -u -r1.8 PLIST
--- pkg/PLIST 23 Dec 2015 16:05:22 - 1.8
+++ pkg/PLIST 25 Feb 2016 18:23:01 -
@@ -10,6 +10,7 @@ share/taskwarrior/AUTHORS
@comment share/taskwarrior/COPYING
@comment share/taskwarrior/ChangeLog
@comment share/taskwarrior/INSTALL
+@comment share/taskwarrior/LICENSE
@comment share/taskwarrior/NEWS
share/taskwarrior/README.md
share/taskwarrior/rc/
@@ -35,6 +36,7 @@ share/taskwarrior/rc/holidays.en-CA
Re: [FIX] make productivity/taskd install proper vars file
On Mon, Feb 08, 2016 at 08:11:22AM +0100, viq wrote:
> Bump
Hrrmmm, the mail I sent about this last week never made it to the list.
I would prefer to commit this fix.
Ok?
Index: Makefile
===
RCS file: /work/cvsroot/ports/productivity/taskd/Makefile,v
retrieving revision 1.5
diff -p -u -r1.5 Makefile
--- Makefile28 Jan 2016 17:15:00 - 1.5
+++ Makefile8 Feb 2016 15:49:27 -
@@ -4,6 +4,7 @@ COMMENT = lightweight server providing a
DISTNAME = taskd-1.1.0
CATEGORIES = productivity net
+REVISION = 0
HOMEPAGE = http://www.taskwarrior.org/
@@ -41,6 +42,8 @@ post-install:
${PREFIX}/share/examples/taskd/pki/
${INSTALL_DATA} ${WRKSRC}/pki/README \
${PREFIX}/share/examples/taskd/pki/
+ ${INSTALL_DATA} ${WRKSRC}/pki/vars \
+ ${PREFIX}/share/examples/taskd/pki/vars.dist
${SUBST_DATA} ${FILESDIR}/config \
${PREFIX}/share/examples/taskd/config
Index: pkg/PLIST
===
RCS file: /work/cvsroot/ports/productivity/taskd/pkg/PLIST,v
retrieving revision 1.3
diff -p -u -r1.3 PLIST
--- pkg/PLIST 28 Jan 2016 17:15:05 - 1.3
+++ pkg/PLIST 8 Feb 2016 15:49:54 -
@@ -35,6 +35,7 @@ share/examples/taskd/pki/generate.ca
share/examples/taskd/pki/generate.client
share/examples/taskd/pki/generate.crl
share/examples/taskd/pki/generate.server
+share/examples/taskd/pki/vars.dist
@sample share/examples/taskd/pki/vars
share/taskd/
share/taskd/AUTHORS
Re: RFC: update productivity/taskd to v1.1.0
No other taskd users willing to test this upgrade? :(
In that case, any porters willing to review the diff & give me an ok to
commit? I've been running this locally on amd64 for about a week with
no issues, sync'ing with clients on both OpenBSD and Linux. The
generate.ca patch below was already merged upstream, and fixes the
generated CA cert so that the example pki scripts work out of the box.
On Fri, Jan 22, 2016 at 10:23:31AM -0600, Kent R. Spillner wrote:
> On Wed, Jan 20, 2016 at 01:57:43PM -0600, Kent R. Spillner wrote:
> > Below is a new diff. We finally tracked down the certificate validation
> > bug with help from viq and upstream, and the new patch for that has
> > already been merged upstream (along with several of our other patches
> > which can all go away when v1.2.0 is released). In this version of the
> > diff I've updated the README and also take MAINTAINER.
> >
> > Ok?
>
> bump
>
> I'm not sure how many people use taskd but it'd be nice to get some test
> reports for i386 and other architectures. I've been running this on
> amd64 for the past several days, sync'ing with taskwarrior on OpenBSD as
> well as Linux. If anyone uses other clients, or runs taskwarrior on
> other OS x, such test reports would be great, too.
>
> Index: Makefile
> ===
> RCS file: /work/cvsroot/ports/productivity/taskd/Makefile,v
> retrieving revision 1.4
> diff -p -u -r1.4 Makefile
> --- Makefile 25 Aug 2015 07:30:30 - 1.4
> +++ Makefile 20 Jan 2016 19:41:51 -
> @@ -2,23 +2,27 @@
>
> COMMENT =lightweight server providing access to task data
>
> -DISTNAME = taskd-1.0.0
> +DISTNAME = taskd-1.1.0
> CATEGORIES = productivity net
> -REVISION = 1
>
> HOMEPAGE = http://www.taskwarrior.org/
>
> +MAINTAINER = Kent R. Spillner
> +
> MASTER_SITES = ${HOMEPAGE}/download/
>
> # MIT
> PERMIT_PACKAGE_CDROM = Yes
>
> -MODULES =devel/cmake
> +MODULES =gcc4 \
> + devel/cmake
> +
> +MODGCC4_LANGS = c++
> +MODGCC4_ARCHS = *
>
> -WANTLIB += c gnutls m pthread stdc++ uuid
> +WANTLIB += c gnutls m pthread
>
> -LIB_DEPENDS =security/gnutls \
> - sysutils/e2fsprogs>=1.42.7
> +LIB_DEPENDS =security/gnutls
>
> CONFIGURE_STYLE =cmake
>
> @@ -33,10 +37,11 @@ NO_TEST = Yes
>
> post-install:
> ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/taskd/pki/
> - ${INSTALL_SCRIPT} ${WRKSRC}/pki/!(*.orig) \
> + ${INSTALL_SCRIPT} ${WRKSRC}/pki/generate!(*.orig) \
> + ${PREFIX}/share/examples/taskd/pki/
> + ${INSTALL_DATA} ${WRKSRC}/pki/README \
> ${PREFIX}/share/examples/taskd/pki/
> ${SUBST_DATA} ${FILESDIR}/config \
> ${PREFIX}/share/examples/taskd/config
> - ${INSTALL_DATA} ${FILESDIR}/vars.dist
> ${PREFIX}/share/examples/taskd/pki/
>
> .include
> Index: distinfo
> ===
> RCS file: /work/cvsroot/ports/productivity/taskd/distinfo,v
> retrieving revision 1.1.1.1
> diff -p -u -r1.1.1.1 distinfo
> --- distinfo 12 Jul 2014 22:08:35 - 1.1.1.1
> +++ distinfo 10 Nov 2015 21:12:00 -
> @@ -1,2 +1,2 @@
> -SHA256 (taskd-1.0.0.tar.gz) = Fi7x7sSPgUWHDvDb4BIbeKbamYFbwYr3feB/uwq+AtA=
> -SIZE (taskd-1.0.0.tar.gz) = 128191
> +SHA256 (taskd-1.1.0.tar.gz) = e4SI5oeXGuVnKf9OLlIJ/4gGz4zVdxi/1+UhvhMGIbQ=
> +SIZE (taskd-1.1.0.tar.gz) = 120115
> Index: files/config
> ===
> RCS file: /work/cvsroot/ports/productivity/taskd/files/config,v
> retrieving revision 1.1.1.1
> diff -p -u -r1.1.1.1 config
> --- files/config 12 Jul 2014 22:08:35 - 1.1.1.1
> +++ files/config 14 Jan 2016 19:56:20 -
> @@ -1,12 +1,12 @@
> confirmation=1
> extensions=${TRUEPREFIX}/libexec/taskd
> log=/var/log/taskd/taskd.log
> -log=/var/log/taskd/taskd.log
> pid.file=/var/run/taskd/taskd.pid
> queue.size=10
> request.limit=1048576
> root=/var/taskd
> -server=*:53589
> +server=127.0.0.1:53589
> +trust=strict
> verbose=1
> client.cert=/var/taskd/client.cert.pem
> client.key=/var/taskd/client.key.pem
> @@ -14,4 +14,3 @@ server.cert=/var/taskd/server.cert.pem
> server.key=/var/taskd/server.key.pem
> server.crl=/var/taskd/server.crl.pem
> ca.cert=/var/taskd/ca.cert.pem
> -client.allow=^task [2-9]
> Index: files/vars.dist
> ===
> RCS file: f
Re: RFC: update productivity/taskd to v1.1.0
On Wed, Jan 20, 2016 at 01:57:43PM -0600, Kent R. Spillner wrote:
> Below is a new diff. We finally tracked down the certificate validation
> bug with help from viq and upstream, and the new patch for that has
> already been merged upstream (along with several of our other patches
> which can all go away when v1.2.0 is released). In this version of the
> diff I've updated the README and also take MAINTAINER.
>
> Ok?
bump
I'm not sure how many people use taskd but it'd be nice to get some test
reports for i386 and other architectures. I've been running this on
amd64 for the past several days, sync'ing with taskwarrior on OpenBSD as
well as Linux. If anyone uses other clients, or runs taskwarrior on
other OS x, such test reports would be great, too.
Index: Makefile
===
RCS file: /work/cvsroot/ports/productivity/taskd/Makefile,v
retrieving revision 1.4
diff -p -u -r1.4 Makefile
--- Makefile25 Aug 2015 07:30:30 - 1.4
+++ Makefile20 Jan 2016 19:41:51 -
@@ -2,23 +2,27 @@
COMMENT = lightweight server providing access to task data
-DISTNAME = taskd-1.0.0
+DISTNAME = taskd-1.1.0
CATEGORIES = productivity net
-REVISION = 1
HOMEPAGE = http://www.taskwarrior.org/
+MAINTAINER = Kent R. Spillner
+
MASTER_SITES = ${HOMEPAGE}/download/
# MIT
PERMIT_PACKAGE_CDROM = Yes
-MODULES = devel/cmake
+MODULES = gcc4 \
+ devel/cmake
+
+MODGCC4_LANGS =c++
+MODGCC4_ARCHS =*
-WANTLIB += c gnutls m pthread stdc++ uuid
+WANTLIB += c gnutls m pthread
-LIB_DEPENDS = security/gnutls \
- sysutils/e2fsprogs>=1.42.7
+LIB_DEPENDS = security/gnutls
CONFIGURE_STYLE = cmake
@@ -33,10 +37,11 @@ NO_TEST = Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/taskd/pki/
- ${INSTALL_SCRIPT} ${WRKSRC}/pki/!(*.orig) \
+ ${INSTALL_SCRIPT} ${WRKSRC}/pki/generate!(*.orig) \
+ ${PREFIX}/share/examples/taskd/pki/
+ ${INSTALL_DATA} ${WRKSRC}/pki/README \
${PREFIX}/share/examples/taskd/pki/
${SUBST_DATA} ${FILESDIR}/config \
${PREFIX}/share/examples/taskd/config
- ${INSTALL_DATA} ${FILESDIR}/vars.dist
${PREFIX}/share/examples/taskd/pki/
.include
Index: distinfo
===
RCS file: /work/cvsroot/ports/productivity/taskd/distinfo,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 distinfo
--- distinfo12 Jul 2014 22:08:35 - 1.1.1.1
+++ distinfo10 Nov 2015 21:12:00 -
@@ -1,2 +1,2 @@
-SHA256 (taskd-1.0.0.tar.gz) = Fi7x7sSPgUWHDvDb4BIbeKbamYFbwYr3feB/uwq+AtA=
-SIZE (taskd-1.0.0.tar.gz) = 128191
+SHA256 (taskd-1.1.0.tar.gz) = e4SI5oeXGuVnKf9OLlIJ/4gGz4zVdxi/1+UhvhMGIbQ=
+SIZE (taskd-1.1.0.tar.gz) = 120115
Index: files/config
===
RCS file: /work/cvsroot/ports/productivity/taskd/files/config,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 config
--- files/config12 Jul 2014 22:08:35 - 1.1.1.1
+++ files/config14 Jan 2016 19:56:20 -
@@ -1,12 +1,12 @@
confirmation=1
extensions=${TRUEPREFIX}/libexec/taskd
log=/var/log/taskd/taskd.log
-log=/var/log/taskd/taskd.log
pid.file=/var/run/taskd/taskd.pid
queue.size=10
request.limit=1048576
root=/var/taskd
-server=*:53589
+server=127.0.0.1:53589
+trust=strict
verbose=1
client.cert=/var/taskd/client.cert.pem
client.key=/var/taskd/client.key.pem
@@ -14,4 +14,3 @@ server.cert=/var/taskd/server.cert.pem
server.key=/var/taskd/server.key.pem
server.crl=/var/taskd/server.crl.pem
ca.cert=/var/taskd/ca.cert.pem
-client.allow=^task [2-9]
Index: files/vars.dist
===
RCS file: files/vars.dist
diff -N files/vars.dist
--- files/vars.dist 12 Jul 2014 22:08:35 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,9 +0,0 @@
-#dnsnames="example.com example.net"
-#ipaddrs="10.11.12.13 10.20.30.40"
-bits=4096
-expiration_days=365
-organization="Göteborg Bit Factory"
-cn="Göteborg Bit Factory"
-country=SE
-state="Västra Götaland"
-locality="Göteborg"
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt10 Nov 2015 21:48:36 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- CMakeLists.txt.origTue Nov 10 15:44:28 2015
CMakeLists.txt Tue Nov 10 15:44:54 2015
+@@ -115,10 +115,10 @@ if (GNUTLS_FOUND)
+ endif (GNUTLS_FOUND)
+
+ message ("-- Looking for libuuid")
+-if (DARWIN OR FREEBSD)
++i
Re: RFC: update productivity/taskd to v1.1.0
Below is a new diff. We finally tracked down the certificate validation
bug with help from viq and upstream, and the new patch for that has
already been merged upstream (along with several of our other patches
which can all go away when v1.2.0 is released). In this version of the
diff I've updated the README and also take MAINTAINER.
Ok?
Index: Makefile
===
RCS file: /work/cvsroot/ports/productivity/taskd/Makefile,v
retrieving revision 1.4
diff -p -u -r1.4 Makefile
--- Makefile25 Aug 2015 07:30:30 - 1.4
+++ Makefile20 Jan 2016 19:41:51 -
@@ -2,23 +2,27 @@
COMMENT = lightweight server providing access to task data
-DISTNAME = taskd-1.0.0
+DISTNAME = taskd-1.1.0
CATEGORIES = productivity net
-REVISION = 1
HOMEPAGE = http://www.taskwarrior.org/
+MAINTAINER = Kent R. Spillner
+
MASTER_SITES = ${HOMEPAGE}/download/
# MIT
PERMIT_PACKAGE_CDROM = Yes
-MODULES = devel/cmake
+MODULES = gcc4 \
+ devel/cmake
+
+MODGCC4_LANGS =c++
+MODGCC4_ARCHS =*
-WANTLIB += c gnutls m pthread stdc++ uuid
+WANTLIB += c gnutls m pthread
-LIB_DEPENDS = security/gnutls \
- sysutils/e2fsprogs>=1.42.7
+LIB_DEPENDS = security/gnutls
CONFIGURE_STYLE = cmake
@@ -33,10 +37,11 @@ NO_TEST = Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/taskd/pki/
- ${INSTALL_SCRIPT} ${WRKSRC}/pki/!(*.orig) \
+ ${INSTALL_SCRIPT} ${WRKSRC}/pki/generate!(*.orig) \
+ ${PREFIX}/share/examples/taskd/pki/
+ ${INSTALL_DATA} ${WRKSRC}/pki/README \
${PREFIX}/share/examples/taskd/pki/
${SUBST_DATA} ${FILESDIR}/config \
${PREFIX}/share/examples/taskd/config
- ${INSTALL_DATA} ${FILESDIR}/vars.dist
${PREFIX}/share/examples/taskd/pki/
.include
Index: distinfo
===
RCS file: /work/cvsroot/ports/productivity/taskd/distinfo,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 distinfo
--- distinfo12 Jul 2014 22:08:35 - 1.1.1.1
+++ distinfo10 Nov 2015 21:12:00 -
@@ -1,2 +1,2 @@
-SHA256 (taskd-1.0.0.tar.gz) = Fi7x7sSPgUWHDvDb4BIbeKbamYFbwYr3feB/uwq+AtA=
-SIZE (taskd-1.0.0.tar.gz) = 128191
+SHA256 (taskd-1.1.0.tar.gz) = e4SI5oeXGuVnKf9OLlIJ/4gGz4zVdxi/1+UhvhMGIbQ=
+SIZE (taskd-1.1.0.tar.gz) = 120115
Index: files/config
===
RCS file: /work/cvsroot/ports/productivity/taskd/files/config,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 config
--- files/config12 Jul 2014 22:08:35 - 1.1.1.1
+++ files/config14 Jan 2016 19:56:20 -
@@ -1,12 +1,12 @@
confirmation=1
extensions=${TRUEPREFIX}/libexec/taskd
log=/var/log/taskd/taskd.log
-log=/var/log/taskd/taskd.log
pid.file=/var/run/taskd/taskd.pid
queue.size=10
request.limit=1048576
root=/var/taskd
-server=*:53589
+server=127.0.0.1:53589
+trust=strict
verbose=1
client.cert=/var/taskd/client.cert.pem
client.key=/var/taskd/client.key.pem
@@ -14,4 +14,3 @@ server.cert=/var/taskd/server.cert.pem
server.key=/var/taskd/server.key.pem
server.crl=/var/taskd/server.crl.pem
ca.cert=/var/taskd/ca.cert.pem
-client.allow=^task [2-9]
Index: files/vars.dist
===
RCS file: files/vars.dist
diff -N files/vars.dist
--- files/vars.dist 12 Jul 2014 22:08:35 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,9 +0,0 @@
-#dnsnames="example.com example.net"
-#ipaddrs="10.11.12.13 10.20.30.40"
-bits=4096
-expiration_days=365
-organization="Göteborg Bit Factory"
-cn="Göteborg Bit Factory"
-country=SE
-state="Västra Götaland"
-locality="Göteborg"
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-CMakeLists_txt10 Nov 2015 21:48:36 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+--- CMakeLists.txt.origTue Nov 10 15:44:28 2015
CMakeLists.txt Tue Nov 10 15:44:54 2015
+@@ -115,10 +115,10 @@ if (GNUTLS_FOUND)
+ endif (GNUTLS_FOUND)
+
+ message ("-- Looking for libuuid")
+-if (DARWIN OR FREEBSD)
++if (DARWIN OR FREEBSD OR OPENBSD)
+ # Apple and FreeBSD include the uuid functions in their libc, rather than
libuuid
+ check_function_exists (uuid_unparse_lower HAVE_UUID_UNPARSE_LOWER)
+-else (DARWIN OR FREEBSD)
++else (DARWIN OR FREEBSD OR OPENBSD)
+ find_path(UUID_INCLUDE_DIR uuid/uuid.h)
+ find_library (UUID_LIBRARY NAMES uuid)
+ if (UUID_INCLUDE_DIR AND UUID_LIBRARY)
+@@ -131,7 +131,7 @@ else (DARWIN OR FREEBSD)
+ else (UUID_INCLUDE_DIR A
Re: RFC: update productivity/taskd to v1.1.0
On Thu, Jan 14, 2016 at 02:54:31PM -0600, Kent R. Spillner wrote:
> Are there any productivity/taskd users around? taskd is the sync server
> for taskwarrior.
>
> Please note I'm not looking for OKs to commit this yet, I'm just looking
> for feedback from users and porters. I think this still needs some
> work before it's ready to be committed.
>
> Below is a diff that updates taskd to the latest release, v1.1.0. Most
> of it is straightforward:
>
> * Most of our patches were accepted upstream (although apparently with
> some slight modifications) so they go away
> * I ported the changes from productivity/taskwarrior to use our libc's
> uuid functions so the sysutils/e2fsprogs dependency goes away (which
> was the main reason I started looking at this in the first place...)
> * The changes to file/config remove a duplicate log line, remove the
> client.allow config (see:
> http://taskwarrior.org/docs/taskserver/upgrade.html)
> add strict certificate validation, and only listen on the loopback
> interface by default (note that taskd no longer supports the
> wildcard so the previous value caused an error)
>
> Everything seems to be working with these changes. I have successfully
> tested sync'ing locally using the taskwarrior package, and I have
> tested sync'ing remotely from a Linux box.
>
> There are three things I'm struggling with:
> * The pki/ scripts included with taskd just don't seem to work, but I'm
> not sure if it's a problem with the scripts themselves or our
> version of GNUTLS. In particular, they generate certs that fail
> validation (on the client side I get an error message "certificate
> signer constraints were violated," and on the server side I get an
> error message "error in pull function). I had to manually generate
> all of the certificates myself using a newer version of GNUTLS on a
> Linux box. Should we patch them to get something that works on
> OpenBSD, provide our own alternatives, or tell users how to manually
> do everything themselves in pkg/README?
> * The trust=strict in files/config is the recommended setting and makes
> the most sense to me, but in light of the problems with the pki/
> scripts I wonder if perhaps we would want to relax cert validation?
>
> The third thing is that based on whatever we decide to do about the
> other two things we'll need to show some love to pkg/README. I haven't
> even started thinking about that yet because I wanted to get other
> opinions about the first two issues.
>
> Thoughts? Comments? Questions? Obscenities? ;)
Here is a better diff based on feedback from aja. Still looking for
feedback & suggestions regarding the pki/ scripts.
Index: Makefile
===
RCS file: /work/cvsroot/ports/productivity/taskd/Makefile,v
retrieving revision 1.4
diff -p -u -r1.4 Makefile
--- Makefile25 Aug 2015 07:30:30 - 1.4
+++ Makefile10 Nov 2015 22:20:31 -
@@ -2,9 +2,8 @@
COMMENT = lightweight server providing access to task data
-DISTNAME = taskd-1.0.0
+DISTNAME = taskd-1.1.0
CATEGORIES = productivity net
-REVISION = 1
HOMEPAGE = http://www.taskwarrior.org/
@@ -13,12 +12,15 @@ MASTER_SITES = ${HOMEPAGE}/download/
# MIT
PERMIT_PACKAGE_CDROM = Yes
-MODULES = devel/cmake
+MODULES = gcc4 \
+ devel/cmake
-WANTLIB += c gnutls m pthread stdc++ uuid
+MODGCC4_LANGS =c++
+MODGCC4_ARCHS =*
-LIB_DEPENDS = security/gnutls \
- sysutils/e2fsprogs>=1.42.7
+WANTLIB += c gnutls m pthread
+
+LIB_DEPENDS = security/gnutls
CONFIGURE_STYLE = cmake
@@ -33,10 +35,13 @@ NO_TEST = Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/taskd/pki/
- ${INSTALL_SCRIPT} ${WRKSRC}/pki/!(*.orig) \
+ ${INSTALL_SCRIPT} ${WRKSRC}/pki/generate!(*.orig) \
+ ${PREFIX}/share/examples/taskd/pki/
+ ${INSTALL_DATA} ${WRKSRC}/pki/README \
${PREFIX}/share/examples/taskd/pki/
+ ${INSTALL_DATA} ${WRKSRC}/pki/vars \
+ ${PREFIX}/share/examples/taskd/pki/vars.example
${SUBST_DATA} ${FILESDIR}/config \
${PREFIX}/share/examples/taskd/config
- ${INSTALL_DATA} ${FILESDIR}/vars.dist
${PREFIX}/share/examples/taskd/pki/
.include
Index: distinfo
===
RCS file: /work/cvsroot/ports/productivity/taskd/distinfo,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 distinfo
--- distinfo12 Jul 2014 22:08:35 - 1.1.1.1
+++ distinfo10 Nov 2015 21:12:00 -
@@ -1,2 +1,2 @@
-SHA256 (taskd-1.0.0
RFC: update productivity/taskd to v1.1.0
Are there any productivity/taskd users around? taskd is the sync server
for taskwarrior.
Please note I'm not looking for OKs to commit this yet, I'm just looking
for feedback from users and porters. I think this still needs some
work before it's ready to be committed.
Below is a diff that updates taskd to the latest release, v1.1.0. Most
of it is straightforward:
* Most of our patches were accepted upstream (although apparently with
some slight modifications) so they go away
* I ported the changes from productivity/taskwarrior to use our libc's
uuid functions so the sysutils/e2fsprogs dependency goes away (which
was the main reason I started looking at this in the first place...)
* The changes to file/config remove a duplicate log line, remove the
client.allow config (see: http://taskwarrior.org/docs/taskserver/upgrade.html)
add strict certificate validation, and only listen on the loopback
interface by default (note that taskd no longer supports the
wildcard so the previous value caused an error)
Everything seems to be working with these changes. I have successfully
tested sync'ing locally using the taskwarrior package, and I have
tested sync'ing remotely from a Linux box.
There are three things I'm struggling with:
* The pki/ scripts included with taskd just don't seem to work, but I'm
not sure if it's a problem with the scripts themselves or our
version of GNUTLS. In particular, they generate certs that fail
validation (on the client side I get an error message "certificate
signer constraints were violated," and on the server side I get an
error message "error in pull function). I had to manually generate
all of the certificates myself using a newer version of GNUTLS on a
Linux box. Should we patch them to get something that works on
OpenBSD, provide our own alternatives, or tell users how to manually
do everything themselves in pkg/README?
* The trust=strict in files/config is the recommended setting and makes
the most sense to me, but in light of the problems with the pki/
scripts I wonder if perhaps we would want to relax cert validation?
The third thing is that based on whatever we decide to do about the
other two things we'll need to show some love to pkg/README. I haven't
even started thinking about that yet because I wanted to get other
opinions about the first two issues.
Thoughts? Comments? Questions? Obscenities? ;)
Index: Makefile
===
RCS file: /work/cvsroot/ports/productivity/taskd/Makefile,v
retrieving revision 1.4
diff -p -u -r1.4 Makefile
--- Makefile25 Aug 2015 07:30:30 - 1.4
+++ Makefile10 Nov 2015 22:20:31 -
@@ -2,9 +2,8 @@
COMMENT = lightweight server providing access to task data
-DISTNAME = taskd-1.0.0
+DISTNAME = taskd-1.1.0
CATEGORIES = productivity net
-REVISION = 1
HOMEPAGE = http://www.taskwarrior.org/
@@ -13,12 +12,15 @@ MASTER_SITES = ${HOMEPAGE}/download/
# MIT
PERMIT_PACKAGE_CDROM = Yes
-MODULES = devel/cmake
+MODULES = gcc4 \
+ devel/cmake
-WANTLIB += c gnutls m pthread stdc++ uuid
+MODGCC4_LANGS =c++
+MODGCC4_ARCHS =*
-LIB_DEPENDS = security/gnutls \
- sysutils/e2fsprogs>=1.42.7
+WANTLIB += c gnutls m pthread
+
+LIB_DEPENDS = security/gnutls
CONFIGURE_STYLE = cmake
@@ -33,10 +35,13 @@ NO_TEST = Yes
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/taskd/pki/
- ${INSTALL_SCRIPT} ${WRKSRC}/pki/!(*.orig) \
+ ${INSTALL_SCRIPT} ${WRKSRC}/pki/generate!(*.orig) \
+ ${PREFIX}/share/examples/taskd/pki/
+ ${INSTALL_DATA} ${WRKSRC}/pki/README \
${PREFIX}/share/examples/taskd/pki/
+ ${INSTALL_DATA} ${WRKSRC}/pki/vars \
+ ${PREFIX}/share/examples/taskd/pki/vars.example
${SUBST_DATA} ${FILESDIR}/config \
${PREFIX}/share/examples/taskd/config
- ${INSTALL_DATA} ${FILESDIR}/vars.dist
${PREFIX}/share/examples/taskd/pki/
.include
Index: distinfo
===
RCS file: /work/cvsroot/ports/productivity/taskd/distinfo,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 distinfo
--- distinfo12 Jul 2014 22:08:35 - 1.1.1.1
+++ distinfo10 Nov 2015 21:12:00 -
@@ -1,2 +1,2 @@
-SHA256 (taskd-1.0.0.tar.gz) = Fi7x7sSPgUWHDvDb4BIbeKbamYFbwYr3feB/uwq+AtA=
-SIZE (taskd-1.0.0.tar.gz) = 128191
+SHA256 (taskd-1.1.0.tar.gz) = e4SI5oeXGuVnKf9OLlIJ/4gGz4zVdxi/1+UhvhMGIbQ=
+SIZE (taskd-1.1.0.tar.gz) = 120115
Index: files/config
===
RCS file: /work/cvsroot/ports/productivity/taskd/files/config,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 config
--- files/config12 Jul 2014 22:08:35 - 1.1.1.1
+++ files/config14 Jan 201
Re: [UPDATE] productivity/taskwarrior v2.5.0
This is ok kspillner@ if someone else wants the commit. :)
On Mon, Dec 21, 2015 at 07:40:56AM -0800, Eric Lalonde wrote:
> Hello ports,
>
> Attached is a diff to update taskwarrior to 2.5.0. This diff was supplied by
> Kent Spillner, who thankfully picked up my slack (I've been offline due to
> out-of-band interrupts).
>
> This is a major release, with 1300+ code changes and well over a hundred bug
> fixes. Upstream recommends all users upgrade, as ... "this release
> represents a significant increase in quality."
>
> Tested against a recent amd64 snapshot.
>
>
>
> --- Makefile 21 Aug 2015 14:42:50 - 1.18
> +++ Makefile 10 Nov 2015 20:47:56 -
> @@ -2,10 +2,9 @@
>
> COMMENT =command line todo list manager
>
> -VERSION =2.4.4
> +VERSION =2.5.0
> DISTNAME = task-${VERSION}
> PKGNAME =taskwarrior-${VERSION}
> -REVISION = 1
> CATEGORIES = productivity
>
> HOMEPAGE = http://www.taskwarrior.org/
> --- distinfo 19 May 2015 18:17:41 - 1.9
> +++ distinfo 10 Nov 2015 20:48:03 -
> @@ -1,2 +1,2 @@
> -SHA256 (task-2.4.4.tar.gz) = f/QGQU4L5ID5GYGDFQesJVKXqrM9gkb5jb/SsbLfjjs=
> -SIZE (task-2.4.4.tar.gz) = 2352265
> +SHA256 (task-2.5.0.tar.gz) = TY5nQVppkxCMEbju75m3apka8Rsih0rbt642fgkzRjY=
> +SIZE (task-2.5.0.tar.gz) = 900285
> --- pkg/PLIST 29 Apr 2015 16:00:45 - 1.7
> +++ pkg/PLIST 10 Nov 2015 20:58:08 -
> @@ -38,6 +38,8 @@ share/taskwarrior/rc/holidays.en-HK.rc
> share/taskwarrior/rc/holidays.en-NZ.rc
> share/taskwarrior/rc/holidays.en-US.rc
> share/taskwarrior/rc/holidays.en-ZA.rc
> +share/taskwarrior/rc/holidays.es-CO.rc
> +share/taskwarrior/rc/holidays.es-EC.rc
> share/taskwarrior/rc/holidays.es-ES.rc
> share/taskwarrior/rc/holidays.es-MX.rc
> share/taskwarrior/rc/holidays.es-US.rc
> @@ -71,24 +73,9 @@ share/taskwarrior/rc/solarized-dark-256.
> share/taskwarrior/rc/solarized-light-256.theme
> share/taskwarrior/scripts/
> share/taskwarrior/scripts/add-ons/
> -share/taskwarrior/scripts/add-ons/export-csv.pl
> -share/taskwarrior/scripts/add-ons/export-html.pl
> -share/taskwarrior/scripts/add-ons/export-ical.pl
> -share/taskwarrior/scripts/add-ons/export-sql.py
> -share/taskwarrior/scripts/add-ons/export-sql.pyc
> -share/taskwarrior/scripts/add-ons/export-tsv.pl
> -share/taskwarrior/scripts/add-ons/export-xml.pl
> -share/taskwarrior/scripts/add-ons/export-xml.py
> -share/taskwarrior/scripts/add-ons/export-xml.pyc
> -share/taskwarrior/scripts/add-ons/export-xml.rb
> -share/taskwarrior/scripts/add-ons/export-yad.pl
> -share/taskwarrior/scripts/add-ons/export-yaml.pl
> -share/taskwarrior/scripts/add-ons/import-todo.sh.pl
> -share/taskwarrior/scripts/add-ons/import-yaml.pl
> +share/taskwarrior/scripts/add-ons/README
> share/taskwarrior/scripts/add-ons/update-holidays.pl
> share/taskwarrior/scripts/bash/
> -share/taskwarrior/scripts/bash/context
> -share/taskwarrior/scripts/bash/focus
> share/taskwarrior/scripts/bash/task.sh
> share/taskwarrior/scripts/bash/task_functions.sh
> share/taskwarrior/scripts/fish/
Re: lang/go-bootstrap
On Tue, Dec 08, 2015 at 02:29:03AM +1100, Joel Sing wrote: > This brings me to the next issue/topic - installing additional packages under > /usr/local/go is probably a bad idea. My recollection is that the other issues you mentioned were necessary in order to make this work. So if everyone agrees to a fix for this then I believe the others just go away. > There are likely two options - we could install packages in a separate > location (e.g. /usr/local/go-pkg) and then when code is built it is added to > GOPATH. Alternatively, the code is fetched and built when the binary is built I think option #1 (install packages in a separate location and then add it to GOPATH) is our only choice because ports shouldn't fetch anything during builds. Is it possible to just add /usr/local/go-pkg to GOPATH and then have Go automatically pick up anything installed correctly under that directory? Or would we add each dependency installed under /usr/local/go-pkg to GOPATH separately? Alternatively, we could just roll & host our own distfiles that include all of the dependencies. I thought about doing that for net/websocketd, but ultimately decided it would be ok to install a library from the golang.org/x/net package in /usr/local/go. Sorry! :)
Re: UPDATE: net/websocketd: tweak previous
On Wed, Sep 16, 2015 at 02:31:57PM -0500, Kent R. Spillner wrote:
> *bump*
>
> On Mon, Aug 31, 2015 at 03:52:16PM -0500, Kent R. Spillner wrote:
> > Resending; reattaching diff below. This was already merged upstream:
> > https://github.com/joewalnes/websocketd/pull/166
> >
> > Ok?
> >
> > On Mon, Jul 27, 2015 at 12:56:26PM -0500, Kent R. Spillner wrote:
> > > Small tweak to previous patch (already fed upstream), and bump. The
> > > intended behavior of this example is to print the value of every named
> > > environment variable, or "" if the environment variable isn't set.
> > > The original patch accidentally just printed the name of every environment
> > > variable regardless of whether or not the environment variable was set
> > > (e.g. HTTPS=HTTPS). This only affected the example script, websocketd
> > > itself still worked fine, but the examples are the best source of
> > > websocketd
> > > documentation so I think this is useful before release.
> > >
> > > Ok?
I have an ok from czarkoff@ but would like one from a senior porter, too,
before I commit. Any volunteers? :) I'm happy to wait for the next
upstream release, too, if that's preferable to patching patches; I'm
just not sure when that might happen so I wanted to fix the example that
we package in the meantime.
Index: Makefile
===
RCS file: /work/cvsroot/ports/net/websocketd/Makefile,v
retrieving revision 1.5
diff -p -u -r1.5 Makefile
--- Makefile20 Jul 2015 20:53:58 - 1.5
+++ Makefile27 Jul 2015 17:45:59 -
@@ -8,6 +8,7 @@ DISTNAME = websocketd-$V
GH_ACCOUNT = joewalnes
GH_PROJECT = websocketd
GH_TAGNAME = v$V
+REVISION = 0
CATEGORIES = net www
Index: patches/patch-examples_cgi-bin_dump-env_sh
===
RCS file:
/work/cvsroot/ports/net/websocketd/patches/patch-examples_cgi-bin_dump-env_sh,v
retrieving revision 1.1
diff -p -u -r1.1 patch-examples_cgi-bin_dump-env_sh
--- patches/patch-examples_cgi-bin_dump-env_sh 20 Jul 2015 20:53:59 -
1.1
+++ patches/patch-examples_cgi-bin_dump-env_sh 31 Aug 2015 20:47:31 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-examples_cgi-bin_dump-env_sh,v 1.1 2015/07/20 20:53:59
kspillner Exp $
-Drop Bash and tweak to work with our ksh.
+Drop Bash and tweak to work with our ksh. Merged upstream in PR#166.
--- examples/cgi-bin/dump-env.sh.orig Thu Jul 16 11:52:56 2015
+++ examples/cgi-bin/dump-env.sh Thu Jul 16 11:58:52 2015
@@ -1,4 +1,4 @@
@@ -9,12 +9,13 @@ Drop Bash and tweak to work with our ksh
# Copyright 2013 Joe Walnes and the websocketd team.
# All rights reserved.
-@@ -36,7 +36,7 @@ echo
+@@ -36,7 +36,8 @@ echo
for NAME in ${NAMES}
do
- echo ${NAME}=${!NAME:-}
-+ echo ${NAME}=${NAME:-}
++ eval "value=\${${NAME}}"
++ env -i "${NAME}=${value:-}"
done
# Additional HTTP headers
Re: UPDATE: net/websocketd: tweak previous
*bump*
On Mon, Aug 31, 2015 at 03:52:16PM -0500, Kent R. Spillner wrote:
> Resending; reattaching diff below. This was already merged upstream:
> https://github.com/joewalnes/websocketd/pull/166
>
> Ok?
>
> On Mon, Jul 27, 2015 at 12:56:26PM -0500, Kent R. Spillner wrote:
> > Small tweak to previous patch (already fed upstream), and bump. The
> > intended behavior of this example is to print the value of every named
> > environment variable, or "" if the environment variable isn't set.
> > The original patch accidentally just printed the name of every environment
> > variable regardless of whether or not the environment variable was set
> > (e.g. HTTPS=HTTPS). This only affected the example script, websocketd
> > itself still worked fine, but the examples are the best source of websocketd
> > documentation so I think this is useful before release.
> >
> > Ok?
Index: Makefile
===
RCS file: /work/cvsroot/ports/net/websocketd/Makefile,v
retrieving revision 1.5
diff -p -u -r1.5 Makefile
--- Makefile20 Jul 2015 20:53:58 - 1.5
+++ Makefile27 Jul 2015 17:45:59 -
@@ -8,6 +8,7 @@ DISTNAME = websocketd-$V
GH_ACCOUNT = joewalnes
GH_PROJECT = websocketd
GH_TAGNAME = v$V
+REVISION = 0
CATEGORIES = net www
Index: patches/patch-examples_cgi-bin_dump-env_sh
===
RCS file:
/work/cvsroot/ports/net/websocketd/patches/patch-examples_cgi-bin_dump-env_sh,v
retrieving revision 1.1
diff -p -u -r1.1 patch-examples_cgi-bin_dump-env_sh
--- patches/patch-examples_cgi-bin_dump-env_sh 20 Jul 2015 20:53:59 -
1.1
+++ patches/patch-examples_cgi-bin_dump-env_sh 31 Aug 2015 20:47:31 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-examples_cgi-bin_dump-env_sh,v 1.1 2015/07/20 20:53:59
kspillner Exp $
-Drop Bash and tweak to work with our ksh.
+Drop Bash and tweak to work with our ksh. Merged upstream in PR#166.
--- examples/cgi-bin/dump-env.sh.orig Thu Jul 16 11:52:56 2015
+++ examples/cgi-bin/dump-env.sh Thu Jul 16 11:58:52 2015
@@ -1,4 +1,4 @@
@@ -9,12 +9,13 @@ Drop Bash and tweak to work with our ksh
# Copyright 2013 Joe Walnes and the websocketd team.
# All rights reserved.
-@@ -36,7 +36,7 @@ echo
+@@ -36,7 +36,8 @@ echo
for NAME in ${NAMES}
do
- echo ${NAME}=${!NAME:-}
-+ echo ${NAME}=${NAME:-}
++ eval "value=\${${NAME}}"
++ env -i "${NAME}=${value:-}"
done
# Additional HTTP headers
Re: UPDATE: net/websocketd: tweak previous
Resending; reattaching diff below. This was already merged upstream:
https://github.com/joewalnes/websocketd/pull/166
Ok?
On Mon, Jul 27, 2015 at 12:56:26PM -0500, Kent R. Spillner wrote:
> Small tweak to previous patch (already fed upstream), and bump. The
> intended behavior of this example is to print the value of every named
> environment variable, or "" if the environment variable isn't set.
> The original patch accidentally just printed the name of every environment
> variable regardless of whether or not the environment variable was set
> (e.g. HTTPS=HTTPS). This only affected the example script, websocketd
> itself still worked fine, but the examples are the best source of websocketd
> documentation so I think this is useful before release.
>
> Ok?
Index: Makefile
===
RCS file: /work/cvsroot/ports/net/websocketd/Makefile,v
retrieving revision 1.5
diff -p -u -r1.5 Makefile
--- Makefile20 Jul 2015 20:53:58 - 1.5
+++ Makefile27 Jul 2015 17:45:59 -
@@ -8,6 +8,7 @@ DISTNAME = websocketd-$V
GH_ACCOUNT = joewalnes
GH_PROJECT = websocketd
GH_TAGNAME = v$V
+REVISION = 0
CATEGORIES = net www
Index: patches/patch-examples_cgi-bin_dump-env_sh
===
RCS file:
/work/cvsroot/ports/net/websocketd/patches/patch-examples_cgi-bin_dump-env_sh,v
retrieving revision 1.1
diff -p -u -r1.1 patch-examples_cgi-bin_dump-env_sh
--- patches/patch-examples_cgi-bin_dump-env_sh 20 Jul 2015 20:53:59 -
1.1
+++ patches/patch-examples_cgi-bin_dump-env_sh 31 Aug 2015 20:47:31 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-examples_cgi-bin_dump-env_sh,v 1.1 2015/07/20 20:53:59
kspillner Exp $
-Drop Bash and tweak to work with our ksh.
+Drop Bash and tweak to work with our ksh. Merged upstream in PR#166.
--- examples/cgi-bin/dump-env.sh.orig Thu Jul 16 11:52:56 2015
+++ examples/cgi-bin/dump-env.sh Thu Jul 16 11:58:52 2015
@@ -1,4 +1,4 @@
@@ -9,12 +9,13 @@ Drop Bash and tweak to work with our ksh
# Copyright 2013 Joe Walnes and the websocketd team.
# All rights reserved.
-@@ -36,7 +36,7 @@ echo
+@@ -36,7 +36,8 @@ echo
for NAME in ${NAMES}
do
- echo ${NAME}=${!NAME:-}
-+ echo ${NAME}=${NAME:-}
++ eval "value=\${${NAME}}"
++ env -i "${NAME}=${value:-}"
done
# Additional HTTP headers
UPDATE: net/websocketd: tweak previous
Small tweak to previous patch (already fed upstream), and bump. The
intended behavior of this example is to print the value of every named
environment variable, or "" if the environment variable isn't set.
The original patch accidentally just printed the name of every environment
variable regardless of whether or not the environment variable was set
(e.g. HTTPS=HTTPS). This only affected the example script, websocketd
itself still worked fine, but the examples are the best source of websocketd
documentation so I think this is useful before release.
Ok?
Index: Makefile
===
RCS file: /work/cvsroot/ports/net/websocketd/Makefile,v
retrieving revision 1.5
diff -p -u -r1.5 Makefile
--- Makefile20 Jul 2015 20:53:58 - 1.5
+++ Makefile27 Jul 2015 17:45:59 -
@@ -8,6 +8,7 @@ DISTNAME = websocketd-$V
GH_ACCOUNT = joewalnes
GH_PROJECT = websocketd
GH_TAGNAME = v$V
+REVISION = 0
CATEGORIES = net www
Index: patches/patch-examples_cgi-bin_dump-env_sh
===
RCS file:
/work/cvsroot/ports/net/websocketd/patches/patch-examples_cgi-bin_dump-env_sh,v
retrieving revision 1.1
diff -p -u -r1.1 patch-examples_cgi-bin_dump-env_sh
--- patches/patch-examples_cgi-bin_dump-env_sh 20 Jul 2015 20:53:59 -
1.1
+++ patches/patch-examples_cgi-bin_dump-env_sh 27 Jul 2015 17:47:22 -
@@ -9,12 +9,13 @@ Drop Bash and tweak to work with our ksh
# Copyright 2013 Joe Walnes and the websocketd team.
# All rights reserved.
-@@ -36,7 +36,7 @@ echo
+@@ -36,7 +36,8 @@ echo
for NAME in ${NAMES}
do
- echo ${NAME}=${!NAME:-}
-+ echo ${NAME}=${NAME:-}
++ eval "value=\${${NAME}}"
++ echo ${NAME}=${value:-}
done
# Additional HTTP headers
UPDATE: net/go-websocket
Diff below updates net/go-websocket to current upstream version. The
most relevant change for us is a fix for GitHub issue #10866:
websocket.Conn.Close leaks file descripts if remote has disconnected.
Tested with net/websocketd on amd64, everything builds & runs fine.
Ok?
Index: Makefile
===
RCS file: /work/cvsroot/ports/net/go-websocket/Makefile,v
retrieving revision 1.4
diff -p -u -r1.4 Makefile
--- Makefile12 Jun 2015 19:42:39 - 1.4
+++ Makefile23 Jul 2015 19:20:06 -
@@ -2,12 +2,11 @@
COMMENT = golang websocket package
-VERSION = 0.0
+VERSION = 0.1
DISTNAME = go-websocket-${VERSION}
-GH_COMMIT =97d8e4e174133a4d1d2171380e510eb4dea8f5ea
+GH_COMMIT =446d52dd4018303a13b36097e26d0888aca5d6ef
GH_ACCOUNT = golang
GH_PROJECT = net
-REVISION = 2
CATEGORIES = net www
Index: distinfo
===
RCS file: /work/cvsroot/ports/net/go-websocket/distinfo,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 distinfo
--- distinfo31 Mar 2015 15:37:06 - 1.1.1.1
+++ distinfo23 Jul 2015 19:20:44 -
@@ -1,2 +1,2 @@
-SHA256 (go-websocket-0.0.tar.gz) = OF1Aeg9AjHU3z/bS79Z75GLwrrWCYZuraue7flnTa1A=
-SIZE (go-websocket-0.0.tar.gz) = 448148
+SHA256 (go-websocket-0.1.tar.gz) = kunEclJnJXPkmGgqt8Uw+kR1WkuEqdAKsPGPuRIhp2E=
+SIZE (go-websocket-0.1.tar.gz) = 483230
UPDATE: net/websocketd v0.2.11
Update net/websocketd to the latest release. Also, websocketd --version
was broken, so this patches in the correct version to make that work as
expected.
Ok?
Index: net/websocketd/Makefile
===
RCS file: /work/cvsroot/ports/net/websocketd/Makefile,v
retrieving revision 1.4
diff -p -u -r1.4 Makefile
--- net/websocketd/Makefile 8 Jun 2015 09:17:04 - 1.4
+++ net/websocketd/Makefile 15 Jul 2015 19:10:58 -
@@ -2,13 +2,12 @@
COMMENT = access any command-line tool via a WebSocket
-V =0.2.10
+V =0.2.11
VERSION = $V
DISTNAME = websocketd-$V
GH_ACCOUNT = joewalnes
GH_PROJECT = websocketd
GH_TAGNAME = v$V
-REVISION = 1
CATEGORIES = net www
@@ -26,6 +25,10 @@ MODULES += lang/go
BUILD_DEPENDS =net/go-websocket
NO_TEST = Yes
+SUBST_VARS = VERSION
+
+pre-build:
+ @${SUBST_CMD} ${WRKSRC}/version.go
post-install:
${INSTALL_MAN} ${WRKSRC}/release/websocketd.man \
Index: net/websocketd/distinfo
===
RCS file: /work/cvsroot/ports/net/websocketd/distinfo,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 distinfo
--- net/websocketd/distinfo 31 Mar 2015 15:38:37 - 1.1.1.1
+++ net/websocketd/distinfo 15 Jul 2015 15:21:28 -
@@ -1,2 +1,2 @@
-SHA256 (websocketd-0.2.10.tar.gz) =
3IRBfsx9dVFc8efVaoZ2dCPcfgGWqcj9d3i09RnvqXk=
-SIZE (websocketd-0.2.10.tar.gz) = 37196
+SHA256 (websocketd-0.2.11.tar.gz) =
tnoHJIzYZ1NE5KhVOx6mQ01niaOZCq/l7LmNUhD4UHE=
+SIZE (websocketd-0.2.11.tar.gz) = 39373
Index: net/websocketd/patches/patch-version_go
===
RCS file: net/websocketd/patches/patch-version_go
diff -N net/websocketd/patches/patch-version_go
--- /dev/null 1 Jan 1970 00:00:00 -
+++ net/websocketd/patches/patch-version_go 15 Jul 2015 19:03:00 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Patch version string so websocketd --version works as expected.
+--- version.go.origWed Jul 15 14:01:22 2015
version.go Wed Jul 15 14:01:54 2015
+@@ -13,7 +13,7 @@ import (
+ // This value can be set for releases at build time using:
+ // go {build|run} -ldflags "-X main.version 1.2.3 -X main.buildinfo
timestamp-@githubuser-platform".
+ // If unset, Version() shall return "DEVBUILD".
+-var version string = "DEVBUILD"
++var version string = "${VERSION}"
+ var buildinfo string = "--"
+
+ func Version() string {
Re: NEW: devel/hub-2.2.0
On Sat, May 16, 2015 at 11:52:10AM +0200, Fabian Raetz wrote: > i've tested your diff and it looks good to me. I had a problem with my > $GOPATH because i have the following line in my .profile: > > GOPATH=/home/mischi/.golang > > Due to this the lang/go module does NOT set the GOPATH variable. > > Not sure how to handle this. This is probably my fault as i really > should build ports with another user with a clean environment Hrrmmm, yeah, that's kind of tricky; GOPATH will be problematic for every Go developers who also needs to build ports. Hopefully, that won't be a large number of people because most will just use binary packages, but I'm not sure if we want to require the rest to build ports as a separate user? > I applied your patch to the port in openbsd-wip. Thanks! What's in openbsd-wip is ok kspillner@.
Re: [UPDATE] productivity/taskwarrior 2.4.3 => 2.4.4
On Sat, May 16, 2015 at 10:32:50AM -0700, Eric Lalonde wrote: > > On May 10, 2015, at 11:12 PM, Eric Lalonde wrote: > > > Attached is a bugfix update to productivity/taskwarrior. The main purpose > > for this release is to address an issue where the wrong task may be > > modified if GC is disabled. > > > > Full changelog is available at > > https://git.tasktools.org/projects/TM/repos/task/browse/ChangeLog > > > > Tested on amd64 and i386. > > > > - Eric > > > > > > Ping. ok kspillner@.
Re: NEW: devel/hub-2.2.0
Forgot to mention: with this diff we could drop the patches, too.
> On May 14, 2015, at 14:27, Kent R. Spillner wrote:
>
>> On Sat, May 09, 2015 at 07:49:24PM +0200, Fabian Raetz wrote:
>> i finally found some time to look at this again. The go test cases were
>> failing because they depend on an initialized git repo in ${WRKSRC}
>> which i create now in do-test.
>>
>> This fixes all go tests for me.
>>
>> The cucumber tests are disabled for now. I will dig into this at some
>> point and see how much work it will be to hook them up.
>>
>> New version is attached (and in openbsd-wip by the way)
>
> Looks really good, thanks for updating this! Just a few more nits,
> and I apologize for not noticing these originally:
>
> * Their script/build is actually touching /tmp during the build, and I
> don't think we want to do that
>
> * Their script/test actually calls back into their script/build and
> does the same :(
>
> Here's a small diff to apply on top of your latest tarball that skips
> going through their script/ wrappers, and also uses jasper@'s lang/go
> module (wip, but will probably land in cvs before hub is imported):
>
> --- Makefile.origThu May 14 13:30:14 2015
> +++ MakefileThu May 14 14:11:13 2015
> @@ -1,7 +1,5 @@
> # $OpenBSD$
>
> -ONLY_FOR_ARCHS =${GO_ARCHS}
> -
> COMMENT =wraps git in order to extend it with extra features
>
> V =2.2.1
> @@ -20,18 +18,23 @@
>
> WANTLIB += c pthread
>
> -BUILD_DEPENDS =lang/go \
> -shells/bash
> +MODULES =lang/go
> +
> +BUILD_DEPENDS =shells/bash
> RUN_DEPENDS =devel/git
>
> +post-extract:
> +mkdir -p ${WRKSRC}/src/github.com/github
> +ln -s ${WRKSRC} ${WRKSRC}/src/github.com/github/hub
> +
> do-build:
> -cd ${WRKSRC} && script/build
> +GOPATH=${GOPATH} go install github.com/github/hub
>
> +do-test:
> +cd ${WRKSRC} && git init && GOPATH=${GOPATH} go test ./...
> +
> do-install:
> -${INSTALL_PROGRAM} ${WRKSRC}/hub ${PREFIX}/bin
> +${INSTALL_PROGRAM} ${WRKSRC}/bin/hub ${PREFIX}/bin
>${INSTALL_MAN} ${WRKSRC}/man/hub.1 ${PREFIX}/man/man1
> -
> -do-test:
> -cd ${WRKSRC} && git init && script/test
>
> .include
>
Re: NEW: devel/hub-2.2.0
On Sat, May 09, 2015 at 07:49:24PM +0200, Fabian Raetz wrote:
> i finally found some time to look at this again. The go test cases were
> failing because they depend on an initialized git repo in ${WRKSRC}
> which i create now in do-test.
>
> This fixes all go tests for me.
>
> The cucumber tests are disabled for now. I will dig into this at some
> point and see how much work it will be to hook them up.
>
> New version is attached (and in openbsd-wip by the way)
Looks really good, thanks for updating this! Just a few more nits,
and I apologize for not noticing these originally:
* Their script/build is actually touching /tmp during the build, and I
don't think we want to do that
* Their script/test actually calls back into their script/build and
does the same :(
Here's a small diff to apply on top of your latest tarball that skips
going through their script/ wrappers, and also uses jasper@'s lang/go
module (wip, but will probably land in cvs before hub is imported):
--- Makefile.orig Thu May 14 13:30:14 2015
+++ MakefileThu May 14 14:11:13 2015
@@ -1,7 +1,5 @@
# $OpenBSD$
-ONLY_FOR_ARCHS = ${GO_ARCHS}
-
COMMENT = wraps git in order to extend it with extra features
V =2.2.1
@@ -20,18 +18,23 @@
WANTLIB += c pthread
-BUILD_DEPENDS =lang/go \
- shells/bash
+MODULES = lang/go
+
+BUILD_DEPENDS =shells/bash
RUN_DEPENDS = devel/git
+post-extract:
+ mkdir -p ${WRKSRC}/src/github.com/github
+ ln -s ${WRKSRC} ${WRKSRC}/src/github.com/github/hub
+
do-build:
- cd ${WRKSRC} && script/build
+ GOPATH=${GOPATH} go install github.com/github/hub
+do-test:
+ cd ${WRKSRC} && git init && GOPATH=${GOPATH} go test ./...
+
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/hub ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/hub ${PREFIX}/bin
${INSTALL_MAN} ${WRKSRC}/man/hub.1 ${PREFIX}/man/man1
-
-do-test:
- cd ${WRKSRC} && git init && script/test
.include
Re: [UPDATE] productivity/taskwarrior
On Wed, Apr 29, 2015 at 12:50:38AM +0100, Stuart Henderson wrote:
> This is an issue with the current version of binutils, it affects a
> number of ports. (other issues: very high memory use, a real problem on
> i386, and poor assembler support for recent opcodes, which is probably a
> bigger problem on amd64 and arm).
>
> Using gcc4.8 is fine with me, though (and in general, not just here)
> I would prefer a comment explaining why it was chosen ("needs c++11;
> linker issues wth clang" would be plenty good enough).
Updated diff below; only change since the previous version is the
comment above MODULES. Ok to commit?
Index: Makefile
===
RCS file: /work/cvsroot/ports/productivity/taskwarrior/Makefile,v
retrieving revision 1.13
diff -p -u -r1.13 Makefile
--- Makefile15 Jan 2015 15:47:05 - 1.13
+++ Makefile29 Apr 2015 14:13:37 -
@@ -2,7 +2,7 @@
COMMENT = command line todo list manager
-VERSION = 2.4.0
+VERSION = 2.4.3
DISTNAME = task-${VERSION}
PKGNAME = taskwarrior-${VERSION}
CATEGORIES = productivity
@@ -16,11 +16,16 @@ MASTER_SITES = ${HOMEPAGE}/download/
# GPLv2
PERMIT_PACKAGE_CDROM = Yes
-MODULES = devel/cmake \
- lang/lua
+# Needs C++11; linker issues with clang
+MODULES = gcc4 \
+ devel/cmake \
+ lang/lua \
+ lang/python
+MODGCC4_LANGS =c++
+MODGCC4_ARCHS =*
MODLUA_SA =Yes
-WANTLIB += c gnutls m ncurses pthread readline stdc++ uuid
+WANTLIB += c gnutls m pthread uuid
LIB_DEPENDS = security/gnutls \
sysutils/e2fsprogs>=1.42.7
@@ -39,10 +44,13 @@ NO_TEST = Yes
pre-configure:
@perl -pi -e 's|share/doc/task/|share/taskwarrior/|g' \
${WRKSRC}/doc/man/task-color.5.in \
- ${WRKSRC}/doc/man/task-tutorial.5.in \
${WRKSRC}/doc/man/taskrc.5.in \
${WRKSRC}/src/Config.cpp
@perl -pi -e 's|share/doc/task-VERSION/|share/taskwarrior/|g' \
${WRKSRC}/scripts/vim/README
+
+post-install:
+ ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
+ ${PREFIX}/share/taskwarrior/scripts/add-ons
.include
Index: distinfo
===
RCS file: /work/cvsroot/ports/productivity/taskwarrior/distinfo,v
retrieving revision 1.7
diff -p -u -r1.7 distinfo
--- distinfo15 Jan 2015 15:47:05 - 1.7
+++ distinfo29 Apr 2015 14:08:40 -
@@ -1,2 +1,2 @@
-SHA256 (task-2.4.0.tar.gz) = b6WV9bD99u6AMdo56NAJdxvaE18mXV97Wd+ARv/ZEZ4=
-SIZE (task-2.4.0.tar.gz) = 841000
+SHA256 (task-2.4.3.tar.gz) = uwK4+ob+ITouarCToEU4Ovur4g5Z3QsPXdZDDZ3ga9I=
+SIZE (task-2.4.3.tar.gz) = 2334424
Index: pkg/PLIST
===
RCS file: /work/cvsroot/ports/productivity/taskwarrior/pkg/PLIST,v
retrieving revision 1.6
diff -p -u -r1.6 PLIST
--- pkg/PLIST 15 Jan 2015 15:47:05 - 1.6
+++ pkg/PLIST 29 Apr 2015 14:08:40 -
@@ -75,9 +75,11 @@ share/taskwarrior/scripts/add-ons/export
share/taskwarrior/scripts/add-ons/export-html.pl
share/taskwarrior/scripts/add-ons/export-ical.pl
share/taskwarrior/scripts/add-ons/export-sql.py
+share/taskwarrior/scripts/add-ons/export-sql.pyc
share/taskwarrior/scripts/add-ons/export-tsv.pl
share/taskwarrior/scripts/add-ons/export-xml.pl
share/taskwarrior/scripts/add-ons/export-xml.py
+share/taskwarrior/scripts/add-ons/export-xml.pyc
share/taskwarrior/scripts/add-ons/export-xml.rb
share/taskwarrior/scripts/add-ons/export-yad.pl
share/taskwarrior/scripts/add-ons/export-yaml.pl
Re: [UPDATE] productivity/taskwarrior
On Tue, Apr 28, 2015 at 10:34:14PM +0300, Vadim Zhukov wrote:
> > This diff updates TaskWarrior to v2.4.3. The build now requires a
> > C++11-compatible compiler so use the gcc4 module, and uses lang/python
> > to precompile the export-{sql,xml}.py add-on scripts.
> >
> > MAINTAINER ok'ed this diff. Ok to commit?
>
> Was it tried with CLang? It's better than GCC4 module due to not using
> libestdc++.
Yeah, it fails to link with MODULE lang/clang. MAINTAINER mentioned in a
private
email that he saw similar linking problems.
[UPDATE] productivity/taskwarrior
This diff updates TaskWarrior to v2.4.3. The build now requires a
C++11-compatible compiler so use the gcc4 module, and uses lang/python
to precompile the export-{sql,xml}.py add-on scripts.
MAINTAINER ok'ed this diff. Ok to commit?
Index: Makefile
===
RCS file: /work/cvsroot/ports/productivity/taskwarrior/Makefile,v
retrieving revision 1.13
diff -p -u -r1.13 Makefile
--- Makefile15 Jan 2015 15:47:05 - 1.13
+++ Makefile21 Apr 2015 21:19:15 -
@@ -2,7 +2,7 @@
COMMENT = command line todo list manager
-VERSION = 2.4.0
+VERSION = 2.4.3
DISTNAME = task-${VERSION}
PKGNAME = taskwarrior-${VERSION}
CATEGORIES = productivity
@@ -17,10 +17,14 @@ MASTER_SITES = ${HOMEPAGE}/download/
PERMIT_PACKAGE_CDROM = Yes
MODULES = devel/cmake \
- lang/lua
+ gcc4 \
+ lang/lua \
+ lang/python
+MODGCC4_LANGS =c++
+MODGCC4_ARCHS =*
MODLUA_SA =Yes
-WANTLIB += c gnutls m ncurses pthread readline stdc++ uuid
+WANTLIB += c gnutls m pthread uuid
LIB_DEPENDS = security/gnutls \
sysutils/e2fsprogs>=1.42.7
@@ -39,10 +43,13 @@ NO_TEST = Yes
pre-configure:
@perl -pi -e 's|share/doc/task/|share/taskwarrior/|g' \
${WRKSRC}/doc/man/task-color.5.in \
- ${WRKSRC}/doc/man/task-tutorial.5.in \
${WRKSRC}/doc/man/taskrc.5.in \
${WRKSRC}/src/Config.cpp
@perl -pi -e 's|share/doc/task-VERSION/|share/taskwarrior/|g' \
${WRKSRC}/scripts/vim/README
+
+post-install:
+ ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
+ ${PREFIX}/share/taskwarrior/scripts/add-ons
.include
Index: distinfo
===
RCS file: /work/cvsroot/ports/productivity/taskwarrior/distinfo,v
retrieving revision 1.7
diff -p -u -r1.7 distinfo
--- distinfo15 Jan 2015 15:47:05 - 1.7
+++ distinfo21 Apr 2015 20:31:46 -
@@ -1,2 +1,2 @@
-SHA256 (task-2.4.0.tar.gz) = b6WV9bD99u6AMdo56NAJdxvaE18mXV97Wd+ARv/ZEZ4=
-SIZE (task-2.4.0.tar.gz) = 841000
+SHA256 (task-2.4.3.tar.gz) = uwK4+ob+ITouarCToEU4Ovur4g5Z3QsPXdZDDZ3ga9I=
+SIZE (task-2.4.3.tar.gz) = 2334424
Index: pkg/PLIST
===
RCS file: /work/cvsroot/ports/productivity/taskwarrior/pkg/PLIST,v
retrieving revision 1.6
diff -p -u -r1.6 PLIST
--- pkg/PLIST 15 Jan 2015 15:47:05 - 1.6
+++ pkg/PLIST 21 Apr 2015 21:23:28 -
@@ -75,9 +75,11 @@ share/taskwarrior/scripts/add-ons/export
share/taskwarrior/scripts/add-ons/export-html.pl
share/taskwarrior/scripts/add-ons/export-ical.pl
share/taskwarrior/scripts/add-ons/export-sql.py
+share/taskwarrior/scripts/add-ons/export-sql.pyc
share/taskwarrior/scripts/add-ons/export-tsv.pl
share/taskwarrior/scripts/add-ons/export-xml.pl
share/taskwarrior/scripts/add-ons/export-xml.py
+share/taskwarrior/scripts/add-ons/export-xml.pyc
share/taskwarrior/scripts/add-ons/export-xml.rb
share/taskwarrior/scripts/add-ons/export-yad.pl
share/taskwarrior/scripts/add-ons/export-yaml.pl
Re: NEW: devel/hub-2.2.0
On Sun, Mar 29, 2015 at 01:07:52PM +0200, Fabian Raetz wrote: > Updated port to use the newly defined GO_ARCHS variable. > Any comments and/or feedback? Hey, sorry for letting this slip through the cracks but I finally just got around to checking it out. Looks good, but I noticed that a new version is out. I tried your version first, and then I tried to upgrade to a newer version (attached). Also, you'll need to either set NO_TEST or else provide a do-test target. I added a do-test that calls script/test and I also had to patch the way script/build calls find(1), but the tests don't pass. Do you think you can look into the failures and work out what's going wrong? See below for the output I see locally when I try running the tests (everything from the "tmux: unknown option -- V" line down comes from the Ruby tests, but as you can see some of the Go tests failed too). I fear that the Ruby/Cucumber tests will be difficult to get working in this port because we don't want Bundler to download any gems during builds, but rather then set NO_TEST = yes I would prefer to fix the Go tests and patch script/test to skip running the Ruby tests. What do you think? Of course, if you want to tackle the Ruby stuff as well be my guest (and patch script/ruby-test to fix the tmux check). ;) $ make test ===> Regression tests for hub-2.2.1 cd /usr/obj/ports/hub-2.2.1/hub-2.2.1 && script/test ? _/usr/obj/ports/hub-2.2.1/hub-2.2.1 [no test files] ok _/usr/obj/ports/hub-2.2.1/hub-2.2.1/cmd 0.041s exit status 1 FAIL_/usr/obj/ports/hub-2.2.1/hub-2.2.1/commands0.236s ? _/usr/obj/ports/hub-2.2.1/hub-2.2.1/fixtures[no test files] ok _/usr/obj/ports/hub-2.2.1/hub-2.2.1/git 1.387s --- FAIL: TestGetMessageFile (0.02s) assert.go:16: /usr/obj/ports/hub-2.2.1/hub-2.2.1/github/editor_test.go:166 assert.go:37: ! Failure FAIL FAIL_/usr/obj/ports/hub-2.2.1/hub-2.2.1/github 0.687s ? _/usr/obj/ports/hub-2.2.1/hub-2.2.1/ui [no test files] ok _/usr/obj/ports/hub-2.2.1/hub-2.2.1/utils 0.015s tmux: unknown option -- V usage: tmux [-2lquv] [-c shell-command] [-f file] [-L socket-name] [-S socket-path] [command [flags]] warning: skipping shell completion tests (install tmux to enable) script/ruby-test: line 7: 517 Bad system call (core dumped) RUBYOPT="$RUBYOPT -w" bundle exec "$@" 2> >(tee >(grep 'warning:' >>"$warnings") | grep -v 'warning:') *** Error 140 in . (Makefile:35 'do-test') *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2779 '/usr/obj/ports/hub-2.2.1/.test_done') *** Error 1 in /usr/ports/devel/hub (/usr/ports/infrastructure/mk/bsd.port.mk:2476 'test') hub-2.2.1.tar.gz Description: application/tar-gz
Re: NEW: www/websocketd
On Thu, Mar 26, 2015 at 02:06:24PM -0500, Kent R. Spillner wrote: > On Wed, Mar 25, 2015 at 09:44:29AM -0500, Kent R. Spillner wrote: > > Anyone else care to weigh in? Or anyone want to give me an ok import into > > net? > > I assume silence means everyone either agrees or doesn't care enough. :) > Attached is a new version with CATEGORIES switched to net www, and I > tweaked BUILD_DEPENDS for go-websocket's new category, too. Ok? Ping. net_websocketd.tar.gz Description: application/tar-gz
Re: NEW: www/go-websocket
On Thu, Mar 26, 2015 at 02:04:22PM -0500, Kent R. Spillner wrote: > On Tue, Mar 24, 2015 at 10:36:03PM +, Stuart Henderson wrote: > > I think this is OK to import. We may want to tweak things a bit as we > > get more experience with go ports, but we can cross that bridge later :) > > Attached a new version which switches CATEGORIES to net www. Ok? Ping. net_go-websocket.tar.gz Description: application/tar-gz
Re: NEW: www/websocketd
On Wed, Mar 25, 2015 at 09:44:29AM -0500, Kent R. Spillner wrote: > Anyone else care to weigh in? Or anyone want to give me an ok import into > net? I assume silence means everyone either agrees or doesn't care enough. :) Attached is a new version with CATEGORIES switched to net www, and I tweaked BUILD_DEPENDS for go-websocket's new category, too. Ok? net_websocketd.tar.gz Description: application/tar-gz
Re: NEW: www/go-websocket
On Tue, Mar 24, 2015 at 10:36:03PM +, Stuart Henderson wrote: > I think this is OK to import. We may want to tweak things a bit as we > get more experience with go ports, but we can cross that bridge later :) Attached a new version which switches CATEGORIES to net www. Ok? net_go-websocket.tar.gz Description: application/tar-gz
Re: NEW: www/websocketd
On Tue, Mar 24, 2015 at 10:40:22PM +, Stuart Henderson wrote: > common style is to split BUILD_DEPENDS onto multiple lines, e.g. > > -BUILD_DEPENDS = lang/go www/go-websocket > +BUILD_DEPENDS =lang/go \ > + www/go-websocket Done. > I'm wondering about CATEGORIES though. net seems like maybe it's more > appropriate than www? (actually...perhaps net is a better place for > go-websocket too, perhaps with www as a secondary category?...) Yeah, that makes sense. I don't have a strong preference which category is the main one, although www is slightly less crowded and websockets are fairly web-centric. But skimming some of the other ports already in www I don't see many that are similar to these so perhaps net is a more natural choice for both. Anyone else care to weigh in? Or anyone want to give me an ok import into net?
Re: NEW: www/go-websocket
On Tue, Mar 24, 2015 at 08:39:39PM +, Stuart Henderson wrote: > Your do-install is amd64 only, and your PLIST uses MACHINE_ARCH. Oops, sorry! Updated version attached. www_go-websocket.tar.gz Description: application/tar-gz
Re: NEW: www/go-websocket
On Tue, Mar 24, 2015 at 02:34:30PM -0500, Kent R. Spillner wrote:
> Attached is an updated version based on feedback from czarkoff@:
>
> - Enable tests
> - Prefer ${...} over $(...)
>
> Ok?
Once more, this time with a slightly improved do-test target.
Tests pass and works fine on amd64 with the www/websocketd port I also
sent.
www_go-websocket.tar.gz
Description: application/tar-gz
Re: NEW: www/websocketd
With attachment this time.
On Tue, Mar 24, 2015 at 02:35:53PM -0500, Kent R. Spillner wrote:
> Attached is an updated version based on feedback from czarkoff@:
>
> - Reword DESCR
> - Prefer ${...} over $(...)
>
> Ok?
>
> On Mon, Mar 23, 2015 at 11:57:54AM -0500, Kent R. Spillner wrote:
> > Ping.
> >
> > On Wed, Mar 18, 2015 at 12:27:06PM -0500, Kent R. Spillner wrote:
> > > Attached is a new port for websocketd, which lets you access any command
> > > line tool via a websocket. It depends on the go-websocket port sent
> > > previously.
> > >
> > > $ cat pkg/DESCR
> > > websocketd is a small command-line tool that will wrap an existing
> > > command-line interface program, and allow it to be accessed via a
> > > WebSocket.
> > >
> > > WebSocket-capable applications can now be built very easily. As long as
> > > you can write an executable program that reads `STDIN` and writes to
> > > `STDOUT`, you can build a WebSocket server. Do it in Python, Ruby, Perl,
> > > Bash, .NET, C, Go, PHP, Java, Clojure, Scala, Groovy, Expect, Awk,
> > > VBScript, Haskell, Lua, R, whatever! No networking libraries necessary.
>
>
www_websocketd.tar.gz
Description: application/tar-gz
Re: NEW: www/go-websocket
Attached is an updated version based on feedback from czarkoff@:
- Enable tests
- Prefer ${...} over $(...)
Ok?
On Mon, Mar 23, 2015 at 11:57:20AM -0500, Kent R. Spillner wrote:
> Ping.
>
> On Wed, Mar 18, 2015 at 12:24:40PM -0500, Kent R. Spillner wrote:
> > Attached is a new port for Go's websocket package
> > (http://golang.org/x/net/websocket). This is a dependency of websocketd
> > which I will post next.
> >
> > Ok?
> >
> > $ cat pkg/DESCR:
> > Package websocket implements a client and server for the WebSocket
> > protocol as specified in RFC 6455.
www_go-websocket.tar.gz
Description: application/tar-gz
Re: NEW: www/websocketd
Attached is an updated version based on feedback from czarkoff@:
- Reword DESCR
- Prefer ${...} over $(...)
Ok?
On Mon, Mar 23, 2015 at 11:57:54AM -0500, Kent R. Spillner wrote:
> Ping.
>
> On Wed, Mar 18, 2015 at 12:27:06PM -0500, Kent R. Spillner wrote:
> > Attached is a new port for websocketd, which lets you access any command
> > line tool via a websocket. It depends on the go-websocket port sent
> > previously.
> >
> > $ cat pkg/DESCR
> > websocketd is a small command-line tool that will wrap an existing
> > command-line interface program, and allow it to be accessed via a
> > WebSocket.
> >
> > WebSocket-capable applications can now be built very easily. As long as
> > you can write an executable program that reads `STDIN` and writes to
> > `STDOUT`, you can build a WebSocket server. Do it in Python, Ruby, Perl,
> > Bash, .NET, C, Go, PHP, Java, Clojure, Scala, Groovy, Expect, Awk,
> > VBScript, Haskell, Lua, R, whatever! No networking libraries necessary.
Re: NEW: www/go-websocket
Ping. On Wed, Mar 18, 2015 at 12:24:40PM -0500, Kent R. Spillner wrote: > Attached is a new port for Go's websocket package > (http://golang.org/x/net/websocket). This is a dependency of websocketd > which I will post next. > > Ok? > > $ cat pkg/DESCR: > Package websocket implements a client and server for the WebSocket > protocol as specified in RFC 6455. www_go-websocket.tar.gz Description: application/tar-gz
Re: NEW: www/websocketd
Ping. On Wed, Mar 18, 2015 at 12:27:06PM -0500, Kent R. Spillner wrote: > Attached is a new port for websocketd, which lets you access any command > line tool via a websocket. It depends on the go-websocket port sent > previously. > > $ cat pkg/DESCR > websocketd is a small command-line tool that will wrap an existing > command-line interface program, and allow it to be accessed via a > WebSocket. > > WebSocket-capable applications can now be built very easily. As long as > you can write an executable program that reads `STDIN` and writes to > `STDOUT`, you can build a WebSocket server. Do it in Python, Ruby, Perl, > Bash, .NET, C, Go, PHP, Java, Clojure, Scala, Groovy, Expect, Awk, > VBScript, Haskell, Lua, R, whatever! No networking libraries necessary. www_websocketd.tar.gz Description: application/tar-gz
Re: New port: devel/godoc
On Fri, Mar 20, 2015 at 08:00:12AM +0100, Dmitrij D. Czarkoff wrote: > Updated tarball. CATEGORY is set to "textproc devel" and sthen@'s mirror > is used as MASTER_SITES. Tested on amd64; tests pass, everything looks fine (haven't tested the built-in web server, though). ok kspillner@ fwiw.
Re: New port: devel/godoc
On Fri, Mar 20, 2015 at 01:56:51AM +0300, Vadim Zhukov wrote: > > Index: faq/ports/guide.html > > === > > RCS file: /work/cvsroot/www/faq/ports/guide.html,v > > retrieving revision 1.34 > > diff -p -u -r1.34 guide.html > > --- faq/ports/guide.html3 Dec 2014 11:54:42 - 1.34 > > +++ faq/ports/guide.html19 Mar 2015 21:07:23 - > > @@ -450,9 +450,9 @@ article altogether. > > > > Put a longer description of the port into pkg/DESCR. > > One to a few paragraphs concisely explaining what the port does is > sufficient. > > -It is also advised to wrap your lines at 72 characters. > > +It is also advised to wrap your lines at 80 characters. > > This can be done by first editing the DESCR file and then > running it > > -through fmt -w 72. > > +through fmt -w 80. > > > > > > If the application needs to create a user or a group, choose the lowest > free > > > > okay zhuk@ FWIW. The portcheck was adjusted from 72 to 80 some time ago > after discussion, but web pages were forgotten. Any other porters want to ok that diff? :)
Re: New port: devel/godoc
On Thu, Mar 19, 2015 at 08:55:23PM +, Stuart Henderson wrote: > I don't know about this. There's no "72 col for DESCR" rule in ports. > I think 72 was mainly a common value because it allows a couple of ">" > quotes for news/email without flowing past 80 cols. That makes sense. portcheck only checks that lines in DESCR are < 80. Should we tweak the porters' guide? Index: faq/ports/guide.html === RCS file: /work/cvsroot/www/faq/ports/guide.html,v retrieving revision 1.34 diff -p -u -r1.34 guide.html --- faq/ports/guide.html3 Dec 2014 11:54:42 - 1.34 +++ faq/ports/guide.html19 Mar 2015 21:07:23 - @@ -450,9 +450,9 @@ article altogether. Put a longer description of the port into pkg/DESCR. One to a few paragraphs concisely explaining what the port does is sufficient. -It is also advised to wrap your lines at 72 characters. +It is also advised to wrap your lines at 80 characters. This can be done by first editing the DESCR file and then running it -through fmt -w 72. +through fmt -w 80. If the application needs to create a user or a group, choose the lowest free
Re: New port: devel/godoc
On Thu, Mar 19, 2015 at 11:16:32AM +0100, Dmitrij D. Czarkoff wrote: > Comments, OKs? > CATEGORIES = devel Devel is an obvious choice but it's awfully crowded. Would it make sense to put this in textproc instead? > WANTLIB += c pthread Tabs here instead? > BUILD_DEPENDS = lang/go > RUN_DEPENDS = lang/go Does it require Go at runtime? Also, format pkg/DESCR with fmt -72, and you might want to add an ONLY_FOR_ARCHS = $(GO_ARCHS).
NEW: www/go-websocket
Attached is a new port for Go's websocket package (http://golang.org/x/net/websocket). This is a dependency of websocketd which I will post next. Ok? $ cat pkg/DESCR: Package websocket implements a client and server for the WebSocket protocol as specified in RFC 6455. www_go-websocket.tar.gz Description: application/tar-gz
NEW: www/websocketd
Attached is a new port for websocketd, which lets you access any command line tool via a websocket. It depends on the go-websocket port sent previously. $ cat pkg/DESCR websocketd is a small command-line tool that will wrap an existing command-line interface program, and allow it to be accessed via a WebSocket. WebSocket-capable applications can now be built very easily. As long as you can write an executable program that reads `STDIN` and writes to `STDOUT`, you can build a WebSocket server. Do it in Python, Ruby, Perl, Bash, .NET, C, Go, PHP, Java, Clojure, Scala, Groovy, Expect, Awk, VBScript, Haskell, Lua, R, whatever! No networking libraries necessary. www_websocketd.tar.gz Description: application/tar-gz
UPDATE: devel/quilt upgrade to v0.64
quilt v0.64 was released this morning (mostly bug fixes and performance
optimizations). A few of our patches were accepted upstream and can go
away, and we no longer need to build the gcp wrapper script.
Ok?
Index: Makefile
===
RCS file: /work/cvsroot/ports/devel/quilt/Makefile,v
retrieving revision 1.8
diff -p -u -r1.8 Makefile
--- Makefile6 Feb 2015 20:14:48 - 1.8
+++ Makefile9 Feb 2015 20:40:58 -
@@ -2,8 +2,7 @@
COMMENT= manage large numbers of patches
-DISTNAME= quilt-0.63
-REVISION= 1
+DISTNAME= quilt-0.64
CATEGORIES=devel
HOMEPAGE= http://savannah.nongnu.org/projects/quilt/
@@ -35,8 +34,7 @@ BUILD_DEPENDS=${RUN_DEPENDS}
CONFIGURE_STYLE= autoconf no-autoheader
AUTOCONF_VERSION= 2.69
-CONFIGURE_ARGS=--with-cp=${LOCALBASE}/bin/gcp \
- --with-date=${LOCALBASE}/bin/gdate \
+CONFIGURE_ARGS=--with-date=${LOCALBASE}/bin/gdate \
--with-diff=${LOCALBASE}/bin/gdiff \
--with-find=${LOCALBASE}/bin/gfind \
--with-getopt=${LOCALBASE}/bin/gnugetopt \
Index: distinfo
===
RCS file: /work/cvsroot/ports/devel/quilt/distinfo,v
retrieving revision 1.3
diff -p -u -r1.3 distinfo
--- distinfo20 Jul 2014 20:40:25 - 1.3
+++ distinfo9 Feb 2015 19:44:09 -
@@ -1,2 +1,2 @@
-SHA256 (quilt-0.63.tar.gz) = KEZ4giGqiETFTxAjnHy8XogDGFkWK8woVElEbDz//lI=
-SIZE (quilt-0.63.tar.gz) = 389593
+SHA256 (quilt-0.64.tar.gz) = xL/TKCIUoojo0+khrk1S5z4kxP6tcrVEZ1Kt7pmnr/0=
+SIZE (quilt-0.64.tar.gz) = 407845
Index: patches/patch-Makefile_in
===
RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -p -u -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in 20 Jul 2014 20:40:25 - 1.3
+++ patches/patch-Makefile_in 9 Feb 2015 20:50:27 -
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile_in,v 1.3 2014/07/20 20:40:25 landry Exp $
Makefile.in.orig Wed May 7 13:41:15 2014
-+++ Makefile.inTue Jun 3 13:11:41 2014
+--- Makefile.in.orig Thu Jan 29 06:31:11 2015
Makefile.inMon Feb 9 14:47:19 2015
@@ -13,7 +13,7 @@ docdir :=@docdir@
mandir := @mandir@
localedir := $(datadir)/locale
@@ -10,26 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.3 2014/0
INSTALL :=@INSTALL@
POD2MAN :=@POD2MAN@
-@@ -42,7 +42,6 @@ MSGCAT :=@MSGCAT@
- DIFFSTAT := @DIFFSTAT@
- RPMBUILD := @RPMBUILD@
- SENDMAIL := @SENDMAIL@
--CP := @CP@
- MD5SUM := @MD5SUM@
-
- USE_NLS :=@USE_NLS@
-@@ -122,8 +121,10 @@ GIT_DESC := $(shell ./git-desc | sed -e 's:^v::')
-
- TESTS := $(filter-out test/patch-wrapper.test,$(wildcard test/*.test))
- ifneq ($(PATCH_WRAPPER),)
-+ifneq ($(PATCH_WRAPPER), no)
- TESTS += test/patch-wrapper.test
- endif
-+endif
- DIRT += test/.depend $(wildcard test/.*.ok)
-
- # Settings for running the uninstalled version of quilt in the source tree:
-@@ -316,9 +317,11 @@ install-main :: scripts
+@@ -315,9 +315,11 @@ install-main :: scripts
$(INSTALL) -m 644 quilt/scripts/patchfns quilt/scripts/utilfns \
$(BUILD_ROOT)$(datadir)/$(PACKAGE)/scripts
ifneq ($(PATCH_WRAPPER),)
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac 20 Jul 2014 20:40:25 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.2 2014/07/20 20:40:25 landry Exp $
configure.ac.orig Tue Jun 3 13:01:15 2014
-+++ configure.ac Tue Jun 3 13:01:33 2014
-@@ -367,7 +367,6 @@ fi
-
- QUILT_COMPAT_PROG_PATH(SENDMAIL, sendmail, [], [/usr/sbin])
-
--QUILT_COMPAT_PROG_PATH(CP, cp, [cp])
- QUILT_COMPAT_PROG_PATH(MD5SUM, md5sum, [gmd5sum md5sum])
-
- AC_PATH_PROG(MSGMERGE, [msgmerge])
Index: patches/patch-quilt_mail_in
===
RCS file: patches/patch-quilt_mail_in
diff -N patches/patch-quilt_mail_in
--- patches/patch-quilt_mail_in 6 Feb 2015 20:14:50 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,111 +0,0 @@
-$OpenBSD: patch-quilt_mail_in,v 1.1 2015/02/06 20:14:50 kspillner Exp $
-
-Remove formail/procmail dependency
-
quilt/mail.in.orig Wed May 7 13:41:15 2014
-+++ quilt/mail.in Wed Jan 7 23:08:06 2015
-@@ -81,6 +81,18 @@ msgid()
- echo "$timestamp@${opt_sender_address#*@}"
- }
-
-+# Extract RFC 2822 compliant header values, including Long Header Fields,
-+# from messages
-+
-+extract_header_value()
-+{
-+ local header=$1
-+
-+ # Long Header
devel/quilt: remove procmail dependency
As the quilt maintainer I was surprised to see Landry mention quilt on
icb as a port that depends on procmail; I didn't even realize that quilt
used procmail behind the scenes. :)
Turns out, quilt really only uses formail, and only to extract the value
of headers. Reading RFC 2822 I think we can safely do this with sed,
instead. (Well, technically gsed in this case; in fact, testing this
exposed a few issues in our sed that I will investigate separately)
I'd really appreciate some extra eyeballs on this new patch. quilt's
mail regress test looks pretty thorough and it still passes, and I also
manually verified the sed output matches formail's output. Cc'ing
guenther@ in case he's got a spare minute or two to look this over and
chime in.
Once this goes in I'll push the patch upstream.
Ok?
Index: Makefile
===
RCS file: /work/cvsroot/ports/devel/quilt/Makefile,v
retrieving revision 1.7
diff -p -u -r1.7 Makefile
--- Makefile18 Sep 2014 15:14:47 - 1.7
+++ Makefile8 Jan 2015 00:06:50 -
@@ -3,7 +3,7 @@
COMMENT= manage large numbers of patches
DISTNAME= quilt-0.63
-REVISION= 0
+REVISION= 1
CATEGORIES=devel
HOMEPAGE= http://savannah.nongnu.org/projects/quilt/
@@ -22,7 +22,6 @@ USE_GMAKE=Yes
RUN_DEPENDS= devel/gpatch \
lang/gawk \
- mail/procmail \
misc/findutils \
misc/gnugetopt \
shells/bash \
Index: patches/patch-quilt_mail_in
===
RCS file: patches/patch-quilt_mail_in
diff -N patches/patch-quilt_mail_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-quilt_mail_in 8 Jan 2015 05:08:10 -
@@ -0,0 +1,111 @@
+$OpenBSD$
+
+Remove formail/procmail dependency
+
+--- quilt/mail.in.orig Wed May 7 13:41:15 2014
quilt/mail.in Wed Jan 7 23:08:06 2015
+@@ -81,6 +81,18 @@ msgid()
+ echo "$timestamp@${opt_sender_address#*@}"
+ }
+
++# Extract RFC 2822 compliant header values, including Long Header Fields,
++# from messages
++
++extract_header_value()
++{
++ local header=$1
++
++ # Long Header Fields may span multiple lines, in which case CRLF
++ # is followed by space or tab (RFC 2822)
++ sed -n "/^${header}/,/^[^ \\t]/ { /^${header}/ { p; n; }; /^[^ \\t]/q;
/^$/q; p; }" | sed "s/^${header}//"
++}
++
+ # See RFC 2822 Internet Message Format for how the In-Reply-To and
+ # References headers are generated...
+
+@@ -88,7 +100,7 @@ in_reply_to_header()
+ {
+ local message=$1 message_id
+
+- message_id=$(formail -x Message-ID: < "$message")
++ message_id=$(extract_header_value Message-ID: < "$message")
+ message_id=${message_id# }
+ [ -n "$message_id" ] && echo "In-Reply-To: $message_id"
+ }
+@@ -97,14 +109,14 @@ references_header()
+ {
+ local message=$1 message_id references in_reply_to
+
+- message_id=$(formail -x Message-ID: < "$message")
++ message_id=$(extract_header_value Message-ID: < "$message")
+ message_id=${message_id# }
+
+- references=$(formail -x References: < "$message")
++ references=$(extract_header_value References: < "$message")
+ references=${references# }
+ if [ -z "$references" ]
+ then
+- in_reply_to=$(formail -x In-Reply-To: < "$message")
++ in_reply_to=$(extract_header_value In-Reply-To: < "$message")
+ in_reply_to=${in_reply_to# }
+ if [ -n "$in_reply_to" ]
+ then
+@@ -256,13 +268,6 @@ then
+ usage
+ fi
+
+-# check if formail is installed before doing anything
+-if ! type formail &> /dev/null
+-then
+- echo $"You have to install 'formail' to use 'quilt mail'" >&2
+- exit 1
+-fi
+-
+ if [ $# -ge 1 ]
+ then
+ if [ "$1" = - ]
+@@ -333,7 +338,7 @@ then
+ local -a mh
+
+ # Does this patch have a Subject: line?
+- subject=$(formail -x Subject: < $tmpdir/header)
++ subject=$(extract_header_value Subject: < $tmpdir/header)
+ if [ -n "$subject" ]
+ then
+ awk '
+@@ -443,7 +448,7 @@ do
+ | quilt_mail_patch_filter "$patch" > "$tmpdir/$patch"
+ status=${PIPESTATUS[1]}
+
+- subject=$(formail -x Replace-Subject: < "$tmpdir/$patch" | join_lines)
++ subject=$(extract_header_value Replace-Subject: < "$tmpdir/$patch" |
join_lines)
+ if [ $status -ne 0 -o -z "$subject" ]
+ then
+ printf \
+@@ -486,7 +491,7 @@ then
+
+ if [ -z "$opt_subject" ]
+ then
+- opt_subject="Re: $(formail -x Subject: < "$opt_reply_to" \
++ opt_subject="Re: $(extract_header_value Subject: <
"$opt_reply_to" \
+ | sed -e 's/^ *\([
Maintainer email address update
Update my email address and bump. Ok? Index: devel/quilt//Makefile === RCS file: /work/cvsroot/ports/devel/quilt/Makefile,v retrieving revision 1.6 diff -p -u -r1.6 Makefile --- devel/quilt//Makefile 20 Jul 2014 20:40:25 - 1.6 +++ devel/quilt//Makefile 17 Sep 2014 19:38:14 - @@ -3,10 +3,11 @@ COMMENT= manage large numbers of patches DISTNAME= quilt-0.63 +REVISION= 0 CATEGORIES=devel HOMEPAGE= http://savannah.nongnu.org/projects/quilt/ -MAINTAINER=Kent R. Spillner +MAINTAINER=Kent R. Spillner # GPLv3+ PERMIT_PACKAGE_CDROM= Yes Index: productivity/vit//Makefile === RCS file: /work/cvsroot/ports/productivity/vit/Makefile,v retrieving revision 1.3 diff -p -u -r1.3 Makefile --- productivity/vit//Makefile 22 Apr 2014 18:00:24 - 1.3 +++ productivity/vit//Makefile 17 Sep 2014 19:37:15 - @@ -3,11 +3,11 @@ COMMENT = ncurses front-end for taskwarrior DISTNAME = vit-1.2 -REVISION = 0 +REVISION = 1 CATEGORIES = productivity HOMEPAGE = http://tasktools.org/projects/vit.html -MAINTAINER = Kent R. Spillner +MAINTAINER = Kent R. Spillner # GPLv3+ PERMIT_PACKAGE_CDROM = Yes Index: x11/yeahconsole//Makefile === RCS file: /work/cvsroot/ports/x11/yeahconsole/Makefile,v retrieving revision 1.1.1.1 diff -p -u -r1.1.1.1 Makefile --- x11/yeahconsole//Makefile 9 Nov 2013 01:43:12 - 1.1.1.1 +++ x11/yeahconsole//Makefile 17 Sep 2014 19:37:55 - @@ -3,10 +3,11 @@ COMMENT = terminal wrapper for creating drop-down consoles DISTNAME = yeahconsole-0.3.4 +REVISION = 0 CATEGORIES = x11 HOMEPAGE = http://phrat.de/yeahtools.html -MAINTAINER = Kent R. Spillner +MAINTAINER = Kent R. Spillner # GPLv2+ PERMIT_PACKAGE_CDROM = Yes
Re: devel/quilt: maintainer update to v0.63
Maintainer update. Passes portcheck. Tested on amd64-current. Removes previous patches merged upstream. New patches already fed & merged upstream for the next release, too. On Wed, Jul 16, 2014 at 05:52:46PM -0500, Kent R. Spillner wrote: > *Bump* > > > On Jul 10, 2014, at 12:34, "Kent R. Spillner" wrote: > > > > Ping. > > > >> On Tue, Jun 03, 2014 at 01:32:17PM -0500, Kent R. Spillner wrote: > >> This diff updates devel/quilt to v0.63. Our previous patches were > >> merged upstream; one goes away completly. I also fed the new patches > >> upstream as well. > >> > >> Passes portcheck. Ok? > >> > >> > >> Index: Makefile > >> === > >> RCS file: /work/cvsroot/ports/devel/quilt/Makefile,v > >> retrieving revision 1.5 > >> diff -p -u -r1.5 Makefile > >> --- Makefile9 Jan 2014 14:55:42 -1.5 > >> +++ Makefile2 Jun 2014 21:09:53 - > >> @@ -2,7 +2,7 @@ > >> > >> COMMENT=manage large numbers of patches > >> > >> -DISTNAME=quilt-0.61 > >> +DISTNAME=quilt-0.63 > >> CATEGORIES=devel > >> > >> HOMEPAGE=http://savannah.nongnu.org/projects/quilt/ > >> Index: distinfo > >> === > >> RCS file: /work/cvsroot/ports/devel/quilt/distinfo,v > >> retrieving revision 1.2 > >> diff -p -u -r1.2 distinfo > >> --- distinfo9 Jan 2014 14:55:42 -1.2 > >> +++ distinfo2 Jun 2014 22:24:44 - > >> @@ -1,2 +1,2 @@ > >> -SHA256 (quilt-0.61.tar.gz) = HuwKJwrE1B7qD9WCNgPJ0qNatrirc6kN2SzhKRsqn8M= > >> -SIZE (quilt-0.61.tar.gz) = 450552 > >> +SHA256 (quilt-0.63.tar.gz) = KEZ4giGqiETFTxAjnHy8XogDGFkWK8woVElEbDz//lI= > >> +SIZE (quilt-0.63.tar.gz) = 389593 > >> Index: patches/patch-Makefile_in > >> === > >> RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-Makefile_in,v > >> retrieving revision 1.2 > >> diff -p -u -r1.2 patch-Makefile_in > >> --- patches/patch-Makefile_in9 Jan 2014 14:55:42 -1.2 > >> +++ patches/patch-Makefile_in3 Jun 2014 18:12:39 - > >> @@ -1,6 +1,6 @@ > >> $OpenBSD: patch-Makefile_in,v 1.2 2014/01/09 14:55:42 jca Exp $ > >> Makefile.in.origSun Dec 8 10:40:42 2013 > >> -+++ Makefile.inMon Dec 30 18:40:55 2013 > >> +--- Makefile.in.origWed May 7 13:41:15 2014 > >> Makefile.inTue Jun 3 13:11:41 2014 > >> @@ -13,7 +13,7 @@ docdir :=@docdir@ > >> mandir :=@mandir@ > >> localedir :=$(datadir)/locale > >> @@ -10,12 +10,34 @@ $OpenBSD: patch-Makefile_in,v 1.2 2014/0 > >> > >> INSTALL :=@INSTALL@ > >> POD2MAN :=@POD2MAN@ > >> -@@ -42,6 +42,8 @@ MSGCAT :=@MSGCAT@ > >> +@@ -42,7 +42,6 @@ MSGCAT :=@MSGCAT@ > >> DIFFSTAT :=@DIFFSTAT@ > >> RPMBUILD :=@RPMBUILD@ > >> SENDMAIL :=@SENDMAIL@ > >> -+CP :=@CP@ > >> -+MD5SUM :=@MD5SUM@ > >> +-CP :=@CP@ > >> + MD5SUM :=@MD5SUM@ > >> > >> USE_NLS :=@USE_NLS@ > >> - STAT_HARDLINK := @STAT_HARDLINK@ > >> +@@ -122,8 +121,10 @@ GIT_DESC :=$(shell ./git-desc | sed -e 's:^v::') > >> + > >> + TESTS :=$(filter-out test/patch-wrapper.test,$(wildcard test/*.test)) > >> + ifneq ($(PATCH_WRAPPER),) > >> ++ifneq ($(PATCH_WRAPPER), no) > >> + TESTS +=test/patch-wrapper.test > >> + endif > >> ++endif > >> + DIRT +=test/.depend $(wildcard test/.*.ok) > >> + > >> + # Settings for running the uninstalled version of quilt in the source > >> tree: > >> +@@ -316,9 +317,11 @@ install-main :: scripts > >> +$(INSTALL) -m 644 quilt/scripts/patchfns quilt/scripts/utilfns\ > >> + $(BUILD_ROOT)$(datadir)/$(PACKAGE)/scripts > >> + ifneq ($(PATCH_WRAPPER),) > >> ++ifneq ($(PATCH_WRAPPER), no) > >> +$(INSTALL) -d $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper > >> +$(INSTALL) -m 755 bin/patch-wrapper\ > >> + $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper/patch > >> ++endif > >> + endif > >> + > >> +$(INSTALL) -d $(BUILD_ROOT)$(docdir)/ > >> Index: patches/patch-configure_ac
Re: devel/quilt: maintainer update to v0.63
*Bump* > On Jul 10, 2014, at 12:34, "Kent R. Spillner" wrote: > > Ping. > >> On Tue, Jun 03, 2014 at 01:32:17PM -0500, Kent R. Spillner wrote: >> This diff updates devel/quilt to v0.63. Our previous patches were >> merged upstream; one goes away completly. I also fed the new patches >> upstream as well. >> >> Passes portcheck. Ok? >> >> >> Index: Makefile >> === >> RCS file: /work/cvsroot/ports/devel/quilt/Makefile,v >> retrieving revision 1.5 >> diff -p -u -r1.5 Makefile >> --- Makefile9 Jan 2014 14:55:42 -1.5 >> +++ Makefile2 Jun 2014 21:09:53 - >> @@ -2,7 +2,7 @@ >> >> COMMENT=manage large numbers of patches >> >> -DISTNAME=quilt-0.61 >> +DISTNAME=quilt-0.63 >> CATEGORIES=devel >> >> HOMEPAGE=http://savannah.nongnu.org/projects/quilt/ >> Index: distinfo >> === >> RCS file: /work/cvsroot/ports/devel/quilt/distinfo,v >> retrieving revision 1.2 >> diff -p -u -r1.2 distinfo >> --- distinfo9 Jan 2014 14:55:42 -1.2 >> +++ distinfo2 Jun 2014 22:24:44 - >> @@ -1,2 +1,2 @@ >> -SHA256 (quilt-0.61.tar.gz) = HuwKJwrE1B7qD9WCNgPJ0qNatrirc6kN2SzhKRsqn8M= >> -SIZE (quilt-0.61.tar.gz) = 450552 >> +SHA256 (quilt-0.63.tar.gz) = KEZ4giGqiETFTxAjnHy8XogDGFkWK8woVElEbDz//lI= >> +SIZE (quilt-0.63.tar.gz) = 389593 >> Index: patches/patch-Makefile_in >> === >> RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-Makefile_in,v >> retrieving revision 1.2 >> diff -p -u -r1.2 patch-Makefile_in >> --- patches/patch-Makefile_in9 Jan 2014 14:55:42 -1.2 >> +++ patches/patch-Makefile_in3 Jun 2014 18:12:39 - >> @@ -1,6 +1,6 @@ >> $OpenBSD: patch-Makefile_in,v 1.2 2014/01/09 14:55:42 jca Exp $ >> Makefile.in.origSun Dec 8 10:40:42 2013 >> -+++ Makefile.inMon Dec 30 18:40:55 2013 >> +--- Makefile.in.origWed May 7 13:41:15 2014 >> Makefile.inTue Jun 3 13:11:41 2014 >> @@ -13,7 +13,7 @@ docdir :=@docdir@ >> mandir :=@mandir@ >> localedir :=$(datadir)/locale >> @@ -10,12 +10,34 @@ $OpenBSD: patch-Makefile_in,v 1.2 2014/0 >> >> INSTALL :=@INSTALL@ >> POD2MAN :=@POD2MAN@ >> -@@ -42,6 +42,8 @@ MSGCAT :=@MSGCAT@ >> +@@ -42,7 +42,6 @@ MSGCAT :=@MSGCAT@ >> DIFFSTAT :=@DIFFSTAT@ >> RPMBUILD :=@RPMBUILD@ >> SENDMAIL :=@SENDMAIL@ >> -+CP :=@CP@ >> -+MD5SUM :=@MD5SUM@ >> +-CP :=@CP@ >> + MD5SUM :=@MD5SUM@ >> >> USE_NLS :=@USE_NLS@ >> - STAT_HARDLINK := @STAT_HARDLINK@ >> +@@ -122,8 +121,10 @@ GIT_DESC :=$(shell ./git-desc | sed -e 's:^v::') >> + >> + TESTS :=$(filter-out test/patch-wrapper.test,$(wildcard test/*.test)) >> + ifneq ($(PATCH_WRAPPER),) >> ++ifneq ($(PATCH_WRAPPER), no) >> + TESTS +=test/patch-wrapper.test >> + endif >> ++endif >> + DIRT +=test/.depend $(wildcard test/.*.ok) >> + >> + # Settings for running the uninstalled version of quilt in the source tree: >> +@@ -316,9 +317,11 @@ install-main :: scripts >> +$(INSTALL) -m 644 quilt/scripts/patchfns quilt/scripts/utilfns\ >> + $(BUILD_ROOT)$(datadir)/$(PACKAGE)/scripts >> + ifneq ($(PATCH_WRAPPER),) >> ++ifneq ($(PATCH_WRAPPER), no) >> +$(INSTALL) -d $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper >> +$(INSTALL) -m 755 bin/patch-wrapper\ >> + $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper/patch >> ++endif >> + endif >> + >> +$(INSTALL) -d $(BUILD_ROOT)$(docdir)/ >> Index: patches/patch-configure_ac >> === >> RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-configure_ac,v >> retrieving revision 1.1 >> diff -p -u -r1.1 patch-configure_ac >> --- patches/patch-configure_ac9 Jan 2014 14:55:42 -1.1 >> +++ patches/patch-configure_ac3 Jun 2014 18:01:51 - >> @@ -1,13 +1,11 @@ >> -$OpenBSD: patch-configure_ac,v 1.1 2014/01/09 14:55:42 jca Exp $ >> configure.ac.origSun Dec 8 21:51:39 2013 >> -+++ configure.acMon Dec 30 18:28:26 2013 >> -@@ -367,6 +367,9 @@ fi >> +$OpenBSD$ >> +--- configure.ac.origTue Jun 3 13:01:15 2014 >> configure.acTue Jun
Re: devel/quilt: maintainer update to v0.63
Ping. On Tue, Jun 03, 2014 at 01:32:17PM -0500, Kent R. Spillner wrote: > This diff updates devel/quilt to v0.63. Our previous patches were > merged upstream; one goes away completly. I also fed the new patches > upstream as well. > > Passes portcheck. Ok? > > > Index: Makefile > === > RCS file: /work/cvsroot/ports/devel/quilt/Makefile,v > retrieving revision 1.5 > diff -p -u -r1.5 Makefile > --- Makefile 9 Jan 2014 14:55:42 - 1.5 > +++ Makefile 2 Jun 2014 21:09:53 - > @@ -2,7 +2,7 @@ > > COMMENT= manage large numbers of patches > > -DISTNAME=quilt-0.61 > +DISTNAME=quilt-0.63 > CATEGORIES= devel > > HOMEPAGE=http://savannah.nongnu.org/projects/quilt/ > Index: distinfo > === > RCS file: /work/cvsroot/ports/devel/quilt/distinfo,v > retrieving revision 1.2 > diff -p -u -r1.2 distinfo > --- distinfo 9 Jan 2014 14:55:42 - 1.2 > +++ distinfo 2 Jun 2014 22:24:44 - > @@ -1,2 +1,2 @@ > -SHA256 (quilt-0.61.tar.gz) = HuwKJwrE1B7qD9WCNgPJ0qNatrirc6kN2SzhKRsqn8M= > -SIZE (quilt-0.61.tar.gz) = 450552 > +SHA256 (quilt-0.63.tar.gz) = KEZ4giGqiETFTxAjnHy8XogDGFkWK8woVElEbDz//lI= > +SIZE (quilt-0.63.tar.gz) = 389593 > Index: patches/patch-Makefile_in > === > RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-Makefile_in,v > retrieving revision 1.2 > diff -p -u -r1.2 patch-Makefile_in > --- patches/patch-Makefile_in 9 Jan 2014 14:55:42 - 1.2 > +++ patches/patch-Makefile_in 3 Jun 2014 18:12:39 - > @@ -1,6 +1,6 @@ > $OpenBSD: patch-Makefile_in,v 1.2 2014/01/09 14:55:42 jca Exp $ > Makefile.in.orig Sun Dec 8 10:40:42 2013 > -+++ Makefile.in Mon Dec 30 18:40:55 2013 > +--- Makefile.in.orig Wed May 7 13:41:15 2014 > Makefile.in Tue Jun 3 13:11:41 2014 > @@ -13,7 +13,7 @@ docdir := @docdir@ > mandir := @mandir@ > localedir :=$(datadir)/locale > @@ -10,12 +10,34 @@ $OpenBSD: patch-Makefile_in,v 1.2 2014/0 > > INSTALL := @INSTALL@ > POD2MAN := @POD2MAN@ > -@@ -42,6 +42,8 @@ MSGCAT := @MSGCAT@ > +@@ -42,7 +42,6 @@ MSGCAT := @MSGCAT@ > DIFFSTAT := @DIFFSTAT@ > RPMBUILD := @RPMBUILD@ > SENDMAIL := @SENDMAIL@ > -+CP := @CP@ > -+MD5SUM := @MD5SUM@ > +-CP := @CP@ > + MD5SUM := @MD5SUM@ > > USE_NLS := @USE_NLS@ > - STAT_HARDLINK := @STAT_HARDLINK@ > +@@ -122,8 +121,10 @@ GIT_DESC := $(shell ./git-desc | sed -e 's:^v::') > + > + TESTS :=$(filter-out test/patch-wrapper.test,$(wildcard test/*.test)) > + ifneq ($(PATCH_WRAPPER),) > ++ifneq ($(PATCH_WRAPPER), no) > + TESTS +=test/patch-wrapper.test > + endif > ++endif > + DIRT += test/.depend $(wildcard test/.*.ok) > + > + # Settings for running the uninstalled version of quilt in the source tree: > +@@ -316,9 +317,11 @@ install-main :: scripts > + $(INSTALL) -m 644 quilt/scripts/patchfns quilt/scripts/utilfns \ > +$(BUILD_ROOT)$(datadir)/$(PACKAGE)/scripts > + ifneq ($(PATCH_WRAPPER),) > ++ifneq ($(PATCH_WRAPPER), no) > + $(INSTALL) -d $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper > + $(INSTALL) -m 755 bin/patch-wrapper \ > +$(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper/patch > ++endif > + endif > + > + $(INSTALL) -d $(BUILD_ROOT)$(docdir)/ > Index: patches/patch-configure_ac > === > RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-configure_ac,v > retrieving revision 1.1 > diff -p -u -r1.1 patch-configure_ac > --- patches/patch-configure_ac9 Jan 2014 14:55:42 - 1.1 > +++ patches/patch-configure_ac3 Jun 2014 18:01:51 - > @@ -1,13 +1,11 @@ > -$OpenBSD: patch-configure_ac,v 1.1 2014/01/09 14:55:42 jca Exp $ > configure.ac.origSun Dec 8 21:51:39 2013 > -+++ configure.ac Mon Dec 30 18:28:26 2013 > -@@ -367,6 +367,9 @@ fi > +$OpenBSD$ > +--- configure.ac.origTue Jun 3 13:01:15 2014 > configure.ac Tue Jun 3 13:01:33 2014 > +@@ -367,7 +367,6 @@ fi > > QUILT_COMPAT_PROG_PATH(SENDMAIL, sendmail, [], [/usr/sbin]) > > -+QUILT_COMPAT_PROG_PATH(CP, cp, gcp cp) > -+QUILT_COMPAT_PROG_PATH(MD5SUM, md5sum, gmd5sum md5sum) > -+ > +-QUILT_COMPAT_PROG_PATH(CP, cp, [cp]) > + QUILT_COMPAT_PROG_PATH(MD5SUM, md5sum, [gmd5sum md5sum]) > + > AC_PATH_PROG(MSGMERGE, [msgmerge]) > - AC_PATH_PROG(MSGFMT, [msgfmt]) > - A
devel/quilt: maintainer update to v0.63
This diff updates devel/quilt to v0.63. Our previous patches were merged upstream; one goes away completly. I also fed the new patches upstream as well. Passes portcheck. Ok? Index: Makefile === RCS file: /work/cvsroot/ports/devel/quilt/Makefile,v retrieving revision 1.5 diff -p -u -r1.5 Makefile --- Makefile9 Jan 2014 14:55:42 - 1.5 +++ Makefile2 Jun 2014 21:09:53 - @@ -2,7 +2,7 @@ COMMENT= manage large numbers of patches -DISTNAME= quilt-0.61 +DISTNAME= quilt-0.63 CATEGORIES=devel HOMEPAGE= http://savannah.nongnu.org/projects/quilt/ Index: distinfo === RCS file: /work/cvsroot/ports/devel/quilt/distinfo,v retrieving revision 1.2 diff -p -u -r1.2 distinfo --- distinfo9 Jan 2014 14:55:42 - 1.2 +++ distinfo2 Jun 2014 22:24:44 - @@ -1,2 +1,2 @@ -SHA256 (quilt-0.61.tar.gz) = HuwKJwrE1B7qD9WCNgPJ0qNatrirc6kN2SzhKRsqn8M= -SIZE (quilt-0.61.tar.gz) = 450552 +SHA256 (quilt-0.63.tar.gz) = KEZ4giGqiETFTxAjnHy8XogDGFkWK8woVElEbDz//lI= +SIZE (quilt-0.63.tar.gz) = 389593 Index: patches/patch-Makefile_in === RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-Makefile_in,v retrieving revision 1.2 diff -p -u -r1.2 patch-Makefile_in --- patches/patch-Makefile_in 9 Jan 2014 14:55:42 - 1.2 +++ patches/patch-Makefile_in 3 Jun 2014 18:12:39 - @@ -1,6 +1,6 @@ $OpenBSD: patch-Makefile_in,v 1.2 2014/01/09 14:55:42 jca Exp $ Makefile.in.orig Sun Dec 8 10:40:42 2013 -+++ Makefile.inMon Dec 30 18:40:55 2013 +--- Makefile.in.orig Wed May 7 13:41:15 2014 Makefile.inTue Jun 3 13:11:41 2014 @@ -13,7 +13,7 @@ docdir :=@docdir@ mandir := @mandir@ localedir := $(datadir)/locale @@ -10,12 +10,34 @@ $OpenBSD: patch-Makefile_in,v 1.2 2014/0 INSTALL :=@INSTALL@ POD2MAN :=@POD2MAN@ -@@ -42,6 +42,8 @@ MSGCAT :=@MSGCAT@ +@@ -42,7 +42,6 @@ MSGCAT :=@MSGCAT@ DIFFSTAT := @DIFFSTAT@ RPMBUILD := @RPMBUILD@ SENDMAIL := @SENDMAIL@ -+CP := @CP@ -+MD5SUM := @MD5SUM@ +-CP := @CP@ + MD5SUM := @MD5SUM@ USE_NLS :=@USE_NLS@ - STAT_HARDLINK := @STAT_HARDLINK@ +@@ -122,8 +121,10 @@ GIT_DESC := $(shell ./git-desc | sed -e 's:^v::') + + TESTS := $(filter-out test/patch-wrapper.test,$(wildcard test/*.test)) + ifneq ($(PATCH_WRAPPER),) ++ifneq ($(PATCH_WRAPPER), no) + TESTS += test/patch-wrapper.test + endif ++endif + DIRT += test/.depend $(wildcard test/.*.ok) + + # Settings for running the uninstalled version of quilt in the source tree: +@@ -316,9 +317,11 @@ install-main :: scripts + $(INSTALL) -m 644 quilt/scripts/patchfns quilt/scripts/utilfns \ + $(BUILD_ROOT)$(datadir)/$(PACKAGE)/scripts + ifneq ($(PATCH_WRAPPER),) ++ifneq ($(PATCH_WRAPPER), no) + $(INSTALL) -d $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper + $(INSTALL) -m 755 bin/patch-wrapper \ + $(BUILD_ROOT)$(datadir)/$(PACKAGE)/wrapper/patch ++endif + endif + + $(INSTALL) -d $(BUILD_ROOT)$(docdir)/ Index: patches/patch-configure_ac === RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-configure_ac,v retrieving revision 1.1 diff -p -u -r1.1 patch-configure_ac --- patches/patch-configure_ac 9 Jan 2014 14:55:42 - 1.1 +++ patches/patch-configure_ac 3 Jun 2014 18:01:51 - @@ -1,13 +1,11 @@ -$OpenBSD: patch-configure_ac,v 1.1 2014/01/09 14:55:42 jca Exp $ configure.ac.orig Sun Dec 8 21:51:39 2013 -+++ configure.ac Mon Dec 30 18:28:26 2013 -@@ -367,6 +367,9 @@ fi +$OpenBSD$ +--- configure.ac.orig Tue Jun 3 13:01:15 2014 configure.ac Tue Jun 3 13:01:33 2014 +@@ -367,7 +367,6 @@ fi QUILT_COMPAT_PROG_PATH(SENDMAIL, sendmail, [], [/usr/sbin]) -+QUILT_COMPAT_PROG_PATH(CP, cp, gcp cp) -+QUILT_COMPAT_PROG_PATH(MD5SUM, md5sum, gmd5sum md5sum) -+ +-QUILT_COMPAT_PROG_PATH(CP, cp, [cp]) + QUILT_COMPAT_PROG_PATH(MD5SUM, md5sum, [gmd5sum md5sum]) + AC_PATH_PROG(MSGMERGE, [msgmerge]) - AC_PATH_PROG(MSGFMT, [msgfmt]) - AC_PATH_PROG(XGETTEXT, [xgettext]) Index: patches/patch-test_delete_test === RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-test_delete_test,v retrieving revision 1.2 diff -p -u -r1.2 patch-test_delete_test --- patches/patch-test_delete_test 9 Jan 2014 14:55:42 - 1.2 +++ patches/patch-test_delete_test 3 Jun 2014 18:12:25 - @@ -1,6 +1,6 @@ $OpenBSD: patch-test_delete_test,v 1.2 2014/01/09 14:55:42 jca Exp $ test/delete.test.orig Sun Dec 8 10:40:42 2013 -+++ test/delete.test Mon Dec 30 18:34:19 2013 +--- test/delete.test.ori
productivity/vit: maintainer update
Here's a trivial patch to update vit to v1.2 (released last week). Index: Makefile === RCS file: /work/cvsroot/ports/productivity/vit/Makefile,v retrieving revision 1.1.1.1 diff -p -u -r1.1.1.1 Makefile --- Makefile31 Oct 2013 18:54:40 - 1.1.1.1 +++ Makefile15 Apr 2014 18:59:50 - @@ -2,7 +2,7 @@ COMMENT = ncurses front-end for taskwarrior -DISTNAME = vit-1.1 +DISTNAME = vit-1.2 CATEGORIES = productivity HOMEPAGE = http://taskwarrior.org/projects/1/wiki/Vit Index: distinfo === RCS file: /work/cvsroot/ports/productivity/vit/distinfo,v retrieving revision 1.1.1.1 diff -p -u -r1.1.1.1 distinfo --- distinfo31 Oct 2013 18:54:40 - 1.1.1.1 +++ distinfo15 Apr 2014 19:00:51 - @@ -1,2 +1,2 @@ -SHA256 (vit-1.1.tar.gz) = m4zOJEex2CR8bmMXt13Hba9PDzCiqBYHVcO+/q/Ixr4= -SIZE (vit-1.1.tar.gz) = 43365 +SHA256 (vit-1.2.tar.gz) = p43uVzEwyNa8ks9g+vrAq8eN0hCaz7pYfLCuIC6lu9A= +SIZE (vit-1.2.tar.gz) = 48729
Re: UPDATE: devel/quilt
Thanks! I'm away from home and unable to test for a few days, but this reads
ok to me. I'll work with upstream to incorporate your patches later this week.
> On Dec 30, 2013, at 11:49, j...@wxcvbn.org (Jérémie Courrèges-Anglas) wrote:
>
> "Kent R. Spillner" writes:
>
>>> On Tue, Dec 24, 2013 at 08:11:13AM -0600, Kent R. Spillner wrote:
>>> Here is an updated patch with the portability improvments suggested by jca@.
>>
>> Actually, after cluebat from Quilt maintainers this diff should be ignored
>> and my original diff preferred.
>>
>> When you configure quilt with --with-foo=/path/to/gnu/gfoo Quilt actually
>> creates a compat/ directory and copies gfoo to compat/foo. Then the quilt
>> wrapper (bin/quilt.in) adds compat/ to the front of PATH.
>>
>> So long story short, those uses of sed 's/.../i' are actually portable
>> because sed is really gsed at run-time. Slightly misleading, but portable.
>> :)
>
> I did not notice the compat/ symlinks, sorry if you wasted time on this.
> OTOH we have a better understanding of how this port works now. O:)
>
> I reviewed all the scripts and did not find any offender but those:
> - md5sum in quilt/scripts/inspect
> - cp --parents --blabla in quilt/scripts/backup-files
>
> The latter is handled by the script if there's an error, using
> a file-by-file copy. Since we depend on coreutils anyway, why not use
> gcp?
>
> Another issue is that ${SYSCONFDIR} in Makefile.in wasn't expanded
> (using MAKE_FLAGS). Let's use @sysconfdir@ instead so that quilt
> properly finds /etc/quilt.quiltrc.
>
> ok?
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/devel/quilt/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- Makefile31 Aug 2013 17:22:16 -1.4
> +++ Makefile30 Dec 2013 17:23:19 -
> @@ -2,11 +2,11 @@
>
> COMMENT=manage large numbers of patches
>
> -DISTNAME=quilt-0.60
> -REVISION=1
> +DISTNAME=quilt-0.61
> CATEGORIES=devel
>
> HOMEPAGE=http://savannah.nongnu.org/projects/quilt/
> +MAINTAINER=Kent R. Spillner
>
> # GPLv3+
> PERMIT_PACKAGE_CDROM=Yes
> @@ -33,12 +33,15 @@ RUN_DEPENDS=devel/gpatch \
>
> BUILD_DEPENDS=${RUN_DEPENDS}
>
> -CONFIGURE_STYLE=gnu
> -CONFIGURE_ARGS=--with-date=${LOCALBASE}/bin/gdate \
> +CONFIGURE_STYLE=autoconf no-autoheader
> +AUTOCONF_VERSION=2.69
> +CONFIGURE_ARGS=--with-cp=${LOCALBASE}/bin/gcp \
> +--with-date=${LOCALBASE}/bin/gdate \
>--with-diff=${LOCALBASE}/bin/gdiff \
>--with-find=${LOCALBASE}/bin/gfind \
>--with-getopt=${LOCALBASE}/bin/gnugetopt \
>--with-grep=${LOCALBASE}/bin/ggrep \
> +--with-md5sum=${LOCALBASE}/bin/gmd5sum \
>--with-patch=${LOCALBASE}/bin/gpatch \
>--with-sed=${LOCALBASE}/bin/gsed \
>--without-patch-wrapper \
> Index: distinfo
> ===
> RCS file: /cvs/ports/devel/quilt/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo8 Oct 2012 15:14:25 -1.1.1.1
> +++ distinfo27 Dec 2013 16:18:36 -
> @@ -1,2 +1,2 @@
> -SHA256 (quilt-0.60.tar.gz) = PXKikuQyvrmnP50Kz+OnfJtNfkIgmRm7JE6ZWMfP5ks=
> -SIZE (quilt-0.60.tar.gz) = 442369
> +SHA256 (quilt-0.61.tar.gz) = HuwKJwrE1B7qD9WCNgPJ0qNatrirc6kN2SzhKRsqn8M=
> +SIZE (quilt-0.61.tar.gz) = 450552
> Index: patches/patch-Makefile_in
> ===
> RCS file: /cvs/ports/devel/quilt/patches/patch-Makefile_in,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-Makefile_in
> --- patches/patch-Makefile_in8 Oct 2012 15:14:25 -1.1.1.1
> +++ patches/patch-Makefile_in30 Dec 2013 17:41:26 -
> @@ -1,12 +1,21 @@
> $OpenBSD: patch-Makefile_in,v 1.1.1.1 2012/10/08 15:14:25 rpe Exp $
> Makefile.in.origSun Sep 2 19:19:00 2012
> -+++ Makefile.inSun Sep 2 19:19:16 2012
> +--- Makefile.in.origSun Dec 8 10:40:42 2013
> Makefile.inMon Dec 30 18:40:55 2013
> @@ -13,7 +13,7 @@ docdir :=@docdir@
> mandir :=@mandir@
> localedir :=$(datadir)/locale
> emacsdir :=$(datadir)/emacs/site-lisp
> -etcdir :=$(subst /usr/etc,/etc,$(prefix)/etc)
> -+etcdir :=${SYSCONFDIR}
> ++etcdir :=@sysconfdir@
>
> INSTALL :=@INSTALL@
> POD2MAN :=@POD2MAN@
> +@@ -42,6 +42,8 @@ MSGCAT :=@MSGCAT@
> + DIFFSTAT :=@DIFFS
Re: UPDATE: devel/quilt
On Tue, Dec 24, 2013 at 08:11:13AM -0600, Kent R. Spillner wrote: > Here is an updated patch with the portability improvments suggested by jca@. Actually, after cluebat from Quilt maintainers this diff should be ignored and my original diff preferred. When you configure quilt with --with-foo=/path/to/gnu/gfoo Quilt actually creates a compat/ directory and copies gfoo to compat/foo. Then the quilt wrapper (bin/quilt.in) adds compat/ to the front of PATH. So long story short, those uses of sed 's/.../i' are actually portable because sed is really gsed at run-time. Slightly misleading, but portable. :)
Re: UPDATE: devel/quilt
Blargh, mush-mouth! Sorry, been up since 3:00am because our furnace died... Anyhoo, what I wanted to say is: > Here is an updated patch with the portability improvments suggested by jca@. ... updated *diff* ... > I'm only patching quilt/mail.in at the moment because that was the only place > where I saw non-portable flags to the substitution command (but since I was > there I decided to patch all invocations anyways). Translation: I'm substituting every use of sed in quilt/main.in even though only one or two actually used the non-portable flags. > I'll send a larger diff upstream that actually fixes every invocation. Said diff will substitute every use of sed in every script.
Re: UPDATE: devel/quilt
On Mon, Dec 23, 2013 at 01:27:53PM -0600, Kent R. Spillner wrote:
> On Mon, Dec 23, 2013 at 06:57:25PM +0100, Jérémie Courrèges-Anglas wrote:
> > If you want to improve this port, though, there are portability problems
> > that could be fixed. I noticed a few sed s/.../.../iasdf flags that
> > don't work with our sed. This could be dealt with patching the scritps
> > to use @SED@ and amending the % :: %.in rule in Makefile.in.
>
> Thanks for pointing that out. I'll looking into fixing those portability
> issues.
Here is an updated patch with the portability improvments suggested by jca@.
I'm only patching quilt/mail.in at the moment because that was the only place
where I saw non-portable flags to the substitution command (but since I was
there I decided to patch all invocations anyways). I'll send a larger diff
upstream that actually fixes every invocation.
Still only tested on amd64.
Index: Makefile
===
RCS file: /work/cvsroot/ports/devel/quilt/Makefile,v
retrieving revision 1.4
diff -p -u -r1.4 Makefile
--- Makefile31 Aug 2013 17:22:16 - 1.4
+++ Makefile14 Dec 2013 04:11:46 -
@@ -2,11 +2,11 @@
COMMENT= manage large numbers of patches
-DISTNAME= quilt-0.60
-REVISION= 1
+DISTNAME= quilt-0.61
CATEGORIES=devel
HOMEPAGE= http://savannah.nongnu.org/projects/quilt/
+MAINTAINER=Kent R. Spillner
# GPLv3+
PERMIT_PACKAGE_CDROM= Yes
Index: distinfo
===
RCS file: /work/cvsroot/ports/devel/quilt/distinfo,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 distinfo
--- distinfo8 Oct 2012 15:14:25 - 1.1.1.1
+++ distinfo14 Dec 2013 03:34:38 -
@@ -1,2 +1,2 @@
-SHA256 (quilt-0.60.tar.gz) = PXKikuQyvrmnP50Kz+OnfJtNfkIgmRm7JE6ZWMfP5ks=
-SIZE (quilt-0.60.tar.gz) = 442369
+SHA256 (quilt-0.61.tar.gz) = HuwKJwrE1B7qD9WCNgPJ0qNatrirc6kN2SzhKRsqn8M=
+SIZE (quilt-0.61.tar.gz) = 450552
Index: patches/patch-Makefile_in
===
RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 patch-Makefile_in
--- patches/patch-Makefile_in 8 Oct 2012 15:14:25 - 1.1.1.1
+++ patches/patch-Makefile_in 24 Dec 2013 12:45:07 -
@@ -1,6 +1,6 @@
-$OpenBSD: patch-Makefile_in,v 1.1.1.1 2012/10/08 15:14:25 rpe Exp $
Makefile.in.orig Sun Sep 2 19:19:00 2012
-+++ Makefile.inSun Sep 2 19:19:16 2012
+$OpenBSD$
+--- Makefile.in.orig Tue Dec 24 06:44:51 2013
Makefile.inTue Dec 24 06:43:04 2013
@@ -13,7 +13,7 @@ docdir :=@docdir@
mandir := @mandir@
localedir := $(datadir)/locale
@@ -10,3 +10,11 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 20
INSTALL :=@INSTALL@
POD2MAN :=@POD2MAN@
+@@ -256,6 +256,7 @@ $(patsubst %.in,%,$(wildcard bin/*.in quilt/*.in quilt
+ @$(SED) -e 's:@QUILT_DIR''@:$(datadir)/$(PACKAGE):g'\
+ -e 's:@PERL''@:$(PERL):g' \
+ -e 's:@BASH''@:$(BASH):g' \
++ -e 's:@SED''@:$(SED):g' \
+ -e 's:@PATCH''@:$(PATCH):g' \
+ -e 's:@STAT_HARDLINK''@:$(STAT_HARDLINK):g' \
+ -e 's:@VERSION''@:$(VERSION):g' \
Index: patches/patch-quilt_mail_in
===
RCS file: patches/patch-quilt_mail_in
diff -N patches/patch-quilt_mail_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-quilt_mail_in 24 Dec 2013 14:00:44 -
@@ -0,0 +1,111 @@
+$OpenBSD$
+--- quilt/mail.in.orig Sun Dec 8 14:39:50 2013
quilt/mail.in Tue Dec 24 08:00:32 2013
+@@ -6,6 +6,8 @@
+ #
+ # See the COPYING and AUTHORS files for more details.
+
++SED=@SED@
++
+ : ${EDITOR:=vi}
+
+ # Read in library functions
+@@ -146,7 +148,7 @@ process_mail()
+ else
+ local from_date=$(LC_ALL=POSIX date "+%a %b %e %H:%M:%S %Y")
+ echo "From $opt_sender_address $from_date"
+- sed -e 's/^From />From /' $tmpfile
++ $SED -e 's/^From />From /' $tmpfile
+ echo
+ fi
+ rm -f $tmpfile
+@@ -305,7 +307,7 @@ Could not determine the envelope sender address. Pleas
+ ;;
+ esac
+ fi
+-opt_sender_address=$(echo "$opt_sender" | sed -re 's:.*<([^<>]+)>.*:\1:')
++opt_sender_address=$(echo "$opt_sender" | $SED -re 's:.*<(
Re: UPDATE: devel/quilt
On Mon, Dec 23, 2013 at 06:57:25PM +0100, Jérémie Courrèges-Anglas wrote: > If you want to improve this port, though, there are portability problems > that could be fixed. I noticed a few sed s/.../.../iasdf flags that > don't work with our sed. This could be dealt with patching the scritps > to use @SED@ and amending the % :: %.in rule in Makefile.in. Thanks for pointing that out. I'll looking into fixing those portability issues.
Re: UPDATE: devel/quilt
Ping.
On Fri, Dec 13, 2013 at 10:19:34PM -0600, Kent R. Spillner wrote:
> Update to quilt v0.61 and take maintainer. I passed the
> remove-trailing-whitespace test diff upstream.
>
> Tested on amd64.
>
> Index: Makefile
> ===
> RCS file: /work/cvsroot/ports/devel/quilt/Makefile,v
> retrieving revision 1.4
> diff -p -u -r1.4 Makefile
> --- Makefile 31 Aug 2013 17:22:16 - 1.4
> +++ Makefile 14 Dec 2013 04:11:46 -
> @@ -2,11 +2,11 @@
>
> COMMENT= manage large numbers of patches
>
> -DISTNAME=quilt-0.60
> -REVISION=1
> +DISTNAME=quilt-0.61
> CATEGORIES= devel
>
> HOMEPAGE=http://savannah.nongnu.org/projects/quilt/
> +MAINTAINER= Kent R. Spillner
>
> # GPLv3+
> PERMIT_PACKAGE_CDROM=Yes
> Index: distinfo
> ===
> RCS file: /work/cvsroot/ports/devel/quilt/distinfo,v
> retrieving revision 1.1.1.1
> diff -p -u -r1.1.1.1 distinfo
> --- distinfo 8 Oct 2012 15:14:25 - 1.1.1.1
> +++ distinfo 14 Dec 2013 03:34:38 -
> @@ -1,2 +1,2 @@
> -SHA256 (quilt-0.60.tar.gz) = PXKikuQyvrmnP50Kz+OnfJtNfkIgmRm7JE6ZWMfP5ks=
> -SIZE (quilt-0.60.tar.gz) = 442369
> +SHA256 (quilt-0.61.tar.gz) = HuwKJwrE1B7qD9WCNgPJ0qNatrirc6kN2SzhKRsqn8M=
> +SIZE (quilt-0.61.tar.gz) = 450552
> Index: patches/patch-test_delete_test
> ===
> RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-test_delete_test,v
> retrieving revision 1.1.1.1
> diff -p -u -r1.1.1.1 patch-test_delete_test
> --- patches/patch-test_delete_test8 Oct 2012 15:14:25 - 1.1.1.1
> +++ patches/patch-test_delete_test13 Dec 2013 23:56:08 -
> @@ -1,17 +1,17 @@
> $OpenBSD: patch-test_delete_test,v 1.1.1.1 2012/10/08 15:14:25 rpe Exp $
> test/delete.test.origSun Sep 2 21:40:18 2012
> -+++ test/delete.test Sun Sep 2 21:40:26 2012
> +--- test/delete.test.origSun Dec 8 03:40:42 2013
> test/delete.test Fri Dec 13 17:55:39 2013
> @@ -1,3 +1,4 @@
> -+# >~ find: `?\./dir'?: Permission denied
> ++# >~ .*find: [`']?\./dir'?: Permission denied
> Test the delete command.
>
> $ mkdir patches
> -@@ -77,7 +78,7 @@ Test the delete command.
> -
> +@@ -79,7 +80,7 @@ Test the delete command.
> + # running as root, but you shouldn't do that anyway.
> $ quilt delete "test3"
> > Removing patch %{P}test3
> -->~ find: `?\./dir'?: Permission denied
> -+> ${LOCALBASE}/bin/gfind: `./dir': Permission denied
> +->~ .*find: [`']?\./dir'?: Permission denied
> ++>~ /usr/local/bin/gfind: [`']?\./dir'?: Permission denied
>
> $ chmod a+rx .pc/test3/dir
>
> Index: patches/patch-test_remove-trailing-ws_test
> ===
> RCS file: patches/patch-test_remove-trailing-ws_test
> diff -N patches/patch-test_remove-trailing-ws_test
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-test_remove-trailing-ws_test14 Dec 2013 03:15:03
> -
> @@ -0,0 +1,63 @@
> +$OpenBSD$
> +--- test/remove-trailing-ws.test.origFri Dec 13 17:38:41 2013
> test/remove-trailing-ws.test Fri Dec 13 17:50:26 2013
> +@@ -134,21 +134,21 @@ $ %{QUILT_DIR}/scripts/remove-trailing-ws < unified.di
> + > Removing trailing whitespace from lines 12,16 of files/complex
> + > Removing trailing whitespace from lines 1,2,3 of files/create
> + $ wc -l files/add
> +-> 8 files/add
> ++>~ (\s+)?8 files/add
> + $ wc -l files/change
> +-> 3 files/change
> ++>~ (\s+)?3 files/change
> + $ wc -l files/complex
> +-> 21 files/complex
> ++>~ (\s+)?21 files/complex
> + $ wc -l files/create
> +-> 3 files/create
> ++>~ (\s+)?3 files/create
> + $ wc -l files/remove
> +-> 6 files/remove
> ++>~ (\s+)?6 files/remove
> + $ wc -l files/remove-at-end
> +-> 8 files/remove-at-end
> ++>~ (\s+)?8 files/remove-at-end
> + $ wc -l unified.diff
> +-> 85 unified.diff
> ++>~ (\s+)?85 unified.diff
> + $ wc -l unified-wsok.diff
> +-> 85 unified-wsok.diff
> ++>~ (\s+)?85 unified-wsok.diff
> + $ diff -u unified.diff unified-wsok.diff | grep '^++[^+]'
> + > ++Line 4
> + > ++to
> +@@ -167,21 +167,21 @@ $ %{QUILT_DIR}/scripts/remove-trailing-ws < context.di
> + > Removing trailing whitespace from lines 12,16 of files/complex
> + > Removing trailing whitespace from lines 1,2,3 of files/create
>
UPDATE: devel/quilt
Update to quilt v0.61 and take maintainer. I passed the
remove-trailing-whitespace test diff upstream.
Tested on amd64.
Index: Makefile
===
RCS file: /work/cvsroot/ports/devel/quilt/Makefile,v
retrieving revision 1.4
diff -p -u -r1.4 Makefile
--- Makefile31 Aug 2013 17:22:16 - 1.4
+++ Makefile14 Dec 2013 04:11:46 -
@@ -2,11 +2,11 @@
COMMENT= manage large numbers of patches
-DISTNAME= quilt-0.60
-REVISION= 1
+DISTNAME= quilt-0.61
CATEGORIES=devel
HOMEPAGE= http://savannah.nongnu.org/projects/quilt/
+MAINTAINER=Kent R. Spillner
# GPLv3+
PERMIT_PACKAGE_CDROM= Yes
Index: distinfo
===
RCS file: /work/cvsroot/ports/devel/quilt/distinfo,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 distinfo
--- distinfo8 Oct 2012 15:14:25 - 1.1.1.1
+++ distinfo14 Dec 2013 03:34:38 -
@@ -1,2 +1,2 @@
-SHA256 (quilt-0.60.tar.gz) = PXKikuQyvrmnP50Kz+OnfJtNfkIgmRm7JE6ZWMfP5ks=
-SIZE (quilt-0.60.tar.gz) = 442369
+SHA256 (quilt-0.61.tar.gz) = HuwKJwrE1B7qD9WCNgPJ0qNatrirc6kN2SzhKRsqn8M=
+SIZE (quilt-0.61.tar.gz) = 450552
Index: patches/patch-test_delete_test
===
RCS file: /work/cvsroot/ports/devel/quilt/patches/patch-test_delete_test,v
retrieving revision 1.1.1.1
diff -p -u -r1.1.1.1 patch-test_delete_test
--- patches/patch-test_delete_test 8 Oct 2012 15:14:25 - 1.1.1.1
+++ patches/patch-test_delete_test 13 Dec 2013 23:56:08 -
@@ -1,17 +1,17 @@
$OpenBSD: patch-test_delete_test,v 1.1.1.1 2012/10/08 15:14:25 rpe Exp $
test/delete.test.orig Sun Sep 2 21:40:18 2012
-+++ test/delete.test Sun Sep 2 21:40:26 2012
+--- test/delete.test.orig Sun Dec 8 03:40:42 2013
test/delete.test Fri Dec 13 17:55:39 2013
@@ -1,3 +1,4 @@
-+# >~ find: `?\./dir'?: Permission denied
++# >~ .*find: [`']?\./dir'?: Permission denied
Test the delete command.
$ mkdir patches
-@@ -77,7 +78,7 @@ Test the delete command.
-
+@@ -79,7 +80,7 @@ Test the delete command.
+ # running as root, but you shouldn't do that anyway.
$ quilt delete "test3"
> Removing patch %{P}test3
-- >~ find: `?\./dir'?: Permission denied
-+ > ${LOCALBASE}/bin/gfind: `./dir': Permission denied
+- >~ .*find: [`']?\./dir'?: Permission denied
++ >~ /usr/local/bin/gfind: [`']?\./dir'?: Permission denied
$ chmod a+rx .pc/test3/dir
Index: patches/patch-test_remove-trailing-ws_test
===
RCS file: patches/patch-test_remove-trailing-ws_test
diff -N patches/patch-test_remove-trailing-ws_test
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-test_remove-trailing-ws_test 14 Dec 2013 03:15:03 -
@@ -0,0 +1,63 @@
+$OpenBSD$
+--- test/remove-trailing-ws.test.orig Fri Dec 13 17:38:41 2013
test/remove-trailing-ws.test Fri Dec 13 17:50:26 2013
+@@ -134,21 +134,21 @@ $ %{QUILT_DIR}/scripts/remove-trailing-ws < unified.di
+ > Removing trailing whitespace from lines 12,16 of files/complex
+ > Removing trailing whitespace from lines 1,2,3 of files/create
+ $ wc -l files/add
+-> 8 files/add
++>~ (\s+)?8 files/add
+ $ wc -l files/change
+-> 3 files/change
++>~ (\s+)?3 files/change
+ $ wc -l files/complex
+-> 21 files/complex
++>~ (\s+)?21 files/complex
+ $ wc -l files/create
+-> 3 files/create
++>~ (\s+)?3 files/create
+ $ wc -l files/remove
+-> 6 files/remove
++>~ (\s+)?6 files/remove
+ $ wc -l files/remove-at-end
+-> 8 files/remove-at-end
++>~ (\s+)?8 files/remove-at-end
+ $ wc -l unified.diff
+-> 85 unified.diff
++>~ (\s+)?85 unified.diff
+ $ wc -l unified-wsok.diff
+-> 85 unified-wsok.diff
++>~ (\s+)?85 unified-wsok.diff
+ $ diff -u unified.diff unified-wsok.diff | grep '^++[^+]'
+ > ++Line 4
+ > ++to
+@@ -167,21 +167,21 @@ $ %{QUILT_DIR}/scripts/remove-trailing-ws < context.di
+ > Removing trailing whitespace from lines 12,16 of files/complex
+ > Removing trailing whitespace from lines 1,2,3 of files/create
+ $ wc -l files/add
+-> 8 files/add
++>~ (\s+)?8 files/add
+ $ wc -l files/change
+-> 3 files/change
++>~ (\s+)?3 files/change
+ $ wc -l files/complex
+-> 21 files/complex
++>~ (\s+)?21 files/complex
+ $ wc -l files/create
+-> 3 files/create
++>~ (\s+)?3 files/create
+ $ wc -l files/remove
+-> 6 files/remove
++>~ (\s+)?6 files/remove
+ $ wc -l files/remove-at-end
+-> 8 files/remove-at-end
++>~ (\s+)?8 files/remove-at-end
+ $ wc -l context.diff
+-> 104 context.diff
++>~ (\s+)?104 context.diff
+ $ wc -l context-wsok.diff
+-> 104 context-wsok.diff
++>~ (\s+)?104 context-wsok.diff
+ $ diff -u context.diff context-wsok.diff | grep '^+[+!] '
+ > ++ Line 4
+ > ++ create
Re: new: x11/yeahconsole
> License is GPLv2+ > > You can eliminate the a lot of patch-Makefile with a well-crafted > MAKE_FLAGS line in the port Makefile. You definitely don't need to > change INSTALL or PREFIX (you're using your own do-install routine > anyway). CC, FLAGS, INCLUDES, and LIB_DIRS could (read: should) all be > put under MAKE_FLAGS in the port Makefile (and therefore not be touched > in patch-Makefile). > > WRKBUILD->WRKSRC in the first line of the do-install routine. Attached is an updated version. Thanks again for your feedback! yeahconsole.tar.gz Description: application/gzip
Re: new: x11/yeahconsole
On Mon, Oct 28, 2013 at 11:04:41PM -0500, Kent R. Spillner wrote: > Attached is an updated version based on feedback from bcallah@ and > sthen@ for my productivity/vit submission: > > * Tidied up Makefile > * Removed pkg/README > * Rolled own do-install target instead of patching install: (also, > install README in /usr/local/share/doc/yeahconsole/ while here) Bump. yeahconsole.tar.gz Description: Binary data
Re: new: productivity/vit
Attached is another update based on your feedback:
> Just some nitpicks:
>
> Not quite with the @sample.
> vit-commands is supposed to live in /etc, right?
Yeah, I completely messed that up, but I don't think that file belongs in /etc
or /usr/local/etc. It is only used for the help display inside vit; it's not
actually a configuration file (e.g. changing the keys assigned to functions
doesn't actually change the keymappings in vit).
In this version I install commands to ${PREFIX}/share/vit/commands, and added a
patch for vit.pl to look there when the user enters :help. I'm not @sample'ing
it because there's really no point in users editing it. Whaddya think?
> While it's not wrong, I think I'd prefer the first line of the
> do-install use WRKSRC instead of WRKBUILD; for consistency if nothing else.
Done.
> Besides that, it looks good to me and seems to work from my (admittedly
> light) testing - caveat from your first mail heeded - perhaps that
> should be added to the README if not resolved in a timely manner.
Done; I added a patch to README, which is installed to
$PREFIX/share/doc/vit/README.
vit.tar.gz
Description: application/gzip
Re: new: productivity/vit
> yes, pkg/README is not a place to copy upstream's README (maybe it makes sense > to install that into /usr/local/share/doc/vit via post-install/do-install) > it's for OpenBSD-specific information and should be based on the template > in ports/infrastructure/templates/README.template. Attached is a new version incorporating Brian's feedback. After reviewing the README I decided the "features list" doesn't add much, so I decided not to roll it into pkg/DESCR. I am installing it into /usr/local/share/doc/vit, though. vit.tar.gz Description: application/gzip
Re: new: x11/yeahconsole
Attached is an updated version based on feedback from bcallah@ and sthen@ for my productivity/vit submission: * Tidied up Makefile * Removed pkg/README * Rolled own do-install target instead of patching install: (also, install README in /usr/local/share/doc/yeahconsole/ while here) yeahconsole.tar.gz Description: application/gzip
new: productivity/vit
Attached is a tarball for productivity/vit; extract in /usr/ports/productivity. Vit is an ncurses front-end to taskwarrior with vi keybindings. HOMEPAGE = http://taskwarrior.org/projects/1/wiki/Vit Tested on amd64. If you get a blank screen when running, exit (ZZ or CTRL-C) and create a new task (task add Hello world). I'll work with upstream to ensure future releases handle an initial empty task database more gracefully. vit.tar.gz Description: application/gzip
new: x11/yeahconsole
Attached is a tarball for x11/yeahconsole; extract in /usr/ports/x11. YeahConsole wraps xterm to create a drop-down console, like in Quake. HOMEPAGE = http://phrat.de/yeahtools.html Tested on amd64. yeahconsole.tar.gz Description: application/gzip
Re: Parallel cmake (diff to review)
Hey, dude- > Our make passes -j through MAKEFLAGS. > > The way it handles recursive invocation is documented. Read the end of > make(1): Thanks for the cluestick! I apologize for not seeing that paragraph earlier. I'm corresponding with Amit privately to try and track down the root cause. Best, Kent
Re: using cmake in parallel builds, Re: Parallel cmake (diff to review)
Hey, dude- On Dec 12, 2012, at 9:30, Marc Espie wrote: > Anyways, there are TWO distinct points: > - problems with make -j. > - cmake not writing correct makefiles for parallel building without gmake. The second one is the problem here. CMake doesn't do anything special for parallel builds, it just leans on gmake's environment variable fu for parallel job control. > (besides that, it might be a good idea to have a generator > that caters a bit more to our make, specifically, include subfile is now > part of posix. I think that's the right way to fix this problem. Best, Kent
Re: Parallel cmake (diff to review)
Hey, dude- On Dec 12, 2012, at 7:51, David Coppa wrote: > Thanks. > I'll wait for useful pointers... I don't think CMake does anything specifically to handle parallel recursive builds. It works with GNU make because when invoked with -jX the top level gmake sets some environment variables (it adds -j to MAKEFLAGS, but i think it uses some others for job control, too) so sub-makes pick that up in parallel builds and CMake doesn't need to explicitly write -j$((X - 1)) in targets invoking sub-makes. How does our make handle parallel job control between recursive invocations? Best, Kent
Re: [PATCH] x11/nitrogen: enable Xinerama
Hey, dude- > x11/nitrogen has --disable-xinerama in the configure args. This > is presumably because the build failed without it, not fixing the > real issue. The attached patch simply removes the configure flag > and adds /usr/X11R6/lib to the LDFLAGS to make configure's Xinerama > test compile and work. Why does nitrogen need the extra hint to find Xinerama but not X11? Best, Kent
[PATCH] fix path in www/firefox35/pkg/MESSAGE
Howdy, all-
This patch corrects the path to README.OpenBSD in www/firefox35/pkg/MESSAGE
Best,
Kent
Index: pkg/MESSAGE
===
RCS file: /cvs/ports/www/firefox35/pkg/MESSAGE,v
retrieving revision 1.1.1.1
diff -u pkg/MESSAGE
--- pkg/MESSAGE 21 Jun 2009 01:31:26 - 1.1.1.1
+++ pkg/MESSAGE 24 Dec 2009 01:37:47 -
@@ -1,2 +1,2 @@
-Please see ${PREFIX}/mozilla-firefox/README.OpenBSD for information
-about running Firefox on OpenBSD.
+Please see ${PREFIX}/firefox35/README.OpenBSD for information about running
+Firefox on OpenBSD.
