update mail/rss2email to 3.13.1
Hello ports@,
This is an update for mail/rss2email to 3.13.1. Changelog here:
https://github.com/rss2email/rss2email/blob/master/CHANGELOG
One of the changes is switching to feedparser 6, which makes some
breaking changes. As I recently discovered, there are still some ports
depending on the Python 2 support, which was dropped in feedparser 6:
https://marc.info/?l=openbsd-ports=162426699521483=2, so upgrading
feedparser is somewhat blocked until we get rid of or upgrade the
ports depending on Python 2 feedparser.
Luckily it's not too hard to patch rss2email to support feedparser 5,
see the patch below. Also includes a change to do-test to pick up some
new tests.
I'll try to make some changes upstream to keep rss2email feedparser 5/6
compatible, so we won't need this patch at some point.
diff --git mail/rss2email/Makefile mail/rss2email/Makefile
index 0df852869d0..ea4308b1618 100644
--- mail/rss2email/Makefile
+++ mail/rss2email/Makefile
@@ -2,7 +2,7 @@
COMMENT = convert RSS/Atom newsfeeds to email
-MODPY_EGG_VERSION = 3.12.1
+MODPY_EGG_VERSION = 3.13.1
DISTNAME = rss2email-${MODPY_EGG_VERSION}
CATEGORIES = mail www
@@ -23,6 +23,6 @@ post-install:
${INSTALL_MAN} ${WRKSRC}/r2e.1 ${PREFIX}/man/man1/
do-test:
- cd ${WRKSRC} && env PYTHONPATH=. ${MODPY_BIN} test/test.py
+ cd ${WRKSRC}/test && env PYTHONPATH=. ${MODPY_BIN} -m unittest
.include
diff --git mail/rss2email/distinfo mail/rss2email/distinfo
index 21ccd7c800a..7644c8993c6 100644
--- mail/rss2email/distinfo
+++ mail/rss2email/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rss2email-3.12.1.tar.gz) = gGL9XSOQDu4/03N9yYr/NnPoYGrG+MQd7YbmMOCKF38=
-SIZE (rss2email-3.12.1.tar.gz) = 82342
+SHA256 (rss2email-3.13.1.tar.gz) = OZRER2aHS7Ncn4htp287JL4ct7uvQPrRKxbyr4CsEpY=
+SIZE (rss2email-3.13.1.tar.gz) = 164683
diff --git mail/rss2email/patches/patch-rss2email_feed_py
mail/rss2email/patches/patch-rss2email_feed_py
new file mode 100644
index 000..436d8c773f4
--- /dev/null
+++ mail/rss2email/patches/patch-rss2email_feed_py
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Maintain compatibility with feedparser 5, which doesn't have the
feedparser.http module.
+
+Index: rss2email/feed.py
+--- rss2email/feed.py.orig
rss2email/feed.py
+@@ -445,7 +445,7 @@ class Feed (object):
+ elif isinstance(exc, _SOCKET_ERRORS):
+ _LOG.error('{}: {}'.format(exc, self))
+ warned = True
+-elif isinstance(exc, _feedparser.http.zlib.error):
++elif isinstance(exc, _feedparser.zlib.error):
+ _LOG.error('broken compression: {}'.format(self))
+ warned = True
+ elif isinstance(exc, (IOError, AttributeError)):
feedparser 6 drops Python 2 support, what to do?
Hello ports@,
I was looking at upgrading mail/rss2email to 3.13.1, but this would
require textproc/py-feedparser to be upgraded to version 6, due to
rss2email relying on some changes made in version 6.
The problem is that feedparser 6 makes several breaking changes,
including completely dropping Python 2 support.
Dropping Python 2 support is probably not a big deal for most ports
(except perhaps www/canto, which I notice has "MODPY_VERSION =
${MODPY_DEFAULT_VERSION_2}").
If a package drops support for Python 2 and another package needs it,
how do we deal with that? Just remove the old package? Port the
package to Python 3 and send patches to the authors? That last one
seems not so trivial.
--
Kaashif Hymabaccus
GPG: 3E810B04
UPDATE: plan9/9menu 1.9 to 1.10
Hello ports@, Very small update to 9menu, fixes a bug, changes things to use stdbool.h. https://github.com/arnoldrobbins/9menu/compare/9menu-release-1.9...9menu-release-1.10 if you're interested in the extremely minor changes. diff --git plan9/9menu/Makefile plan9/9menu/Makefile index 0ce722489fe..994769bfc7a 100644 --- plan9/9menu/Makefile +++ plan9/9menu/Makefile @@ -2,9 +2,8 @@ COMMENT= simple menu patterned after plan9 -DISTNAME= 9menu-1.9 +DISTNAME= 9menu-1.10 CATEGORIES=plan9 -REVISION= 0 MAINTAINER=Kaashif Hymabaccus diff --git plan9/9menu/distinfo plan9/9menu/distinfo index 43c734d0f96..8ee3dfb14ac 100644 --- plan9/9menu/distinfo +++ plan9/9menu/distinfo @@ -1,2 +1,2 @@ -SHA256 (9menu-1.9.shar.gz) = rI6lUZFEi4u4X7OBTbN5bzsEofuitpDqOIeazhy/1Vk= -SIZE (9menu-1.9.shar.gz) = 9233 +SHA256 (9menu-1.10.shar.gz) = IduDb7AvNobDMjPFtMCTdvz2lLc28Cl0Nvl98Tc1isI= +SIZE (9menu-1.10.shar.gz) = 9305
UPDATE: mail/rss2email 3.10 -> 3.11
Hi
This is a minor update, there's a new config key user-agent so you can
change the user agent mail is sent with (maybe useful if you want to
filter mail based on this).
diff --git mail/rss2email/Makefile mail/rss2email/Makefile
index 23f7f8100c3..854523ee9e8 100644
--- mail/rss2email/Makefile
+++ mail/rss2email/Makefile
@@ -2,7 +2,7 @@
COMMENT = convert RSS/Atom newsfeeds to email
-MODPY_EGG_VERSION = 3.10
+MODPY_EGG_VERSION = 3.11
DISTNAME = rss2email-${MODPY_EGG_VERSION}
CATEGORIES = mail www
diff --git mail/rss2email/distinfo mail/rss2email/distinfo
index af444691c2c..36054400daa 100644
--- mail/rss2email/distinfo
+++ mail/rss2email/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rss2email-3.10.tar.gz) = AcZbUrEO+E/2ZJLU5157uJ4p1qfEmsm5v1XKhO9bT/o=
-SIZE (rss2email-3.10.tar.gz) = 65388
+SHA256 (rss2email-3.11.tar.gz) = NsO9snnMqKtkxk5BrwJdApY/sJ/4RTAkDqzCKi7VZe4=
+SIZE (rss2email-3.11.tar.gz) = 68020
Re: NEW: mail/rss2email3
On Thu, Sep 05, 2019 at 10:05:30AM +0100, Stuart Henderson wrote: > On 2019/09/01 19:20, Kaashif Hymabaccus wrote: > > Hi ports@, > > > > Here is the new release of rss2email. As before, it is a new port and > > not an update of rss2email since it is completely incompatible and I > > don't want to break users' perfectly fine configurations. > > Let's just cut across and tell people in release notes to save > their config first. 2.x will not be seeing any updates and it's a one > time change. I've put an @ask-update in pkg/PLIST so that people know > to save feeds, and will write something for faq/current.html (to copy > to OpenBSD upgrade notes) telling people what to do. > > Other changes compared to your version, remove HOMEPAGE (it's the default > for a MODPY_PI=Yes port), remove TEST_DEPENDS (RUN_DEPENDS is automatically > added, see "make show=TEST_DEPENDS"), rerun "make plist". > > OK? Thanks for the improvements to my update. While I would like this committed, I am actually especially interested in whether someone has a feed that breaks 3.10 in some way. I get the feeling that maybe some OpenBSD devs are regular users of rss2email 2.71 (sthen@, maybe jca@?), so they might have some nontrivial feeds to test the config migration to 3.10 and all of the other new stuff. Any testers (and bug reports, diffs) are welcome of course.
NEW: mail/rss2email3
Hi ports@, Here is the new release of rss2email. As before, it is a new port and not an update of rss2email since it is completely incompatible and I don't want to break users' perfectly fine configurations. Some concerns from last time have been addressed: Q: Is the new upstream (https://github.com/rss2email/rss2email) the canonical upstream? A: Yes, the old maintainer W. Trevor King has added the new maintainers to the PyPI package (https://pypi.org/project/rss2email/) and this is where we have released 3.10. Q: Why is "3" embedded in the port name? What happens when version 4 is released? A: As one of the maintainers of the project, I can personally guarantee version 4 will never be released. We will never break compatibility (big statement I know) and there will never be a major version bump. If there are better naming ideas, I am open to them. Q: Why would I use this instead of my already working rss2email-2.71 setup? A: We got all of the people who had forked rss2email under one roof and collected all of their previously bugfixes and new features. Like support for writing to maildir, working tests, some SSL fixes, some feed parsing fixes, etc. I think it works better than 3.9 (which is actually not even in ports, so maybe this is irrelevant). And not to mention, this is the only version with active maintainers who will respond to problems. Q: Does it work on the undeadly.org RSS feed? A: Yes! Or at least it does on my machine. The only issue I have is that "make test" hangs but if you manually go to WRKSRC and run the tests it works. Probably something to do with the fact the tests start a web server? I am really keen to get this in eventually since I've been using it for an extremely long time. Testing and suggestions are very welcome. -- Kaashif Hymabaccus GPG: 3E810B04 rss2email3.tgz Description: Binary data
fix games/xevil on sparc64
Hi
With this patch I can build and play xevil on sparc64. I don't
understand the intricacies of the C++ headers that allow defining
min/max macros to work on amd64 but not on sparc64. It doesn't matter
since we can just delete the macro min/max and use the STL one (not a
macro) and cast the types appropriately.
Still works on amd64 too.
diff --git games/xevil/Makefile games/xevil/Makefile
index 7aa1780b9e7..a93de58c013 100644
--- games/xevil/Makefile
+++ games/xevil/Makefile
@@ -9,7 +9,7 @@ COMMENT=side-view, fast-action, kill everything type of
game
V= 2.02r2
DISTNAME= xevilsrc${V}
PKGNAME= xevil-${V}
-REVISION = 7
+REVISION = 8
CATEGORIES=games
diff --git games/xevil/patches/patch-cmn_game_cpp
games/xevil/patches/patch-cmn_game_cpp
index fc02245f785..0d0d767fa2d 100644
--- games/xevil/patches/patch-cmn_game_cpp
+++ games/xevil/patches/patch-cmn_game_cpp
@@ -19,3 +19,21 @@ Index: cmn/game.cpp
#include "utils.h"
#include "coord.h"
+@@ -566,7 +567,7 @@ void GameObjects::level_reset(const Dim ,Game
+
+ // Don't allow objectWorldPercent values that are too small.
+ float objWPercent = (float)max(weapons[n]->objectWorldPercent,
+-OBJECT_WORLD_PERCENT_MIN);
++(float)OBJECT_WORLD_PERCENT_MIN);
+
+ maximums[weapons[n]->classId] = (int)ceil(areaFactor * objWPercent);
+ // A limit may be placed on how many times the object comes back
+@@ -579,7 +580,7 @@ void GameObjects::level_reset(const Dim ,Game
+ // Check not already set.
+ assert(maximums[oItems[n]->classId] == 0);
+ float objWPercent = (float)max(oItems[n]->objectWorldPercent,
+-OBJECT_WORLD_PERCENT_MIN);
++(float)OBJECT_WORLD_PERCENT_MIN);
+
+ maximums[oItems[n]->classId] = (int)ceil(areaFactor * objWPercent);
+ levelMaxTimes[oItems[n]->classId] = oItems[n]->levelMaxTimes;
diff --git games/xevil/patches/patch-cmn_utils_h
games/xevil/patches/patch-cmn_utils_h
index 934c82e8c92..920edbc1b9b 100644
--- games/xevil/patches/patch-cmn_utils_h
+++ games/xevil/patches/patch-cmn_utils_h
@@ -1,10 +1,26 @@
$OpenBSD: patch-cmn_utils_h,v 1.1 2017/05/02 23:26:32 espie Exp $
+Don't #define min and max, conflicts with STL non-macro definitions.
+
If you're going to wrap C++ functions, you need both const correct wrappers.
Index: cmn/utils.h
--- cmn/utils.h.orig
+++ cmn/utils.h
-@@ -237,13 +237,22 @@ class Utils {
+@@ -98,13 +98,6 @@ extern "C" {
+ #define MSEC_PER_CLOCK (1.0e3 / CLOCKS_PER_SEC)
+ #endif
+
+-#ifndef max
+-#define max(a,b) (ab ? b : a)
+-#endif
+-
+ #if X11
+ typedef char Boolean;
+ #endif
+@@ -237,13 +230,22 @@ class Utils {
/* EFFECTS: Wrapper for C library strcmp(). Return 0 if strings are the
same. */
Re: When will OpenBSD become a friendly place for bug reporters?
On Tue, Jul 09, 2019 at 12:12:49PM -, Stuart Henderson wrote: > [...] > > But done on a port-by-port opt-in basis for more important ports > (major libraries, for example) it might be viable. I think it would > need to use detached symbols in a subpackage - build with symbols, > then postprocess the various files, it looks like this might do the > trick > > objcopy --only-keep-debug $file $file.debug > objcopy --strip-debug $file > objcopy --add-gnu-debuglink $file.debug $file > > or > > llvm-objcopy --only-keep=debug $file $file.debug > llvm-objcopy --strip-debug $file > llvm-objcopy --add-gnu-debuglink $file.debug $file > > And then it needs additional infrastructure to handle putting these > into subpackages (which gets complicated where a port already uses > subpackages). As I understand it, this is essentially what Debian does. See https://wiki.debian.org/HowToGetABacktrace#Installing_the_debugging_symbols. Like you say, reproducing a crash and getting a backtrace is not always easy, having matching debug symbols in a package would be useful. Debian makes these packages automatically now (as you likely know), after a decade (!!!) of thinking and implementation: https://lists.debian.org/debian-devel/2015/12/msg00262.html. And decades of lots of people putting in the manual work to make -dbg packages. Since I'm not sending any diffs to implement this, and wouldn't even use the debug symbol packages, I'm not sure it would be worth the time for OpenBSD. > Unfortunately the tone of mazocomp's mail ather puts one off from > wanting to spend time on this... Maybe I need to polish my scorefile > as it only dropped the original mail not the replies :-) If demanding a feature rudely means devs won't implement it, maybe I should send a rude email demanding more bugs in OpenBSD :) -- Kaashif Hymabaccus GPG: 3E810B04
Re: NEW: comms/cutecom (Take 2)
On Sun, May 06, 2018 at 01:39:52PM -0400, Brian Callahan wrote: > Hi ports -- > > Trying to clear out my new ports queue. This was submitted back in August > but never committed. > Kaashif: do you still want to be MAINTAINER? > > CuteCom is a graphical serial terminal written in Qt5. > > --- > pkg/DESCR: > CuteCom is a graphical serial terminal written using Qt5, like minicom. > It is aimed mainly at hardware developers or other people who need a > terminal to talk to their devices. > --- > > OK? > > ~Brian > I do still want to be MAINTAINER, yes. -- Kaashif Hymabaccus GPG: 3E810B04
Re: NEW: mail/rss2email3
On Mon, Apr 30, 2018 at 05:51:31PM +0200, Solene Rapenne wrote:
>
> a TEST_DEPENDS is needed here
>
>
> A few changes are needed in pkg/PLIST too
>
> - remove share/doc/rss2email3/README, because the README from pkg/README
> will be automatically put there-> share/doc/pkg-readmes/${FULLPKGNAME}
> - ${MODPY_COMMENT} should be used for directories containing ${MODPY_PYCACHE}
Made these changes. Tarball attached.
--
Kaashif Hymabaccus
GPG: 3E810B04
rss2email3.tgz
Description: Binary data
Re: NEW: mail/rss2email3
On Tue, Jan 16, 2018 at 12:14:10AM +, Kaashif Hymabaccus wrote: > Ping with a new tarball. The distinfo in the previous one is wrong. > > -- > Kaashif Hymabaccus > GPG: 3E810B04 Anyone interested in this? Tarball attached. -- Kaashif Hymabaccus GPG: 3E810B04 rss2email3.tgz Description: Binary data
Re: UPDATE: graphics/farbfeld 3 -> 4
On Sat, Apr 28, 2018 at 03:11:08PM +0100, Stuart Henderson wrote:
> Please don't rely on the cc wrapper. It's a hack for certain situations.
> Also it's easier to verify that a port does the right thing if CC is
> passed correctly.
OK, here is a diff that leaves the CC stuff as it was, passed in
MAKE_ENV and config.mk is patched with ?= so it gets picked up.
diff --git Makefile Makefile
index 8d499d1ad33..7a0cc01f58c 100644
--- Makefile
+++ Makefile
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2017/10/23 21:39:20 bcallah Exp $
COMMENT = lossless, uncompressed graphics format
-DISTNAME = farbfeld-3
+DISTNAME = farbfeld-4
CATEGORIES = graphics converters
HOMEPAGE = https://tools.suckless.org/farbfeld
@@ -19,9 +19,16 @@ LIB_DEPENDS =graphics/png \
RUN_DEPENDS = graphics/ImageMagick
-USE_GMAKE =Yes
MAKE_ENV = CC="${CC}"
NO_TEST = Yes
+do-install:
+ ${INSTALL_PROGRAM} \
+ ${WRKBUILD}/{ff2jpg,ff2pam,ff2png,ff2ppm,jpg2ff,png2ff} \
+ ${PREFIX}/bin/
+ ${INSTALL_SCRIPT} ${WRKSRC}/2ff ${PREFIX}/bin/
+ ${INSTALL_MAN} ${WRKSRC}/*.1 ${PREFIX}/man/man1/
+ ${INSTALL_MAN} ${WRKSRC}/*.5 ${PREFIX}/man/man5/
+
.include
diff --git distinfo distinfo
index c632a202e9e..a5f2d6668be 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (farbfeld-3.tar.gz) = W5U7hqctP+rt9iaYUyyIiOX24vY2MZOkzIzuDjjDeK0=
-SIZE (farbfeld-3.tar.gz) = 10169
+SHA256 (farbfeld-4.tar.gz) = x99ZIe3RIcpdWxz2+wHkMK/5sxJCJi5PaQ069yzL5yo=
+SIZE (farbfeld-4.tar.gz) = 10340
diff --git patches/patch-Makefile patches/patch-Makefile
deleted file mode 100644
index c42275f1f20..000
--- patches/patch-Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2017/10/23 21:39:20 bcallah Exp $
-
-Index: Makefile
Makefile.orig
-+++ Makefile
-@@ -38,15 +38,12 @@ dist:
- rm -rf "farbfeld-$(VERSION)"
-
- install: all
-- mkdir -p "$(DESTDIR)$(PREFIX)/bin"
-- cp -f $(SCR) $(BIN) "$(DESTDIR)$(PREFIX)/bin"
-- for f in $(BIN) $(SCR); do chmod 755 "$(DESTDIR)$(PREFIX)/bin/$$f"; done
-- mkdir -p "$(DESTDIR)$(MANPREFIX)/man1"
-- cp -f $(MAN1) "$(DESTDIR)$(MANPREFIX)/man1"
-- for m in $(MAN1); do chmod 644 "$(DESTDIR)$(MANPREFIX)/man1/$$m"; done
-- mkdir -p "$(DESTDIR)$(MANPREFIX)/man5"
-- cp -f $(MAN5) "$(DESTDIR)$(MANPREFIX)/man5"
-- for m in $(MAN5); do chmod 644 "$(DESTDIR)$(MANPREFIX)/man5/$$m"; done
-+ ${BSD_INSTALL_PROGRAM_DIR} "$(PREFIX)/bin"
-+ ${BSD_INSTALL_PROGRAM} $(SCR) $(BIN) "$(PREFIX)/bin"
-+ ${BSD_INSTALL_MAN_DIR} "$(MANPREFIX)/man1"
-+ ${BSD_INSTALL_MAN} $(MAN1) "$(MANPREFIX)/man1"
-+ ${BSD_INSTALL_MAN_DIR} "$(MANPREFIX)/man5"
-+ ${BSD_INSTALL_MAN} $(MAN5) "$(MANPREFIX)/man5"
-
- uninstall:
- for f in $(BIN) $(SCR); do rm -f "$(DESTDIR)$(PREFIX)/bin/$$f"; done
diff --git patches/patch-config_mk patches/patch-config_mk
index b27e187cb51..b3bd00fb313 100644
--- patches/patch-config_mk
+++ patches/patch-config_mk
@@ -3,13 +3,7 @@ $OpenBSD: patch-config_mk,v 1.1.1.1 2017/10/23 21:39:20
bcallah Exp $
Index: config.mk
--- config.mk.orig
+++ config.mk
-@@ -4,15 +4,15 @@ VERSION = 3
- # Customize below to fit your system
-
- # paths
--PREFIX = /usr/local
-+PREFIX ?= /usr/local
- MANPREFIX = ${PREFIX}/man
+@@ -9,10 +9,10 @@ MANPREFIX = $(PREFIX)/share/man
# flags
CPPFLAGS = -D_DEFAULT_SOURCE
@@ -17,8 +11,8 @@ Index: config.mk
-LDFLAGS = -s
+CFLAGS += -std=c99 -pedantic -Wall -Wextra -I${LOCALBASE}/include
+LDFLAGS += -s -L${LOCALBASE}/lib
- PNG-LDFLAGS = -lpng
- JPG-LDFLAGS = -ljpeg
+ PNG-LDLIBS = -lpng
+ JPG-LDLIBS = -ljpeg
# compiler and linker
-CC = cc
Re: UPDATE: graphics/farbfeld 3 -> 4
On Sat, Apr 14, 2018 at 01:03:09AM +0200, Klemens Nanni wrote:
>
> [...]
>
> Now that you're rolling your own do-install, this hunk is obsolete.
>
> [...]
>
> CC is already passed in MAKE_ENV, this can go, too.
>
Addressed these comments. Also there was a hardcoded -Os in the CFLAGS
I patched out.
I took out passing CC in MAKE_ENV since the farbfeld makefile is set
to use "cc" in config.mk, which is already linked to the right
compiler so there's no need to fix it.
--
Kaashif Hymabaccus
GPG: 3E810B04
diff --git Makefile Makefile
index 8d499d1ad33..11e30505bbb 100644
--- Makefile
+++ Makefile
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2017/10/23 21:39:20 bcallah Exp $
COMMENT = lossless, uncompressed graphics format
-DISTNAME = farbfeld-3
+DISTNAME = farbfeld-4
CATEGORIES = graphics converters
HOMEPAGE = https://tools.suckless.org/farbfeld
@@ -19,9 +19,14 @@ LIB_DEPENDS =graphics/png \
RUN_DEPENDS = graphics/ImageMagick
-USE_GMAKE =Yes
-MAKE_ENV = CC="${CC}"
-
NO_TEST = Yes
+do-install:
+ ${INSTALL_PROGRAM} \
+ ${WRKBUILD}/{ff2jpg,ff2pam,ff2png,ff2ppm,jpg2ff,png2ff} \
+ ${PREFIX}/bin/
+ ${INSTALL_SCRIPT} ${WRKSRC}/2ff ${PREFIX}/bin/
+ ${INSTALL_MAN} ${WRKSRC}/*.1 ${PREFIX}/man/man1/
+ ${INSTALL_MAN} ${WRKSRC}/*.5 ${PREFIX}/man/man5/
+
.include
diff --git distinfo distinfo
index c632a202e9e..a5f2d6668be 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (farbfeld-3.tar.gz) = W5U7hqctP+rt9iaYUyyIiOX24vY2MZOkzIzuDjjDeK0=
-SIZE (farbfeld-3.tar.gz) = 10169
+SHA256 (farbfeld-4.tar.gz) = x99ZIe3RIcpdWxz2+wHkMK/5sxJCJi5PaQ069yzL5yo=
+SIZE (farbfeld-4.tar.gz) = 10340
diff --git patches/patch-Makefile patches/patch-Makefile
deleted file mode 100644
index c42275f1f20..000
--- patches/patch-Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2017/10/23 21:39:20 bcallah Exp $
-
-Index: Makefile
Makefile.orig
-+++ Makefile
-@@ -38,15 +38,12 @@ dist:
- rm -rf "farbfeld-$(VERSION)"
-
- install: all
-- mkdir -p "$(DESTDIR)$(PREFIX)/bin"
-- cp -f $(SCR) $(BIN) "$(DESTDIR)$(PREFIX)/bin"
-- for f in $(BIN) $(SCR); do chmod 755 "$(DESTDIR)$(PREFIX)/bin/$$f"; done
-- mkdir -p "$(DESTDIR)$(MANPREFIX)/man1"
-- cp -f $(MAN1) "$(DESTDIR)$(MANPREFIX)/man1"
-- for m in $(MAN1); do chmod 644 "$(DESTDIR)$(MANPREFIX)/man1/$$m"; done
-- mkdir -p "$(DESTDIR)$(MANPREFIX)/man5"
-- cp -f $(MAN5) "$(DESTDIR)$(MANPREFIX)/man5"
-- for m in $(MAN5); do chmod 644 "$(DESTDIR)$(MANPREFIX)/man5/$$m"; done
-+ ${BSD_INSTALL_PROGRAM_DIR} "$(PREFIX)/bin"
-+ ${BSD_INSTALL_PROGRAM} $(SCR) $(BIN) "$(PREFIX)/bin"
-+ ${BSD_INSTALL_MAN_DIR} "$(MANPREFIX)/man1"
-+ ${BSD_INSTALL_MAN} $(MAN1) "$(MANPREFIX)/man1"
-+ ${BSD_INSTALL_MAN_DIR} "$(MANPREFIX)/man5"
-+ ${BSD_INSTALL_MAN} $(MAN5) "$(MANPREFIX)/man5"
-
- uninstall:
- for f in $(BIN) $(SCR); do rm -f "$(DESTDIR)$(PREFIX)/bin/$$f"; done
diff --git patches/patch-config_mk patches/patch-config_mk
index b27e187cb51..d3cac2b452f 100644
--- patches/patch-config_mk
+++ patches/patch-config_mk
@@ -3,13 +3,7 @@ $OpenBSD: patch-config_mk,v 1.1.1.1 2017/10/23 21:39:20
bcallah Exp $
Index: config.mk
--- config.mk.orig
+++ config.mk
-@@ -4,15 +4,15 @@ VERSION = 3
- # Customize below to fit your system
-
- # paths
--PREFIX = /usr/local
-+PREFIX ?= /usr/local
- MANPREFIX = ${PREFIX}/man
+@@ -9,8 +9,8 @@ MANPREFIX = $(PREFIX)/share/man
# flags
CPPFLAGS = -D_DEFAULT_SOURCE
@@ -17,9 +11,6 @@ Index: config.mk
-LDFLAGS = -s
+CFLAGS += -std=c99 -pedantic -Wall -Wextra -I${LOCALBASE}/include
+LDFLAGS += -s -L${LOCALBASE}/lib
- PNG-LDFLAGS = -lpng
- JPG-LDFLAGS = -ljpeg
+ PNG-LDLIBS = -lpng
+ JPG-LDLIBS = -ljpeg
- # compiler and linker
--CC = cc
-+CC ?= cc
Re: UPDATE: graphics/farbfeld 3 -> 4
On Thu, Apr 12, 2018 at 10:23:56AM +0200, Klemens Nanni wrote:
> On Thu, Apr 12, 2018 at 01:52:48AM +0100, Kaashif Hymabaccus wrote:
> > This is an update to graphics/farbfeld. The main change to the port is
> > that USE_GMAKE isn't needed any more.
> >
> > Works fine for me on amd64 (converted some images to ff and back,
> > still seems to work).
> Can you provide a simple do-install and drop patch-Makefile instead?
> This was recently done for x11/{dmenu,st} as well. This would be
> reasonably simpler and keep suckless ports somewhat consistent across
> the tree.
Thanks for the suggestion, the updated diff is below.
--
Kaashif Hymabaccus
GPG: 3E810B04
diff --git Makefile Makefile
index 8d499d1ad33..7a0cc01f58c 100644
--- Makefile
+++ Makefile
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2017/10/23 21:39:20 bcallah Exp $
COMMENT = lossless, uncompressed graphics format
-DISTNAME = farbfeld-3
+DISTNAME = farbfeld-4
CATEGORIES = graphics converters
HOMEPAGE = https://tools.suckless.org/farbfeld
@@ -19,9 +19,16 @@ LIB_DEPENDS =graphics/png \
RUN_DEPENDS = graphics/ImageMagick
-USE_GMAKE =Yes
MAKE_ENV = CC="${CC}"
NO_TEST = Yes
+do-install:
+ ${INSTALL_PROGRAM} \
+ ${WRKBUILD}/{ff2jpg,ff2pam,ff2png,ff2ppm,jpg2ff,png2ff} \
+ ${PREFIX}/bin/
+ ${INSTALL_SCRIPT} ${WRKSRC}/2ff ${PREFIX}/bin/
+ ${INSTALL_MAN} ${WRKSRC}/*.1 ${PREFIX}/man/man1/
+ ${INSTALL_MAN} ${WRKSRC}/*.5 ${PREFIX}/man/man5/
+
.include
diff --git distinfo distinfo
index c632a202e9e..a5f2d6668be 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (farbfeld-3.tar.gz) = W5U7hqctP+rt9iaYUyyIiOX24vY2MZOkzIzuDjjDeK0=
-SIZE (farbfeld-3.tar.gz) = 10169
+SHA256 (farbfeld-4.tar.gz) = x99ZIe3RIcpdWxz2+wHkMK/5sxJCJi5PaQ069yzL5yo=
+SIZE (farbfeld-4.tar.gz) = 10340
diff --git patches/patch-Makefile patches/patch-Makefile
deleted file mode 100644
index c42275f1f20..000
--- patches/patch-Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2017/10/23 21:39:20 bcallah Exp $
-
-Index: Makefile
Makefile.orig
-+++ Makefile
-@@ -38,15 +38,12 @@ dist:
- rm -rf "farbfeld-$(VERSION)"
-
- install: all
-- mkdir -p "$(DESTDIR)$(PREFIX)/bin"
-- cp -f $(SCR) $(BIN) "$(DESTDIR)$(PREFIX)/bin"
-- for f in $(BIN) $(SCR); do chmod 755 "$(DESTDIR)$(PREFIX)/bin/$$f"; done
-- mkdir -p "$(DESTDIR)$(MANPREFIX)/man1"
-- cp -f $(MAN1) "$(DESTDIR)$(MANPREFIX)/man1"
-- for m in $(MAN1); do chmod 644 "$(DESTDIR)$(MANPREFIX)/man1/$$m"; done
-- mkdir -p "$(DESTDIR)$(MANPREFIX)/man5"
-- cp -f $(MAN5) "$(DESTDIR)$(MANPREFIX)/man5"
-- for m in $(MAN5); do chmod 644 "$(DESTDIR)$(MANPREFIX)/man5/$$m"; done
-+ ${BSD_INSTALL_PROGRAM_DIR} "$(PREFIX)/bin"
-+ ${BSD_INSTALL_PROGRAM} $(SCR) $(BIN) "$(PREFIX)/bin"
-+ ${BSD_INSTALL_MAN_DIR} "$(MANPREFIX)/man1"
-+ ${BSD_INSTALL_MAN} $(MAN1) "$(MANPREFIX)/man1"
-+ ${BSD_INSTALL_MAN_DIR} "$(MANPREFIX)/man5"
-+ ${BSD_INSTALL_MAN} $(MAN5) "$(MANPREFIX)/man5"
-
- uninstall:
- for f in $(BIN) $(SCR); do rm -f "$(DESTDIR)$(PREFIX)/bin/$$f"; done
diff --git patches/patch-config_mk patches/patch-config_mk
index b27e187cb51..f660d82096f 100644
--- patches/patch-config_mk
+++ patches/patch-config_mk
@@ -3,13 +3,14 @@ $OpenBSD: patch-config_mk,v 1.1.1.1 2017/10/23 21:39:20
bcallah Exp $
Index: config.mk
--- config.mk.orig
+++ config.mk
-@@ -4,15 +4,15 @@ VERSION = 3
+@@ -4,15 +4,15 @@ VERSION = 4
# Customize below to fit your system
# paths
-PREFIX = /usr/local
+-MANPREFIX = $(PREFIX)/share/man
+PREFIX ?= /usr/local
- MANPREFIX = ${PREFIX}/man
++MANPREFIX = $(PREFIX)/man
# flags
CPPFLAGS = -D_DEFAULT_SOURCE
@@ -17,8 +18,8 @@ Index: config.mk
-LDFLAGS = -s
+CFLAGS += -std=c99 -pedantic -Wall -Wextra -I${LOCALBASE}/include
+LDFLAGS += -s -L${LOCALBASE}/lib
- PNG-LDFLAGS = -lpng
- JPG-LDFLAGS = -ljpeg
+ PNG-LDLIBS = -lpng
+ JPG-LDLIBS = -ljpeg
# compiler and linker
-CC = cc
UPDATE: graphics/farbfeld 3 -> 4
Hello ports@
This is an update to graphics/farbfeld. The main change to the port is
that USE_GMAKE isn't needed any more.
Works fine for me on amd64 (converted some images to ff and back,
still seems to work).
diff --git Makefile Makefile
index 8d499d1ad33..1b49fcc3fa1 100644
--- Makefile
+++ Makefile
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.1.1.1 2017/10/23 21:39:20 bcallah Exp $
COMMENT = lossless, uncompressed graphics format
-DISTNAME = farbfeld-3
+DISTNAME = farbfeld-4
CATEGORIES = graphics converters
HOMEPAGE = https://tools.suckless.org/farbfeld
@@ -19,7 +19,6 @@ LIB_DEPENDS = graphics/png \
RUN_DEPENDS = graphics/ImageMagick
-USE_GMAKE =Yes
MAKE_ENV = CC="${CC}"
NO_TEST = Yes
diff --git distinfo distinfo
index c632a202e9e..a5f2d6668be 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (farbfeld-3.tar.gz) = W5U7hqctP+rt9iaYUyyIiOX24vY2MZOkzIzuDjjDeK0=
-SIZE (farbfeld-3.tar.gz) = 10169
+SHA256 (farbfeld-4.tar.gz) = x99ZIe3RIcpdWxz2+wHkMK/5sxJCJi5PaQ069yzL5yo=
+SIZE (farbfeld-4.tar.gz) = 10340
diff --git patches/patch-Makefile patches/patch-Makefile
index c42275f1f20..bb3b6daad0e 100644
--- patches/patch-Makefile
+++ patches/patch-Makefile
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2017/10/23 21:39:20 bcallah
Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
-@@ -38,15 +38,12 @@ dist:
+@@ -51,15 +51,12 @@ dist:
rm -rf "farbfeld-$(VERSION)"
install: all
diff --git patches/patch-config_mk patches/patch-config_mk
index b27e187cb51..f660d82096f 100644
--- patches/patch-config_mk
+++ patches/patch-config_mk
@@ -3,13 +3,14 @@ $OpenBSD: patch-config_mk,v 1.1.1.1 2017/10/23 21:39:20
bcallah Exp $
Index: config.mk
--- config.mk.orig
+++ config.mk
-@@ -4,15 +4,15 @@ VERSION = 3
+@@ -4,15 +4,15 @@ VERSION = 4
# Customize below to fit your system
# paths
-PREFIX = /usr/local
+-MANPREFIX = $(PREFIX)/share/man
+PREFIX ?= /usr/local
- MANPREFIX = ${PREFIX}/man
++MANPREFIX = $(PREFIX)/man
# flags
CPPFLAGS = -D_DEFAULT_SOURCE
@@ -17,8 +18,8 @@ Index: config.mk
-LDFLAGS = -s
+CFLAGS += -std=c99 -pedantic -Wall -Wextra -I${LOCALBASE}/include
+LDFLAGS += -s -L${LOCALBASE}/lib
- PNG-LDFLAGS = -lpng
- JPG-LDFLAGS = -ljpeg
+ PNG-LDLIBS = -lpng
+ JPG-LDLIBS = -ljpeg
# compiler and linker
-CC = cc
Re: UPDATE: devel/dfu-programmer 0.6.2 to 0.7.2
On Mon, Mar 05, 2018 at 08:58:06AM +, Stuart Henderson wrote:
> On 2018/03/04 22:54, Kaashif Hymabaccus wrote:
> > There is a small patch because the author forgot to include stdlib.h
> > in atmel.c.
>
> This patch is missing from your diff.
Thanks, here is the full diff:
diff --git Makefile Makefile
index 699f98ebe20..9683ffcae30 100644
--- Makefile
+++ Makefile
@@ -1,20 +1,21 @@
# $OpenBSD: Makefile,v 1.4 2014/01/09 12:06:18 stsp Exp $
COMMENT = Device Firmware Update-based programmer for Atmel chips
-V =0.6.2
-DISTNAME = dfu-programmer-${V}
+DISTNAME = dfu-programmer-0.7.2
CATEGORIES = devel
-HOMEPAGE = http://dfu-programmer.sourceforge.net/
+HOMEPAGE = http://dfu-programmer.github.io/
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB = c pthread usb-1.0
-LIB_DEPENDS = devel/libusb1
+WANTLIB = c usb-1.0
+
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=dfu-programmer/}
-CONFIGURE_STYLE = autoconf
-AUTOCONF_VERSION = 2.68
-CONFIGURE_ENV =CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+
+LIB_DEPENDS = devel/libusb1
+
+CONFIGURE_STYLE = gnu
+CONFIGURE_ENV+=CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${CFLAGS} -L${LOCALBASE}/lib"
diff --git distinfo distinfo
index e0400b79212..db8d0b973a0 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (dfu-programmer-0.6.2.tar.gz) =
ASCWakJN2YEkliBVdQ6Qy9bHtrD79bGHv0Ndqgokr2U=
-SIZE (dfu-programmer-0.6.2.tar.gz) = 134941
+SHA256 (dfu-programmer-0.7.2.tar.gz) =
HbTTaxrtqyrcl26PqlSV3zz4LcS/iDYz3GunH3xK+ZU=
+SIZE (dfu-programmer-0.7.2.tar.gz) = 146613
diff --git patches/patch-configure_ac patches/patch-configure_ac
deleted file mode 100644
index 163e7d8cab2..000
--- patches/patch-configure_ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.1 2014/01/09 12:06:18 stsp Exp $
configure.ac.orig Tue Jan 7 13:28:50 2014
-+++ configure.ac Tue Jan 7 13:29:52 2014
-@@ -28,8 +28,8 @@ if test "$disable_libusb_1_0" = "no"; then
- ifdef([PKG_CHECK_MODULES],
- [PKG_CHECK_MODULES(LIBUSB_1_0, [ libusb-1.0 >= 1.0.0 ],
have_libusb_1_0=yes, have_libusb_1_0=no)],
- [have_libusb_1_0=yes
-- LIBUSB_1_0_CFLAGS=-I/usr/include/libusb-1.0
-- LIBUSB_1_0_LIBS=-lusb-1.0])
-+ LIBUSB_1_0_CFLAGS="`pkg-config --cflags libusb-1.0`"
-+ LIBUSB_1_0_LIBS="`pkg-config --libs libusb-1.0`"])
- if test "$have_libusb_1_0" = "yes"; then
- AS_ECHO("using libusb_1.0");
- CFLAGS="$CFLAGS $LIBUSB_1_0_CFLAGS"
diff --git patches/patch-src_atmel_c patches/patch-src_atmel_c
new file mode 100644
index 000..8a07966ebe9
--- /dev/null
+++ patches/patch-src_atmel_c
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/atmel.c
+--- src/atmel.c.orig
src/atmel.c
+@@ -21,6 +21,7 @@
+ #include
+ #include
+ #include
++#include
+ #include
+ #include
+ #include
UPDATE: devel/dfu-programmer 0.6.2 to 0.7.2
This is an update for dfu-programmer, program for uploading programs
to Atmel microcontrollers.
There is a small patch because the author forgot to include stdlib.h
in atmel.c. Also their website changed to a GitHub page, but their
release tarballs are still kept on SourceForge, which is a bit weird,
there aren't any actual release tarballs on GitHub (just autogenerated
ones).
I have tested it with an Atmel AT90USB162 and it works fine with the
launch, read, erase, flash, get commands. I don't have any hardware
which supports the other commands, I'd appreciate if someone could
test those if they have a board they can program through DFU.
diff --git Makefile Makefile
index 699f98ebe20..9683ffcae30 100644
--- Makefile
+++ Makefile
@@ -1,20 +1,21 @@
# $OpenBSD: Makefile,v 1.4 2014/01/09 12:06:18 stsp Exp $
COMMENT = Device Firmware Update-based programmer for Atmel chips
-V =0.6.2
-DISTNAME = dfu-programmer-${V}
+DISTNAME = dfu-programmer-0.7.2
CATEGORIES = devel
-HOMEPAGE = http://dfu-programmer.sourceforge.net/
+HOMEPAGE = http://dfu-programmer.github.io/
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB = c pthread usb-1.0
-LIB_DEPENDS = devel/libusb1
+WANTLIB = c usb-1.0
+
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=dfu-programmer/}
-CONFIGURE_STYLE = autoconf
-AUTOCONF_VERSION = 2.68
-CONFIGURE_ENV =CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
+
+LIB_DEPENDS = devel/libusb1
+
+CONFIGURE_STYLE = gnu
+CONFIGURE_ENV+=CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
CFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${CFLAGS} -L${LOCALBASE}/lib"
diff --git distinfo distinfo
index e0400b79212..db8d0b973a0 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (dfu-programmer-0.6.2.tar.gz) =
ASCWakJN2YEkliBVdQ6Qy9bHtrD79bGHv0Ndqgokr2U=
-SIZE (dfu-programmer-0.6.2.tar.gz) = 134941
+SHA256 (dfu-programmer-0.7.2.tar.gz) =
HbTTaxrtqyrcl26PqlSV3zz4LcS/iDYz3GunH3xK+ZU=
+SIZE (dfu-programmer-0.7.2.tar.gz) = 146613
diff --git patches/patch-configure_ac patches/patch-configure_ac
deleted file mode 100644
index 163e7d8cab2..000
--- patches/patch-configure_ac
+++ /dev/null
@@ -1,14 +0,0 @@
-$OpenBSD: patch-configure_ac,v 1.1 2014/01/09 12:06:18 stsp Exp $
configure.ac.orig Tue Jan 7 13:28:50 2014
-+++ configure.ac Tue Jan 7 13:29:52 2014
-@@ -28,8 +28,8 @@ if test "$disable_libusb_1_0" = "no"; then
- ifdef([PKG_CHECK_MODULES],
- [PKG_CHECK_MODULES(LIBUSB_1_0, [ libusb-1.0 >= 1.0.0 ],
have_libusb_1_0=yes, have_libusb_1_0=no)],
- [have_libusb_1_0=yes
-- LIBUSB_1_0_CFLAGS=-I/usr/include/libusb-1.0
-- LIBUSB_1_0_LIBS=-lusb-1.0])
-+ LIBUSB_1_0_CFLAGS="`pkg-config --cflags libusb-1.0`"
-+ LIBUSB_1_0_LIBS="`pkg-config --libs libusb-1.0`"])
- if test "$have_libusb_1_0" = "yes"; then
- AS_ECHO("using libusb_1.0");
- CFLAGS="$CFLAGS $LIBUSB_1_0_CFLAGS"
Should games/fifengine be marked as broken on sparc64?
games/fifengine's Makefile has the line: > BROKEN-sparc64 =out of memory when compiling fifePYTHON_wrap.cxx Which was added in a commit with this message: > Don't try building fifengine on archs that will definitely run out > of memory. I can build it on my sparc64 box with no issue if I remove the BROKEN-*. I guess if it uses more than 4 GB of memory, 32 bit architectures can't possibly build it, so it being BROKEN on i386 is probably accurate. But there's nothing stopping someone with enough RAM from building this on sparc64, so why is it marked as BROKEN? -- Kaashif Hymabaccus GPG: 3E810B04
Re: NEW: mail/rss2email3
Ping with a new tarball. The distinfo in the previous one is wrong. -- Kaashif Hymabaccus GPG: 3E810B04 rss2email3.tgz Description: Binary data
Re: NEW: fs2open - source port of FreeSpace 2 space sim
Great game, thanks for porting it!
The wrapper script installed at /usr/local/bin/fs2open has this line:
/usr/local/bin/fs2open $*
I think this is a mistake, it should call the binary at
/usr/local/share/fs2open/fs2open. It's already installed with
SUBST_CMD, so this will work:
--- files/fs2open.orig Sat Jan 13 21:58:51 2018
+++ files/fs2open Sat Jan 13 22:03:35 2018
@@ -8,4 +8,4 @@
print 'could not find directory ~/.local/share/fs2open'
exit 1
fi
-/usr/local/bin/fs2open $*
+${LOCALBASE}/share/fs2open/fs2open $*
Re: New port: witchblast (roguelite dungeon crawler)
On Mon, Dec 25, 2017 at 06:49:15AM +0100, Jeremie Courreges-Anglas wrote:
>
> Have you tried a build with COMPILER = ports-clang?
I have tried it on sparc64 and it doesn't work, but this is not an
issue with the port.
I get these errors:
In file included from
/usr/ports/pobj/witchblast-0.7.5/witchblast-0.7.5/src/WitchBlastGame.cpp:17:
In file included from
/usr/ports/pobj/witchblast-0.7.5/witchblast-0.7.5/src/WitchBlastGame.h:32:
In file included from /usr/local/include/c++/4.9.4/thread:40:
In file included from /usr/local/include/c++/4.9.4/memory:82:
In file included from /usr/local/include/c++/4.9.4/bits/shared_ptr.h:52:
/usr/local/include/c++/4.9.4/bits/shared_ptr_base.h:157:10: error: unexpected
token
_GLIBCXX_WRITE_MEM_BARRIER;
^
/usr/local/include/c++/4.9.4/sparc64-unknown-openbsd6.2/bits/atomic_word.h:40:21:
note: expanded from macro '_GLIBCXX_WRITE_MEM_BARRIER'
__asm __volatile ("membar #StoreStore":::"memory")
^
:1:9: note: instantiated into assembly here
membar #StoreStore
^
258 warnings and 12 errors generated.
I get these on some other ports too. It's not something I'm personally
doing wrong, since these kinds of errors appear in bulk builds:
http://build-failures.rhaalovely.net//sparc64/2017-12-03/games/easyrpg.log
http://build-failures.rhaalovely.net//sparc64/2017-12-03/games/hyperrogue.log
http://build-failures.rhaalovely.net//sparc64/2017-12-03/devel/dlib.log
http://build-failures.rhaalovely.net//sparc64/2017-12-03/x11/worker.log
etc
Anyone have any idea what's going on here? Some of these ports build
just fine with ports-gcc, including witchblast.
Witchblast doesn't just build, it also runs well on sparc64 compiled
with ports-gcc (I played it for a bit), so the port itself isn't
broken, something is wonky with clang, or the headers, or something
else.
--
Kaashif Hymabaccus
GPG: 3E810B04
Re: New port: witchblast (roguelite dungeon crawler)
I think this port also needs: COMPILER=base-clang ports-gcc or something similar. Otherwise it can't build on sparc64 (and others). This is because it uses -std=c++11. -- Kaashif Hymabaccus GPG: 3E810B04
Re: NEW: games/openjk
Hello Brian I am also someone that has been working on porting this game. On sparc64 running this produces tons of bus errors (SIGBUS) since the memory manager code works by allocating some memory then interpreting the last 4 bytes as an int (writes some magic value to it). But as far as I'm aware, you can't just read and write ints wherever you want on sparc64, they have to be aligned. Also there's a lot of interpreting char* as int* in the server code and probably elsewhere. These errors are not too difficult to fix, but I don't know whether I have fixed them all since I can't run the game, I don't have a sparc64 box with a GPU that can run X. I have one coming in the mail soon (tomorrow allegedly). Once I can confirm openjk works, I'll submit the patches upstream and mail a link here. Until then, if someone does OK this, they should bear in mind it doesn't work on sparc64. It does build though. -- Kaashif Hymabaccus GPG: 3E810B04
Re: NEW: games/2048-cli
On Mon, Aug 21, 2017 at 02:18:16PM +0200, Jeremie Courreges-Anglas wrote: > > Looks fine to me, ok jca@ if someone wants to import it. Anyone want to import this? Has already been OKed. Tarball attached for convenience. -- Kaashif Hymabaccus GPG: 3E810B04 2048-cli.tgz Description: application/tar-gz
Re: NEW: mail/rss2email3
On Sat, Dec 09, 2017 at 10:32:26PM +, Stuart Henderson wrote:
>
> MODPY_EGG_VERSION = 3.9
>
> - please move this up in the block with DISTNAME
>
> ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${DISTNAME}
>
> - usually we don't use the full version number in such directories,
> ${PREFIX}/share/doc/rss2email3 would probably be the most appropriate
>
> (pkg/MESSAGE)
>
> - please convert to a pkg-readme
Incorporated these suggestions. Tarball attached.
Also I moved everything around so it's in the same order as the
infrastructure Makefile template.
--
Kaashif Hymabaccus
GPG: 3E810B04
rss2email3.tgz
Description: application/tar-gz
NEW: mail/rss2email3
Hello ports@ This is a port of the new version of rss2email, 3.9. Since it makes a number of breaking changes from the version of rss2email we have now, I'm making this an entirely new port. This is heavily based on the port Thomas Levine submitted a while ago, most of the credit goes to him. Note: I install the script as r2e3 (not r2e) so as to avoid conflict with rss2email-2.7. There were some ideas floating around about how to rename ports or scripts to avoid confusion, but I think the best thing to do is to avoid breaking people's scripts altogether and treat this as a new, unrelated program. It almost is, since we have different authors, a different version of Python and a different config file format. Comments? I think this is a fairly inoffensive and non-disruptive way of handling this potential conflict. -- Kaashif Hymabaccus GPG: 3E810B04 rss2email3.tgz Description: application/tar-gz
Re: UPDATE: mail/rss2email 2.70 -> 3.9
On Sun, Oct 15, 2017 at 07:15:12PM +, Thomas Levine wrote: > I have also marked Kaashif as the maintainer, though he > should confirm that that's still okay. This is OK. I was going to start working on this port soon, so it's nice to have the initial work done for me. I'll just hope no updates in the future break anything too badly. As for the port itself, I think it looks OK (the one with the new, separate rss2email3) but take that with a grain of salt, I don't really know what I'm doing... -- Kaashif Hymabaccus GPG: 3E810B04
Re: UPDATE: mail/rss2email 2.70 -> 3.9
On Sat, Oct 14, 2017 at 04:35:23PM +, Thomas Levine wrote: > I have also prepared a port that uses the new upstream. It uses a > different package of the the same version of the software. I still > prefer the above PyPI version to avoid dependence on the proprietary > service GitHub, but I don't think it really matters. >From my understanding (see https://github.com/rss2email/rss2email/issues/3), the PyPI package is now owned by the new maintainer of rss2email, so any new releases on GitHub will be reflected on PyPI. I think PyPI is preferred to autogenerated GitHub tarballs, so only using PyPI should be no problem. -- Kaashif Hymabaccus GPG: 3E810B04
Re: new : net/aget
On Sun, Sep 10, 2017 at 11:26:48PM +0200, Jérôme KASPER wrote: > Hi ports, > > please find attached a port for aget, a multithreaded download accelerator > ported version is latest 0.4.1 , built on AMD64. > > any coments welcome > > Best regards, > Jerome > Hello Jérôme, There's no need to use GitHub here as far as I can tell, there's an up-to-date tarball on their homepage. This is usually preferred. This isn't a C++ port, it doesn't need C++ stuff in WANTLIB. Also pkg/PLIST is empty, the port doesn't install anything. Please give this a read, it's very helpful: https://www.openbsd.org/faq/ports/guide.html#PortsChecklist -- Kaashif Hymabaccus GPG: 3E810B04
Re: UPDATE: net/gopher 3.0.11 to 3.0.16
Hello ports@
Here's a better diff which gets rid of HOMEPAGE and adds the correct
license marker.
Is there any interest in this port?
diff --git Makefile Makefile
index a1fdac8ab83..87d5d9cad30 100644
--- Makefile
+++ Makefile
@@ -2,27 +2,29 @@
COMMENT= distributed document delivery client
-V= 3.0.11
-DISTNAME= gopher_${V}
-PKGNAME= gopher-${V}
-REVISION= 2
+V= 3.0.16
+DISTNAME= gopher-${V}
+
+GH_ACCOUNT=jgoerzen
+GH_PROJECT=gopher
+GH_TAGNAME=release/${V}
+
CATEGORIES=net
-HOMEPAGE= http://quux.org/devel/gopher/Downloads/
+MAINTAINER=Kaashif Hymabaccus <kaas...@kaashif.co.uk>
-# GPL
+# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES= ${HOMEPAGE}
-
WANTLIB= c m curses termcap
USE_GMAKE= Yes
CONFIGURE_STYLE=gnu
MAKE_FLAGS=CLIENTLIB=${SYSCONFDIR}/gopher
-WRKDIST= ${WRKDIR}/gopher
NO_TEST= Yes
+WRKDIST= ${WRKDIR}/gopher-release-${V}
+
pre-configure:
@perl -pi -e "s,!!PREFIX!!,${PREFIX},g;" \
-e "s,!!SYSCONFDIR!!,${SYSCONFDIR},g" ${WRKSRC}/doc/gopher.1
diff --git distinfo distinfo
index 1d0887a5b9e..dd6a5a34794 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (gopher_3.0.11.tar.gz) = LPGjFAC+Ztj7w23quyCiFPGMKm8Lgm/axe5SjkLpJ5c=
-SIZE (gopher_3.0.11.tar.gz) = 318250
+SHA256 (gopher-3.0.16.tar.gz) = No4TadnZqv3Q4HAtexkoJ4RyeF/EeRF9GslQYiVJeCs=
+SIZE (gopher-3.0.16.tar.gz) = 320011
diff --git pkg/PLIST pkg/PLIST
index 37688335ce6..5437a010e8c 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/07/31 12:52:20 steven Exp $
-bin/gopher
-bin/gophfilt
+@bin bin/gopher
+@bin bin/gophfilt
@man man/man1/gopher.1
@man man/man1/gophfilt.1
@man man/man5/gopherrc.5
Re: NEW: graphics/farbfeld
On Fri, Sep 08, 2017 at 08:49:18AM +0100, Stuart Henderson wrote: > I haven't tried building, but from eye: > > - missing license marker > - don't hardcode /usr/local Thanks for the feedback, those are some silly mistakes. Updated tarball attached. -- Kaashif Hymabaccus GPG: 3E810B04 farbfeld.tgz Description: application/tar-gz
NEW: graphics/farbfeld
Hello ports@, Please find attached a port for graphics/farbfeld. pkg/DESCR: Farbfeld is a lossless image format which is easy to parse, pipe and compress. The port includes some tools ff2* and *2ff which convert to and from farbfeld, so I put it in the converters category too. Works ok on amd64. -- Kaashif Hymabaccus GPG: 3E810B04 farbfeld.tgz Description: application/tar-gz
Re: NEW: x11/wmutils
On Wed, Aug 16, 2017 at 09:28:01PM -0400, Brian Callahan wrote: > Hi Kaashif -- > > On 08/16/17 21:08, Kaashif Hymabaccus wrote: > > I also removed setting HOMEPAGE, since it gets set automagically when > > GH_* are around. Tarball is attached. > > > > I'd like to change some of your = in Makefile.inc to ?= (specifically, > CATEGORIES, MAINTAINER, and NO_TEST), but otherwise I'm ok with importing > this, anyone else have comments/oks? > > ~Brian > 2.5 week ping. Is there any developer interested in OKing/importing this? These programs are very nifty, I've been using them with no issue for a few weeks. -- Kaashif Hymabaccus GPG: 3E810B04
UPDATE: mail/rss2email 2.70 -> 3.9
Hello ports@,
Please find below a diff updating rss2email.
Changes:
* Uses python3 now
* Development moved to GitHub
* No files/r2e is needed now, setup.py installs a suitable script
itself.
* We don't need to install any examples, r2e writes the default config
to .config/rss2email.cfg when run.
* I want to take maintainership.
OK?
diff --git Makefile Makefile
index a8ea487dd0a..ae35e46de88 100644
--- Makefile
+++ Makefile
@@ -2,37 +2,29 @@
COMMENT= get news from RSS feeds in email
-DISTNAME= rss2email-2.70
+MODPY_EGG_VERSION= 3.9
+
+DISTNAME= rss2email-${MODPY_EGG_VERSION}
+
+GH_ACCOUNT=wking
+GH_PROJECT=rss2email
+GH_TAGNAME=v${MODPY_EGG_VERSION}
CATEGORIES=mail textproc
-HOMEPAGE= http://www.allthingsrss.com/rss2email/
+MAINTAINER=Kaashif Hymabaccus <kaas...@kaashif.co.uk>
# GPLv2/v3
PERMIT_PACKAGE_CDROM= Yes
-MASTER_SITES= ${HOMEPAGE}
-
MODULES= lang/python
-BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= converters/py-html2text \
- textproc/py-feedparser
-SUBST_VARS+= MODPY_SITEPKG
+
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
+
+RUN_DEPENDS= converters/py-html2text${MODPY_FLAVOR} \
+ textproc/py-feedparser${MODPY_FLAVOR}
NO_BUILD= Yes
NO_TEST= Yes
-do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/rss2email/ \
- ${PREFIX}/share/doc/rss2email/ ${WRKINST}/${MODPY_SITEPKG}/
- ${INSTALL_SCRIPT} ${WRKSRC}/rss2email.py ${WRKINST}/${MODPY_SITEPKG}/
- ${INSTALL_DATA} ${WRKSRC}/readme.html ${PREFIX}/share/doc/rss2email/
- ${INSTALL_DATA} ${WRKSRC}/config.py.example \
- ${PREFIX}/share/examples/rss2email/
- ${INSTALL_DATA} ${WRKSRC}/config.py.example \
- ${PREFIX}/share/examples/rss2email/
- ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
- ${WRKINST}/${MODPY_SITEPKG}/rss2email.py
- ${SUBST_PROGRAM} ${FILESDIR}/r2e ${PREFIX}/bin/r2e
-
.include
diff --git distinfo distinfo
index c28393640dc..43166ce0983 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (rss2email-2.70.tar.gz) = OIK+DIfj/KfGbKAGunMRKT2nN6fm7hKIREIhQKT6aDU=
-SIZE (rss2email-2.70.tar.gz) = 57961
+SHA256 (rss2email-3.9.tar.gz) = ZAupJ5iUADbkqUHHcFoJINW+h6EfGBewhSLpqZYGu38=
+SIZE (rss2email-3.9.tar.gz) = 160904
diff --git files/r2e files/r2e
deleted file mode 100644
index 51d1a629e1f..000
--- files/r2e
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh -e
-[ -d ~/.rss2email ] || mkdir ~/.rss2email
-cd ~/.rss2email
-exec ${MODPY_BIN} ${MODPY_SITEPKG}/rss2email.py feeds.dat $*
diff --git pkg/PLIST pkg/PLIST
index 897b7624d14..320aacc88d7 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,8 +1,33 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2013/06/26 16:23:10 sthen Exp $
bin/r2e
-lib/python${MODPY_VERSION}/site-packages/rss2email.py
-lib/python${MODPY_VERSION}/site-packages/rss2email.pyc
-share/doc/rss2email/
-share/doc/rss2email/readme.html
-share/examples/rss2email/
-share/examples/rss2email/config.py.example
+lib/python${MODPY_VERSION}/site-packages/rss2email/
+lib/python${MODPY_VERSION}/site-packages/rss2email-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/rss2email/__init__.py
+lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}command.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}email.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}feed.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}feeds.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/rss2email/command.py
+lib/python${MODPY_VERSION}/site-packages/rss2email/config.py
+lib/python${MODPY_VERSION}/site-packages/rss2email/email.py
+lib/python${MODPY_VERSION}/site-packages/rss2email/error.py
+lib/python${MODPY_VERSION}/site-packages/rss2email/feed.py
+lib/python${MODPY_VERSION}/site-packages/rss2email/feeds.py
+lib/python${MODPY_VERSION}/site-packages/rss2email/main.py
+lib/python${MODPY_VERSION}/site-packages/rss2email/post_process/
+lib/python${MODPY_VERSION}/site-packages/rss2email/post_process/__init__.py
+lib/python${MODPY_VERSION}/site-packages/rss2email/post_process/${MODPY_PYCACHE}/
+lib/
Re: NEW: games/2048-cli
On Mon, Aug 21, 2017 at 01:21:25PM +0200, Jeremie Courreges-Anglas wrote: > On Sun, Aug 20 2017, Kaashif Hymabaccus <kaas...@kaashif.co.uk> wrote: > > Hello ports@, > > > > Please find attached a port for 2048-cli. > > > > pkg/DESCR: > > 2048-cli is a terminal-based version of the popular 2048 web game. > > Supports animations, colors, stores your high score, and includes an AI. > > > > Builds and works well on amd64 and sparc64. > > Untested, but the port Makefile seems to hardcode -O2. This should > probably be patched out. > > -- > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE Ok, tarball attached with -O2 patched out. -- Kaashif Hymabaccus GPG: 3E810B04 2048-cli.tgz Description: application/tar-gz
NEW: games/2048-cli
Hello ports@, Please find attached a port for 2048-cli. pkg/DESCR: 2048-cli is a terminal-based version of the popular 2048 web game. Supports animations, colors, stores your high score, and includes an AI. Builds and works well on amd64 and sparc64. -- Kaashif Hymabaccus GPG: 3E810B04 2048-cli.tgz Description: application/tar-gz
Re: NEW: comms/cutecom
I removed COMPILER=gcc. Tarball attached. -- Kaashif Hymabaccus GPG: 3E810B04 cutecom.tgz Description: application/tar-gz
Re: NEW: x11/wmutils
I also removed setting HOMEPAGE, since it gets set automagically when GH_* are around. Tarball is attached. -- Kaashif Hymabaccus GPG: 3E810B04 wmutils.tgz Description: application/tar-gz
Re: NEW: x11/screenkey
Thanks for the feedback everyone. Updated tarball is attached. I now use MODPY_EGG_VERSION, I replaced "0.9" in PLIST with MODPY_EGG_VERSION, added textproc/intltool to BUILD_DEPENDS. -- Kaashif Hymabaccus GPG: 3E810B04 screenkey.tgz Description: application/tar-gz
NEW: x11/screenkey
Hello ports@, Please find attached a port for x11/screenkey. pkg/DESCR: Screencast tool to display your keypresses, inspired by Screenflick. Supports several keyboard translation methods, multiple monitors, dynamic recording control, repeat keypress compression and more. portcheck gives me a warning: > translation file(s) found without devel/gettext dependency in RUN_DEPENDS But this is a Python program, Python has a built in module for gettext, so there is no need to depend on devel/gettext. Thoughts? I don't have much experience with Python, so I probably got some of the PLIST stuff wrong. -- Kaashif Hymabaccus GPG: 3E810B04 screenkey.tgz Description: application/tar-gz
Re: NEW: comms/cutecom
Please find attached a revised tarball. Changes: * Unnecessary sentences removed from DESCR (thanks Rafael) * License marker mistake fixed * Added COMPILER=gcc, since this port does indeed use C++11 * Order of MODULES improved (thanks Brian) -- Kaashif Hymabaccus GPG: 3E810B04 cutecom.tgz Description: application/tar-gz
NEW: comms/cutecom
Hello ports@, Please find attached a port for cutecom. pkg/DESCR: CuteCom is a graphical serial terminal, like minicom. Currently it runs on Linux (tested) and should run on FreeBSD, Mac OS X and maybe other systems as well (untested). It is aimed mainly at hardware developers or other people who need a terminal to talk to their devices. It is free software and distributed under the GNU General Public License Version 3. It is written using the Qt library originally created by Trolltech. Builds and works ok on amd64. -- Kaashif Hymabaccus GPG: 3E810B04 cutecom.tgz Description: application/tar-gz
Re: [fix] kamailio on sparc64
On Thu, Aug 10, 2017 at 02:28:23PM -0400, Jeremie Courreges-Anglas wrote: > Well, as I said I didn't test it on sparc64 (and other archiectures > potentially affected), but it can't be worse. :) In case you are wondering, I was able to build and run on sparc64 with your new patch, so there's nothing to worry about as far as I can tell. -- Kaashif Hymabaccus GPG: 3E810B04
Re: NEW: net/pastebinit
On Tue, Aug 08, 2017 at 06:02:56PM -0400, Brian Callahan wrote: > * Is py-configobj used? I couldn't see anywhere it was being used. And I > didn't bother installing it and everything seems to work fine. The reason this is here because I saw FreeBSD had it and I thought I missed something, but upon further inspection, it was just cruft left over from a past version that did use it. Silly me. > * Why use wget for something so trivial? Why not use ftp(1)? The conversion > is super trivial. Noted, I patch this in the attached port. > * NO_TEST=Yes is disingenuous. There is a test.sh and it works just fine > (wget to ftp conversion needed here too). > * At least one the the sites run in test.sh no longer exists. Perhaps you > should talk to upstream about removing it from the tests. In the attached port, I deal with this by just deleting the misconfigured pastebin configs. I'll contact the author and try to get him to fix the broken configs. make test works for me, now. I also patched it so it actually stops when there's a failure. PS Sorry for sending this twice, I didn't Cc ports@ the first time. -- Kaashif Hymabaccus GPG: 3E810B04 pastebinit.tgz Description: application/tar-gz
NEW: net/pastebinit
Hello ports@, Please find attached a port for pastebinit. pkg/DESCR: Pastebinit lets you send a file or simply the result of a command directly to the pastebin you want (if it's supported) and gives you the URL in return. This package also includes pbget, pbputs and pbget, which allow you to send a binary file to a pastebin, with optional encryption. It works on amd64 for me, including the pb* scripts. Some of the pastebins don't work, but this isn't an OpenBSD specific problem, so I just leave them alone. pastebin.com, the default, works, so I think this is fine. -- Kaashif Hymabaccus GPG: 3E810B04 pastebinit.tgz Description: application/tar-gz
Re: UPDATE: xfishtank to 2.5
On Sat, Jul 22, 2017 at 08:40:06PM +0100, Kaashif Hymabaccus wrote:
> According to the LICENSE file:
>
> I tracked down John Bradley <brad...@trilon.com>, who wrote the
> xfish program back around 1987, that xfishtank is derived from. He
> stated the following copyright:
>
> > It doesn't have one - do whatever you'd like with it. Enjoy!
> >
> > --jhb
>
> This is not a real license, but it does imply we are allowed to
> distribute it, correct? This is why I set PERMIT_* to Yes. The rest of
> the program (written by other authors from 1988 onwards) is under a
> permissive license, so should be ok.
Upon further consideration, I have realised that this is not
ok. Please find an updated diff where the PERMIT_* are set to "no
license" just like before.
Also the order of the lines was a bit scrambled before, hopefully it's
better now.
diff --git Makefile Makefile
index eba5a1b45a4..7de35be4f18 100644
--- Makefile
+++ Makefile
@@ -2,23 +2,25 @@
COMMENT= fish swim in the background of your screen
-DISTNAME= xfishtank-2.2
-REVISION= 1
+GH_ACCOUNT=jim-rees
+GH_PROJECT=xfishtank
+GH_TAGNAME=v2.5
+
CATEGORIES=x11
-MASTER_SITES= http://distcache.freebsd.org/ports-distfiles/
+HOMEPAGE= http://jim.rees.org/computers/xfishtank.html
+
+MAINTAINER=Kaashif Hymabaccus <kaas...@kaashif.co.uk>
PERMIT_PACKAGE_CDROM= no license
PERMIT_PACKAGE_FTP=no license
PERMIT_DISTFILES_FTP= no license
-WANTLIB= X11 Xau Xdmcp Xext c m
+WANTLIB= X11 Xau Xdmcp Xext c m Imlib2
-CONFIGURE_STYLE= imake noman
-WRKDIST= ${WRKDIR}/xfishtank2.0
+LIB_DEPENDS= graphics/imlib2
-post-patch:
- @cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} clean
+CONFIGURE_STYLE= imake
NO_TEST= Yes
diff --git distinfo distinfo
index 5a578d98550..d1b6f90033a 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfishtank-2.2.tar.gz) = Q5EijAdPzNc6nqgzLgkOktebon+eY2kwNfOSOH0DEiw=
-SIZE (xfishtank-2.2.tar.gz) = 360031
+SHA256 (xfishtank-2.5.tar.gz) = vYzjxOetsOYrKU3jB5csDV4qRCsJTBeKO+CE4+JqCOA=
+SIZE (xfishtank-2.5.tar.gz) = 153554
diff --git patches/patch-Imakefile patches/patch-Imakefile
index 18e2571dd34..c89f354545a 100644
--- patches/patch-Imakefile
+++ patches/patch-Imakefile
@@ -1,18 +1,14 @@
-$OpenBSD: patch-Imakefile,v 1.1 2007/10/26 23:54:56 ajacoutot Exp $
Imakefile.orig Wed Dec 16 01:04:35 1992
-+++ Imakefile Sat Oct 27 01:50:24 2007
-@@ -2,12 +2,12 @@
+$OpenBSD$
+
+Index: Imakefile
+--- Imakefile.orig
Imakefile
+@@ -1,7 +1,7 @@
+ EXTRA_INCLUDES = -I./fishmaps
LOCAL_LIBRARIES = $(XLIB)
DEPLIBS = $(DEPXLIB)
- SYS_LIBRARIES = -lm
--CDEBUGFLAGS = -g
-+XCOMMCDEBUGFLAGS = -g
+- SYS_LIBRARIES = -lImlib2 -lm
++ SYS_LIBRARIES = -L/usr/X11R6/lib -L/usr/local/lib -lImlib2 -lm
+MANSRCSUFFIX = 1x
-SRCS = xfish.c medcut.c read.c gifread.c
-OBJS = xfish.o medcut.o read.o gifread.o
-
--ComplexProgramTarget(xfishtank)
-+ComplexProgramTargetNoMan(xfishtank)
-
- xfishy.h: makeh FishList
- ./makeh > xfishy.h
+SRCS = xfish.c medcut.c
diff --git patches/patch-gifread_c patches/patch-gifread_c
deleted file mode 100644
index 5d3fd9cfaf8..000
--- patches/patch-gifread_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-gifread_c,v 1.1 2008/07/28 22:29:49 sthen Exp $
gifread.c.orig Mon Jul 28 20:58:24 2008
-+++ gifread.c Mon Jul 28 20:58:41 2008
-@@ -56,6 +56,7 @@
-
- #include
- #include
-+#include
- #if defined(SYSV) || defined(SVR4)
- #include
- #else /* SYSV */
diff --git patches/patch-makeh_c patches/patch-makeh_c
deleted file mode 100644
index 035ba7ac187..000
--- patches/patch-makeh_c
+++ /dev/null
@@ -1,10 +0,0 @@
-$OpenBSD: patch-makeh_c,v 1.1 2008/07/28 22:29:49 sthen Exp $
makeh.c.orig Mon Jul 28 20:54:02 2008
-+++ makeh.cMon Jul 28 20:54:11 2008
-@@ -1,5 +1,6 @@
-
- #include
-+#include
-
- main()
- {
diff --git patches/patch-medcut_c patches/patch-medcut_c
deleted file mode 100644
index cf8b21288c7..000
--- patches/patch-medcut_c
+++ /dev/null
@@ -1,9 +0,0 @@
-$OpenBSD: patch-medcut_c,v 1.1 2008/07/28 22:29:49 sthen Exp $
medcut.c.orig Mon Jul 28 20:57:39 2008
-+++ medcut.c Mon Jul 28 20:57:44 2008
-@@ -1,4 +1,5 @@
- #include
-+#include
- #include "medcut.h"
-
- #define RED 0
diff --git patches/patch-read_c patches/patch-read_c
deleted file mode 100644
index 9d5bf6c4fd0..000
--- patches/patch-read_c
+++ /dev/null
@@ -1,10 +0,0 @@
-$OpenBSD: patch-read_c,v 1.1 2008/07/28 22:29:49 sthen Exp $
read.c.origMon Jul 28 20:58:19 2008
-+++ read.c Mon Jul 28 20:58:45 2008
-@@ -1,5 +1,6 @@
- #include
- #include
-+#include
- #include "compact.h"
- #include "medcut.h"
-
diff --git patches/patch-xfish_c patches/patch-xfish_c
deleted file mode 100644
i
UPDATE: net/gopher 3.0.11 to 3.0.16
Hello ports@,
This is an update for net/gopher. Changes:
* The original MASTER_SITE is out of date, no new tarballs are
there. Development happens on GitHub now, so I moved everything
there with GH_*. quux.org still exists, but it's not up-to-date, so
not worth linking to.
* License is really GPLv2.
Also, I'm maintainer. I get the feeling gopher isn't popular any more,
so there are probably not many users of this, but what few users of
this there are will hopefully appreciate timely updates.
diff --git Makefile Makefile
index a1fdac8ab83..92f60bc0a03 100644
--- Makefile
+++ Makefile
@@ -2,27 +2,31 @@
COMMENT= distributed document delivery client
-V= 3.0.11
-DISTNAME= gopher_${V}
-PKGNAME= gopher-${V}
-REVISION= 2
+V= 3.0.16
+DISTNAME= gopher-${V}
+
+GH_ACCOUNT=jgoerzen
+GH_PROJECT=gopher
+GH_TAGNAME=release/${V}
+
CATEGORIES=net
-HOMEPAGE= http://quux.org/devel/gopher/Downloads/
+HOMEPAGE= https://github.com/jgoerzen/gopher
-# GPL
-PERMIT_PACKAGE_CDROM= Yes
+MAINTAINER=Kaashif Hymabaccus <kaas...@kaashif.co.uk>
-MASTER_SITES= ${HOMEPAGE}
+# GPLv2
+PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c m curses termcap
USE_GMAKE= Yes
CONFIGURE_STYLE=gnu
MAKE_FLAGS=CLIENTLIB=${SYSCONFDIR}/gopher
-WRKDIST= ${WRKDIR}/gopher
NO_TEST= Yes
+WRKDIST= ${WRKDIR}/gopher-release-${V}
+
pre-configure:
@perl -pi -e "s,!!PREFIX!!,${PREFIX},g;" \
-e "s,!!SYSCONFDIR!!,${SYSCONFDIR},g" ${WRKSRC}/doc/gopher.1
diff --git distinfo distinfo
index 1d0887a5b9e..dd6a5a34794 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (gopher_3.0.11.tar.gz) = LPGjFAC+Ztj7w23quyCiFPGMKm8Lgm/axe5SjkLpJ5c=
-SIZE (gopher_3.0.11.tar.gz) = 318250
+SHA256 (gopher-3.0.16.tar.gz) = No4TadnZqv3Q4HAtexkoJ4RyeF/EeRF9GslQYiVJeCs=
+SIZE (gopher-3.0.16.tar.gz) = 320011
diff --git pkg/PLIST pkg/PLIST
index 37688335ce6..5437a010e8c 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,6 +1,6 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/07/31 12:52:20 steven Exp $
-bin/gopher
-bin/gophfilt
+@bin bin/gopher
+@bin bin/gophfilt
@man man/man1/gopher.1
@man man/man1/gophfilt.1
@man man/man5/gopherrc.5
Re: UPDATE: fonts/terminus-font to 4.46
On Mon, Jul 31, 2017 at 10:14:39AM +0100, Stuart Henderson wrote:
> MODULES +=lang/python
> MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
> MODPY_RUNDEP =No
> MAKE_FLAGS = INT=${MODPY_BIN}
>
> > -@comment share/fonts/terminus/ter-x12b.pcf.gz
> > +share/fonts/terminus/ter-x12b.pcf.gz
>
> This @comment was intentional, nothing changed regarding this font
> (6x12 bold - see r1.2 of the ports Makefile).
Thanks for the improvements. See below for the improved diff.
> The other question is whether anyone needs the X11 8-bit fonts that
> weren't removed but stopped being installed by default with this
> update.
I don't know about this. If anyone uses them, they can reply to this
mail, I suppose. I would imagine that if there was significant demand,
the operating systems with version 4.46 (e.g. Gentoo, Arch Linux)
would have felt it, I haven't seen anything on forums or mailing lists
to indicate that. But I welcome any users telling me otherwise.
diff --git Makefile Makefile
index 5c90bfac485..744262e9494 100644
--- Makefile
+++ Makefile
@@ -2,8 +2,7 @@
COMMENT = fixed width fonts especially for long hacking sessions
-DISTNAME = terminus-font-4.40
-REVISION = 0
+DISTNAME = terminus-font-4.46
CATEGORIES = fonts x11
HOMEPAGE = http://terminus-font.sourceforge.net/
@@ -15,6 +14,12 @@ PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=terminus-font/}
+MODULES += lang/python
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+MODPY_RUNDEP = No
+
+MAKE_FLAGS = INT=${MODPY_BIN}
+
CONFIGURE_STYLE = simple
NO_TEST = Yes
USE_X11 = Yes
diff --git distinfo distinfo
index 32558fe77d6..7165a0fe236 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (terminus-font-4.40.tar.gz) =
ZPUsJNPxweOfIebEMHepvj4h1DhPF29XZsAFWLpnBxE=
-SIZE (terminus-font-4.40.tar.gz) = 558440
+SHA256 (terminus-font-4.46.tar.gz) =
TilDPlaZt23x9cmpbxIozM+OqKFnkc/vBj8rhQbHW80=
+SIZE (terminus-font-4.46.tar.gz) = 590210
diff --git pkg/PLIST pkg/PLIST
index 7d077b84793..5aa928f1767 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -3,222 +3,6 @@
share/fonts/
@fontdir share/fonts/terminus/
share/fonts/terminus/fonts.alias-terminus
-@comment share/fonts/terminus/ter-112b.pcf.gz
-share/fonts/terminus/ter-112n.pcf.gz
-share/fonts/terminus/ter-114b.pcf.gz
-share/fonts/terminus/ter-114n.pcf.gz
-share/fonts/terminus/ter-116b.pcf.gz
-share/fonts/terminus/ter-116n.pcf.gz
-share/fonts/terminus/ter-118b.pcf.gz
-share/fonts/terminus/ter-118n.pcf.gz
-share/fonts/terminus/ter-120b.pcf.gz
-share/fonts/terminus/ter-120n.pcf.gz
-share/fonts/terminus/ter-122b.pcf.gz
-share/fonts/terminus/ter-122n.pcf.gz
-share/fonts/terminus/ter-124b.pcf.gz
-share/fonts/terminus/ter-124n.pcf.gz
-share/fonts/terminus/ter-128b.pcf.gz
-share/fonts/terminus/ter-128n.pcf.gz
-share/fonts/terminus/ter-132b.pcf.gz
-share/fonts/terminus/ter-132n.pcf.gz
-@comment share/fonts/terminus/ter-212b.pcf.gz
-share/fonts/terminus/ter-212n.pcf.gz
-share/fonts/terminus/ter-214b.pcf.gz
-share/fonts/terminus/ter-214n.pcf.gz
-share/fonts/terminus/ter-216b.pcf.gz
-share/fonts/terminus/ter-216n.pcf.gz
-share/fonts/terminus/ter-218b.pcf.gz
-share/fonts/terminus/ter-218n.pcf.gz
-share/fonts/terminus/ter-220b.pcf.gz
-share/fonts/terminus/ter-220n.pcf.gz
-share/fonts/terminus/ter-222b.pcf.gz
-share/fonts/terminus/ter-222n.pcf.gz
-share/fonts/terminus/ter-224b.pcf.gz
-share/fonts/terminus/ter-224n.pcf.gz
-share/fonts/terminus/ter-228b.pcf.gz
-share/fonts/terminus/ter-228n.pcf.gz
-share/fonts/terminus/ter-232b.pcf.gz
-share/fonts/terminus/ter-232n.pcf.gz
-@comment share/fonts/terminus/ter-512b.pcf.gz
-share/fonts/terminus/ter-512n.pcf.gz
-share/fonts/terminus/ter-514b.pcf.gz
-share/fonts/terminus/ter-514n.pcf.gz
-share/fonts/terminus/ter-516b.pcf.gz
-share/fonts/terminus/ter-516n.pcf.gz
-share/fonts/terminus/ter-518b.pcf.gz
-share/fonts/terminus/ter-518n.pcf.gz
-share/fonts/terminus/ter-520b.pcf.gz
-share/fonts/terminus/ter-520n.pcf.gz
-share/fonts/terminus/ter-522b.pcf.gz
-share/fonts/terminus/ter-522n.pcf.gz
-share/fonts/terminus/ter-524b.pcf.gz
-share/fonts/terminus/ter-524n.pcf.gz
-share/fonts/terminus/ter-528b.pcf.gz
-share/fonts/terminus/ter-528n.pcf.gz
-share/fonts/terminus/ter-532b.pcf.gz
-share/fonts/terminus/ter-532n.pcf.gz
-@comment share/fonts/terminus/ter-712b.pcf.gz
-share/fonts/terminus/ter-712n.pcf.gz
-share/fonts/terminus/ter-714b.pcf.gz
-share/fonts/terminus/ter-714n.pcf.gz
-share/fonts/terminus/ter-716b.pcf.gz
-share/fonts/terminus/ter-716n.pcf.gz
-share/fonts/terminus/ter-718b.pcf.gz
-share/fonts/terminus/ter-718n.pcf.gz
-share/fonts/terminus/ter-720b.pcf.gz
-share/fonts/terminus/ter-720n.pcf.gz
-share/fonts/terminus/ter-722b.pcf.gz
-share/fonts/terminus/ter-722n.pcf.gz
-share/fonts/terminus/ter-724b.pcf.gz
-share/fonts/terminus/ter-724n.pcf.gz
UPDATE: games/lugaru 1.1 -> 1.2
Hello ports@, Please find below a patch taking games/lugaru to 1.2. Most of the changes were in the game files (maps, scripts etc). I took out the COMPILER=gcc since it builds and runs fine with clang (as far as I can tell). In the COMPILING.md file in the upstream repo, they mention that GCC and clang are both supported, so this should be ok. And I want to become this port's maintainer since I am a player of this game (it's great for blowing off steam when you want to beat up some rabbits). ok? diff --git Makefile Makefile index 8551f9dacec..1798109904e 100644 --- Makefile +++ Makefile @@ -2,13 +2,14 @@ COMMENT = third-person rabbit combat action game -DISTNAME = lugaru-1.1 -REVISION = 0 +DISTNAME = lugaru-1.2 CATEGORIES = games HOMEPAGE = https://osslugaru.gitlab.io/ +MAINTAINER = Kaashif Hymabaccus <kaas...@kaashif.co.uk> + # GPLv2+ PERMIT_PACKAGE_CDROM = Yes @@ -21,7 +22,6 @@ EXTRACT_SUFX =.tar.xz MODULES = devel/cmake -COMPILER = gcc RUN_DEPENDS = devel/desktop-file-utils \ x11/gtk+3,-guic LIB_DEPENDS = audio/libvorbis \ diff --git distinfo distinfo index 6b32037c03b..edbed27e5bf 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (lugaru-1.1.tar.xz) = XgD2/GEYV5JsZ0Q1gHMrhGYZ+f9c/hgBsBHHxec4uCw= -SIZE (lugaru-1.1.tar.xz) = 34387008 +SHA256 (lugaru-1.2.tar.xz) = 8+pHfK94kRxpk5+9wWP59lF8fvImfnFqDgUL4aFm75c= +SIZE (lugaru-1.2.tar.xz) = 34519308 diff --git pkg/PLIST pkg/PLIST index 36df618a497..c765aad2adc 100644 --- pkg/PLIST +++ pkg/PLIST @@ -176,36 +176,37 @@ share/lugaru/Dialogues/turner82.txt share/lugaru/Dialogues/turner9.txt share/lugaru/Dialogues/wolfpatrol.txt share/lugaru/Maps/ -share/lugaru/Maps/Start1 -share/lugaru/Maps/Start10 -share/lugaru/Maps/Start11 -share/lugaru/Maps/Start12 -share/lugaru/Maps/Start13 -share/lugaru/Maps/Start14 -share/lugaru/Maps/Start15 -share/lugaru/Maps/Start16 -share/lugaru/Maps/Start17 -share/lugaru/Maps/Start18 -share/lugaru/Maps/Start19 -share/lugaru/Maps/Start2 -share/lugaru/Maps/Start20 -share/lugaru/Maps/Start21 -share/lugaru/Maps/Start22 -share/lugaru/Maps/Start23 -share/lugaru/Maps/Start24 -share/lugaru/Maps/Start25 -share/lugaru/Maps/Start26 -share/lugaru/Maps/Start27 -share/lugaru/Maps/Start28 -share/lugaru/Maps/Start29 -share/lugaru/Maps/Start3 -share/lugaru/Maps/Start30 -share/lugaru/Maps/Start4 -share/lugaru/Maps/Start5 -share/lugaru/Maps/Start6 -share/lugaru/Maps/Start7 -share/lugaru/Maps/Start8 -share/lugaru/Maps/Start9 +share/lugaru/Maps/Lugaru1 +share/lugaru/Maps/Lugaru10 +share/lugaru/Maps/Lugaru11 +share/lugaru/Maps/Lugaru12 +share/lugaru/Maps/Lugaru13 +share/lugaru/Maps/Lugaru14 +share/lugaru/Maps/Lugaru15 +share/lugaru/Maps/Lugaru16 +share/lugaru/Maps/Lugaru17 +share/lugaru/Maps/Lugaru18 +share/lugaru/Maps/Lugaru19 +share/lugaru/Maps/Lugaru2 +share/lugaru/Maps/Lugaru20 +share/lugaru/Maps/Lugaru21 +share/lugaru/Maps/Lugaru22 +share/lugaru/Maps/Lugaru23 +share/lugaru/Maps/Lugaru24 +share/lugaru/Maps/Lugaru25 +share/lugaru/Maps/Lugaru26 +share/lugaru/Maps/Lugaru27 +share/lugaru/Maps/Lugaru28 +share/lugaru/Maps/Lugaru29 +share/lugaru/Maps/Lugaru3 +share/lugaru/Maps/Lugaru30 +share/lugaru/Maps/Lugaru31 +share/lugaru/Maps/Lugaru4 +share/lugaru/Maps/Lugaru5 +share/lugaru/Maps/Lugaru6 +share/lugaru/Maps/Lugaru7 +share/lugaru/Maps/Lugaru8 +share/lugaru/Maps/Lugaru9 share/lugaru/Maps/jendraz1 share/lugaru/Maps/jendraz10 share/lugaru/Maps/jendraz11 @@ -261,7 +262,6 @@ share/lugaru/Maps/map6 share/lugaru/Maps/map7 share/lugaru/Maps/map8 share/lugaru/Maps/map9 -share/lugaru/Maps/raidercamp share/lugaru/Maps/svenalpha share/lugaru/Maps/svencanyon share/lugaru/Maps/svenchasm @@ -430,7 +430,6 @@ share/lugaru/Sounds/Whoosh.ogg share/lugaru/Sounds/WhooshHit.ogg share/lugaru/Sounds/Wind.ogg share/lugaru/Textures/ -share/lugaru/Textures/BW2.jpg share/lugaru/Textures/Belt.png share/lugaru/Textures/Blood.png share/lugaru/Textures/BloodApril.png @@ -451,7 +450,6 @@ share/lugaru/Textures/Break.png share/lugaru/Textures/Bush.png share/lugaru/Textures/BushDesert.png share/lugaru/Textures/BushSnow.png -share/lugaru/Textures/Chocolate.jpg share/lugaru/Textures/ClFeng.png share/lugaru/Textures/ClHuo.png share/lugaru/Textures/ClShan.png @@ -459,8 +457,6 @@ share/lugaru/Textures/ClShui.png share/lugaru/Textures/Cloud.png share/lugaru/Textures/CloudImpact.png share/lugaru/Textures/Cursor.png -share/lugaru/Textures/DarkWolf.jpg -share/lugaru/Textures/David.jpg share/lugaru/Textures/DesertBox.jpg share/lugaru/Textures/DesertCl.png share/lugaru/Textures/DesertTree.png @@ -474,14 +470,28 @@ share/lugaru/Textures/FancyPantsCamoDesert.png share/lugaru/Textures/Fire.jpg share/lugaru/Textures/Flame.png share/lugaru/Textures/Font.png +share/lugaru/Textures/FontMono.png share/lugaru/Textures/FootWrap.png share/lugaru/Textures/Footprint.png share/lugaru/Textures/FootprintSand.png share/lugaru/Textures/F
UPDATE: fonts/terminus-font to 4.46
Hello ports@,
Attached is a patch which brings terminus-font to 4.46.
Changes to the port:
* The build scripts are now written in Python, not Perl
* A lot of obsolete fonts disappeared
The upstream changelog entry is here:
http://terminus-font.sourceforge.net/
The font still works for me. I saw this from last year:
http://marc.info/?l=openbsd-ports=147301603413582=2
Is there still interest in those flavors? Would they be OKed? There
are quite a few optional patches upstream, but providing FLAVORs for
so many of them seems excessive (unless there is demand for it).
diff --git Makefile Makefile
index 5c90bfac485..fd40875c47a 100644
--- Makefile
+++ Makefile
@@ -2,8 +2,7 @@
COMMENT = fixed width fonts especially for long hacking sessions
-DISTNAME = terminus-font-4.40
-REVISION = 0
+DISTNAME = terminus-font-4.46
CATEGORIES = fonts x11
HOMEPAGE = http://terminus-font.sourceforge.net/
@@ -15,6 +14,10 @@ PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=terminus-font/}
+BUILD_DEPENDS =lang/python/3.6
+
+MAKE_FLAGS = INT=python3.6
+
CONFIGURE_STYLE = simple
NO_TEST = Yes
USE_X11 = Yes
diff --git distinfo distinfo
index 32558fe77d6..7165a0fe236 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (terminus-font-4.40.tar.gz) =
ZPUsJNPxweOfIebEMHepvj4h1DhPF29XZsAFWLpnBxE=
-SIZE (terminus-font-4.40.tar.gz) = 558440
+SHA256 (terminus-font-4.46.tar.gz) =
TilDPlaZt23x9cmpbxIozM+OqKFnkc/vBj8rhQbHW80=
+SIZE (terminus-font-4.46.tar.gz) = 590210
diff --git pkg/PLIST pkg/PLIST
index 7d077b84793..be286eb699d 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -3,223 +3,7 @@
share/fonts/
@fontdir share/fonts/terminus/
share/fonts/terminus/fonts.alias-terminus
-@comment share/fonts/terminus/ter-112b.pcf.gz
-share/fonts/terminus/ter-112n.pcf.gz
-share/fonts/terminus/ter-114b.pcf.gz
-share/fonts/terminus/ter-114n.pcf.gz
-share/fonts/terminus/ter-116b.pcf.gz
-share/fonts/terminus/ter-116n.pcf.gz
-share/fonts/terminus/ter-118b.pcf.gz
-share/fonts/terminus/ter-118n.pcf.gz
-share/fonts/terminus/ter-120b.pcf.gz
-share/fonts/terminus/ter-120n.pcf.gz
-share/fonts/terminus/ter-122b.pcf.gz
-share/fonts/terminus/ter-122n.pcf.gz
-share/fonts/terminus/ter-124b.pcf.gz
-share/fonts/terminus/ter-124n.pcf.gz
-share/fonts/terminus/ter-128b.pcf.gz
-share/fonts/terminus/ter-128n.pcf.gz
-share/fonts/terminus/ter-132b.pcf.gz
-share/fonts/terminus/ter-132n.pcf.gz
-@comment share/fonts/terminus/ter-212b.pcf.gz
-share/fonts/terminus/ter-212n.pcf.gz
-share/fonts/terminus/ter-214b.pcf.gz
-share/fonts/terminus/ter-214n.pcf.gz
-share/fonts/terminus/ter-216b.pcf.gz
-share/fonts/terminus/ter-216n.pcf.gz
-share/fonts/terminus/ter-218b.pcf.gz
-share/fonts/terminus/ter-218n.pcf.gz
-share/fonts/terminus/ter-220b.pcf.gz
-share/fonts/terminus/ter-220n.pcf.gz
-share/fonts/terminus/ter-222b.pcf.gz
-share/fonts/terminus/ter-222n.pcf.gz
-share/fonts/terminus/ter-224b.pcf.gz
-share/fonts/terminus/ter-224n.pcf.gz
-share/fonts/terminus/ter-228b.pcf.gz
-share/fonts/terminus/ter-228n.pcf.gz
-share/fonts/terminus/ter-232b.pcf.gz
-share/fonts/terminus/ter-232n.pcf.gz
-@comment share/fonts/terminus/ter-512b.pcf.gz
-share/fonts/terminus/ter-512n.pcf.gz
-share/fonts/terminus/ter-514b.pcf.gz
-share/fonts/terminus/ter-514n.pcf.gz
-share/fonts/terminus/ter-516b.pcf.gz
-share/fonts/terminus/ter-516n.pcf.gz
-share/fonts/terminus/ter-518b.pcf.gz
-share/fonts/terminus/ter-518n.pcf.gz
-share/fonts/terminus/ter-520b.pcf.gz
-share/fonts/terminus/ter-520n.pcf.gz
-share/fonts/terminus/ter-522b.pcf.gz
-share/fonts/terminus/ter-522n.pcf.gz
-share/fonts/terminus/ter-524b.pcf.gz
-share/fonts/terminus/ter-524n.pcf.gz
-share/fonts/terminus/ter-528b.pcf.gz
-share/fonts/terminus/ter-528n.pcf.gz
-share/fonts/terminus/ter-532b.pcf.gz
-share/fonts/terminus/ter-532n.pcf.gz
-@comment share/fonts/terminus/ter-712b.pcf.gz
-share/fonts/terminus/ter-712n.pcf.gz
-share/fonts/terminus/ter-714b.pcf.gz
-share/fonts/terminus/ter-714n.pcf.gz
-share/fonts/terminus/ter-716b.pcf.gz
-share/fonts/terminus/ter-716n.pcf.gz
-share/fonts/terminus/ter-718b.pcf.gz
-share/fonts/terminus/ter-718n.pcf.gz
-share/fonts/terminus/ter-720b.pcf.gz
-share/fonts/terminus/ter-720n.pcf.gz
-share/fonts/terminus/ter-722b.pcf.gz
-share/fonts/terminus/ter-722n.pcf.gz
-share/fonts/terminus/ter-724b.pcf.gz
-share/fonts/terminus/ter-724n.pcf.gz
-share/fonts/terminus/ter-728b.pcf.gz
-share/fonts/terminus/ter-728n.pcf.gz
-share/fonts/terminus/ter-732b.pcf.gz
-share/fonts/terminus/ter-732n.pcf.gz
-@comment share/fonts/terminus/ter-912b.pcf.gz
-share/fonts/terminus/ter-912n.pcf.gz
-share/fonts/terminus/ter-914b.pcf.gz
-share/fonts/terminus/ter-914n.pcf.gz
-share/fonts/terminus/ter-916b.pcf.gz
-share/fonts/terminus/ter-916n.pcf.gz
-share/fonts/terminus/ter-918b.pcf.gz
-share/fonts/terminus/ter-918n.pcf.gz
-share/fonts/terminus/ter-920b.pcf.gz
Re: NEW: x11/wmutils
On Sat, Jul 29, 2017 at 05:16:24PM -0400, Brian Callahan wrote:
> Some notes:
> core/Makefile:
> * 1.4 is used twice, so make it into a V = 1.4 variable at the top of the
> Makefile
> * You already have CATEGORIES, MAINTAINER, and NO_TEST in the top-level
> Makefile, don't repeat them here.
> * You can get rid of the MAKE_ENV line and make the MAKE_FLAGS line:
> MAKE_FLAGS = CFLAGS="${CFLAGS} -I${X11BASE}/include" \
> LDFLAGS="-L${X11BASE}/lib -lxcb -lxcb-util"
> to achieve the same effect in fewer lines.
> * We prefer sed to perl in the post-patch line.
>
> opt/Makefile:
> * 1.0 is used twice, make it into V = 1.0 at the top of the Makefile
> * Remove CATEGORIES, MAINTAINER, and NO_TEST
> * Remove MAKE_ENV and change the MAKE_FLAGS line to be like core/Makefile
> above.
>
> ~Brian
Please find attached an updated version which addresses these
concerns.
Also, I moved all of the common variables into the toplevel makefile.
I saw this email first, so I used bcallah@'s suggestion of a V
variable instead of sthen@'s suggestion.
--
Kaashif Hymabaccus
GPG: 3E810B04
wmutils.tgz
Description: application/tar-gz
Re: NEW: x11/wmutils
Hello everyone, Please find attached an updated port, incorporating the advice from bcallah@ and sthen@. * Port now split into wmutils/core and wmutils/opt * lsw renamed to lswin, wtf renamed to wintf * extra newline removed from wmutils/core/pkg/DESCR Carolyn (and ports@), please tell me what you think. Since you were making a port, I assume you use the programs. If you have any experience testing the programs in wmutils/opt, please tell me if there are any patches needed to fix bugs etc, I have only ever used the wmutils/core programs and only just now tried out the opt programs. -- Kaashif Hymabaccus GPG: 3E810B04 wmutils.tgz Description: application/tar-gz
NEW: x11/wmutils
Hello ports@, Please find attached a port for wmutils, a set of programs for manipulating and getting information about windows. pkg/DESCR: wmutils is a set of tools for X windows manipulation. Each tool only has one purpose, to make it as flexible and reliable as possible. This package includes tools to list, kill, move, teleport, focus and resize windows, and more. -- Kaashif Hymabaccus GPG: 3E810B04 wmutils.tgz Description: application/tar-gz
UPDATE: plan9/9menu 1.7 -> 1.9
Hello ports@, This is an update for 9menu to 1.9. Also, neither version 1.8 nor version 1.9 was committed before now (despite 1.8 being released 13 years ago and 1.9 2 years ago), so I want to become the maintainer since I use this program dozens of times per day and it is in my self-interest to keep it up-to-date and fix issues. ok? diff --git Makefile Makefile index a73e2d2f83e..e6d08c1bd76 100644 --- Makefile +++ Makefile @@ -2,9 +2,9 @@ COMMENT= simple menu patterned after plan9 -DISTNAME= 9menu-1.7 -REVISION = 1 +DISTNAME= 9menu-1.9 CATEGORIES=plan9 +MAINTAINER=Kaashif Hymabaccus <kaas...@kaashif.co.uk> MASTER_SITES= ftp://ftp.freefriends.org/arnold/Source/ diff --git distinfo distinfo index 14a3ec8431b..43c734d0f96 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (9menu-1.7.shar.gz) = HfNOQQCIk6Nsc9i85IHoYhO396Au6w6z5t+QRe78h2M= -SIZE (9menu-1.7.shar.gz) = 8854 +SHA256 (9menu-1.9.shar.gz) = rI6lUZFEi4u4X7OBTbN5bzsEofuitpDqOIeazhy/1Vk= +SIZE (9menu-1.9.shar.gz) = 9233
Re: NEW: x11/2bwm
On Wed, Jul 26, 2017 at 10:09:33PM +0200, Jeremie Courreges-Anglas wrote: > > This looks fine to me. Here's an updated tarball that removes -Os -s > from the CFLAGS. Also, the Makefile provides a way to specify the > location of the X11 headers. > Thanks for the feedback. Your updated tarball looks good to me. Certainly, -Os was not integral to the running of the program. -- Kaashif Hymabaccus GPG: 3E810B04
NEW: x11/2bwm
Hello ports@, Please find attached a port for 2bwm, a window manager. DESCR (copied from the README in the distfile): Fast floating WM, with the particularity that windows have 2 borders, written over the XCB library and derived from mcwm written by Michael Cardell. In 2bwm everything is accessible from the keyboard but a pointing device can be used for move, resize and raise/lower. -- Kaashif Hymabaccus GPG: 3E810B04 2bwm.tgz Description: application/tar-gz
UPDATE: xfishtank to 2.5
Hello ports@,
Yes, xfishtank has actually had updates recently. Someone took
ownership of the project and a few people patched it a bit so it
worked on more modern operating systems (hence none of the old patches
are needed).
According to the LICENSE file:
I tracked down John Bradley <brad...@trilon.com>, who wrote the
xfish program back around 1987, that xfishtank is derived from. He
stated the following copyright:
> It doesn't have one - do whatever you'd like with it. Enjoy!
>
> --jhb
This is not a real license, but it does imply we are allowed to
distribute it, correct? This is why I set PERMIT_* to Yes. The rest of
the program (written by other authors from 1988 onwards) is under a
permissive license, so should be ok.
Works on amd64.
diff --git Makefile Makefile
index eba5a1b45a4..6833eb54829 100644
--- Makefile
+++ Makefile
@@ -2,23 +2,20 @@
COMMENT= fish swim in the background of your screen
-DISTNAME= xfishtank-2.2
-REVISION= 1
CATEGORIES=x11
+HOMEPAGE= http://jim.rees.org/computers/xfishtank.html
+MAINTAINER=Kaashif Hymabaccus <kaas...@kaashif.co.uk>
-MASTER_SITES= http://distcache.freebsd.org/ports-distfiles/
+GH_ACCOUNT=jim-rees
+GH_PROJECT=xfishtank
+GH_TAGNAME=v2.5
-PERMIT_PACKAGE_CDROM= no license
-PERMIT_PACKAGE_FTP=no license
-PERMIT_DISTFILES_FTP= no license
+PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= X11 Xau Xdmcp Xext c m
+WANTLIB= X11 Xau Xdmcp Xext c m Imlib2
+LIB_DEPENDS= graphics/imlib2
-CONFIGURE_STYLE= imake noman
-WRKDIST= ${WRKDIR}/xfishtank2.0
-
-post-patch:
- @cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} clean
+CONFIGURE_STYLE= imake
NO_TEST= Yes
diff --git distinfo distinfo
index 5a578d98550..d1b6f90033a 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (xfishtank-2.2.tar.gz) = Q5EijAdPzNc6nqgzLgkOktebon+eY2kwNfOSOH0DEiw=
-SIZE (xfishtank-2.2.tar.gz) = 360031
+SHA256 (xfishtank-2.5.tar.gz) = vYzjxOetsOYrKU3jB5csDV4qRCsJTBeKO+CE4+JqCOA=
+SIZE (xfishtank-2.5.tar.gz) = 153554
diff --git patches/patch-Imakefile patches/patch-Imakefile
index 18e2571dd34..c89f354545a 100644
--- patches/patch-Imakefile
+++ patches/patch-Imakefile
@@ -1,18 +1,14 @@
-$OpenBSD: patch-Imakefile,v 1.1 2007/10/26 23:54:56 ajacoutot Exp $
Imakefile.orig Wed Dec 16 01:04:35 1992
-+++ Imakefile Sat Oct 27 01:50:24 2007
-@@ -2,12 +2,12 @@
+$OpenBSD$
+
+Index: Imakefile
+--- Imakefile.orig
Imakefile
+@@ -1,7 +1,7 @@
+ EXTRA_INCLUDES = -I./fishmaps
LOCAL_LIBRARIES = $(XLIB)
DEPLIBS = $(DEPXLIB)
- SYS_LIBRARIES = -lm
--CDEBUGFLAGS = -g
-+XCOMMCDEBUGFLAGS = -g
+- SYS_LIBRARIES = -lImlib2 -lm
++ SYS_LIBRARIES = -L/usr/X11R6/lib -L/usr/local/lib -lImlib2 -lm
+MANSRCSUFFIX = 1x
-SRCS = xfish.c medcut.c read.c gifread.c
-OBJS = xfish.o medcut.o read.o gifread.o
-
--ComplexProgramTarget(xfishtank)
-+ComplexProgramTargetNoMan(xfishtank)
-
- xfishy.h: makeh FishList
- ./makeh > xfishy.h
+SRCS = xfish.c medcut.c
diff --git patches/patch-gifread_c patches/patch-gifread_c
deleted file mode 100644
index 5d3fd9cfaf8..000
--- patches/patch-gifread_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-gifread_c,v 1.1 2008/07/28 22:29:49 sthen Exp $
gifread.c.orig Mon Jul 28 20:58:24 2008
-+++ gifread.c Mon Jul 28 20:58:41 2008
-@@ -56,6 +56,7 @@
-
- #include
- #include
-+#include
- #if defined(SYSV) || defined(SVR4)
- #include
- #else /* SYSV */
diff --git patches/patch-makeh_c patches/patch-makeh_c
deleted file mode 100644
index 035ba7ac187..000
--- patches/patch-makeh_c
+++ /dev/null
@@ -1,10 +0,0 @@
-$OpenBSD: patch-makeh_c,v 1.1 2008/07/28 22:29:49 sthen Exp $
makeh.c.orig Mon Jul 28 20:54:02 2008
-+++ makeh.cMon Jul 28 20:54:11 2008
-@@ -1,5 +1,6 @@
-
- #include
-+#include
-
- main()
- {
diff --git patches/patch-medcut_c patches/patch-medcut_c
deleted file mode 100644
index cf8b21288c7..000
--- patches/patch-medcut_c
+++ /dev/null
@@ -1,9 +0,0 @@
-$OpenBSD: patch-medcut_c,v 1.1 2008/07/28 22:29:49 sthen Exp $
medcut.c.orig Mon Jul 28 20:57:39 2008
-+++ medcut.c Mon Jul 28 20:57:44 2008
-@@ -1,4 +1,5 @@
- #include
-+#include
- #include "medcut.h"
-
- #define RED 0
diff --git patches/patch-read_c patches/patch-read_c
deleted file mode 100644
index 9d5bf6c4fd0..000
--- patches/patch-read_c
+++ /dev/null
@@ -1,10 +0,0 @@
-$OpenBSD: patch-read_c,v 1.1 2008/07/28 22:29:49 sthen Exp $
read.c.origMon Jul 28 20:58:19 2008
-+++ read.c Mon Jul 28 20:58:45 2008
-@@ -1,5 +1,6 @@
- #include
- #include
-+#include
- #include "compact.h"
- #include "medcut.h"
-
diff --git patches/patch-xfish_c patches/patch-xfish_c
deleted file mode 100644
index a7f865f30ec..000
--- patches/patch-xfish_c
+++ /dev/null
@@ -1,333 +0,0 @@
-$OpenBSD: patch-xfish_c,v 1.2 2
UPDATE: gcal to 4.1
Hello ports@, This updates gcal from 3.6.3 to 4.1. Builds and runs ok on amd64. ok? diff --git Makefile Makefile index b205c86b0ca..3986cb59439 100644 --- Makefile +++ Makefile @@ -2,8 +2,7 @@ COMMENT = calculate and print calendars -DISTNAME = gcal-3.6.3 -REVISION = 1 +DISTNAME = gcal-4.1 CATEGORIES = astro HOMEPAGE = https://www.gnu.org/software/gcal/ diff --git distinfo distinfo index 5a1b519c015..749dd3e4563 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (gcal-3.6.3.tar.gz) = nZvmCEEVClxg4n/F4PLAbAZjWsRMGGmNakjve7R7qG0= -SIZE (gcal-3.6.3.tar.gz) = 2994182 +SHA256 (gcal-4.1.tar.gz) = NjzbAWElvWTP5fyqKLS4KP3+iLHudtn1i6nqEgWHuzk= +SIZE (gcal-4.1.tar.gz) = 3100539 diff --git pkg/PLIST pkg/PLIST index 246b191e37b..7dd28b19ae7 100644 --- pkg/PLIST +++ pkg/PLIST @@ -108,3 +108,4 @@ share/locale/rw/LC_MESSAGES/ share/locale/rw/LC_MESSAGES/gcal.mo share/locale/sv/LC_MESSAGES/gcal.mo share/locale/tr/LC_MESSAGES/gcal.mo +share/locale/zh_CN/LC_MESSAGES/gcal.mo
UPDATE: sysutils/pv to 1.6.6
Hello ports@, This updates pv to 1.6.6. diff --git Makefile Makefile index fea773fedb6..14c9d591557 100644 --- Makefile +++ Makefile @@ -2,7 +2,7 @@ COMMENT = monitor the progress of data through a pipeline -DISTNAME = pv-1.6.0 +DISTNAME = pv-1.6.6 CATEGORIES = sysutils HOMEPAGE = http://www.ivarch.com/programs/pv.shtml diff --git distinfo distinfo index 0c144a6a7aa..51f8d10f17f 100644 --- distinfo +++ distinfo @@ -1,2 +1,2 @@ -SHA256 (pv-1.6.0.tar.gz) = ndRTkYBrDtIVq+5MWsFZfQGMOG/pwfWv0va8Owf9gsM= -SIZE (pv-1.6.0.tar.gz) = 123072 +SHA256 (pv-1.6.6.tar.gz) = lN77QYOuB8RCGbopjUPEmR1uIDwp90OT1y7K07CQUIo= +SIZE (pv-1.6.6.tar.gz) = 124851
UPDATE: x11/i3lock 2.9.1
Hello ports@,
This updates x11/i3lock from some commmit to 2.9.1. All of jasper@'s
patches were accepted upstream, so there is no need for them.
They did revert an old commit which ended up readding -lpam in the
Makefile, unconditionally, so we still have to patch that out. I will
submit a PR upstream and hopefully the next release will be
patch-free.
OK?
Index: Makefile
===
RCS file: /cvs/ports/x11/i3lock/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 Makefile
--- Makefile15 Apr 2017 12:53:02 - 1.1.1.1
+++ Makefile9 Jul 2017 15:17:58 -
@@ -2,11 +2,11 @@
COMMENT = improved screen locker
+VERSION = 2.9.1
GH_ACCOUNT = i3
GH_PROJECT = i3lock
-# XXX: Remove when upgrading
-GH_COMMIT =80d4452ec680bcb0e57418f69d44d88ded82047c
-DISTNAME = i3lock-2.9
+GH_TAGNAME = ${VERSION}
+DISTNAME = i3lock-${VERSION}
CATEGORIES = x11
Index: distinfo
===
RCS file: /cvs/ports/x11/i3lock/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- distinfo6 May 2017 15:10:18 - 1.2
+++ distinfo9 Jul 2017 15:17:58 -
@@ -1,2 +1,2 @@
-SHA256 (i3lock-2.9-80d4452e.tar.gz) =
IrR9TeilPaU6myyezcWpbQhB3iQHNGAR+ycutlEBZRE=
-SIZE (i3lock-2.9-80d4452e.tar.gz) = 23692
+SHA256 (i3lock-2.9.1.tar.gz) = mY50R3gTvJxti9V6lFVBQA996Ny4mE8U1Lb4pSje7/c=
+SIZE (i3lock-2.9.1.tar.gz) = 24108
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/x11/i3lock/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-Makefile
--- patches/patch-Makefile 15 Apr 2017 12:53:02 - 1.1.1.1
+++ patches/patch-Makefile 9 Jul 2017 15:17:58 -
@@ -1,29 +1,11 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2017/04/15 12:53:02 jasper Exp $
-
-Add bsd_auth(3) support.
-
Makefile.orig Sun Mar 26 15:01:23 2017
-+++ Makefile Fri Apr 14 19:44:10 2017
-@@ -1,4 +1,5 @@
- TOPDIR=$(shell pwd)
-+UNAME=$(shell uname)
-
- INSTALL=install
- PREFIX=/usr
-@@ -16,9 +17,15 @@ CFLAGS += -Wall
+$OpenBSD$
+--- Makefile.orig Sun Jul 9 16:45:41 2017
Makefile Sun Jul 9 16:45:53 2017
+@@ -17,7 +17,6 @@ CFLAGS += -Wall
CPPFLAGS += -D_GNU_SOURCE
- CFLAGS += $(shell $(PKG_CONFIG) --cflags cairo xcb-composite xcb-dpms
xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
- LIBS += $(shell $(PKG_CONFIG) --libs cairo xcb-composite xcb-dpms
xcb-xinerama xcb-atom xcb-image xcb-xkb xkbcommon xkbcommon-x11)
+ CFLAGS += $(shell $(PKG_CONFIG) --cflags cairo xcb-xinerama xcb-atom
xcb-image xcb-xkb xkbcommon xkbcommon-x11)
+ LIBS += $(shell $(PKG_CONFIG) --libs cairo xcb-xinerama xcb-atom xcb-image
xcb-xkb xkbcommon xkbcommon-x11)
-LIBS += -lpam
LIBS += -lev
LIBS += -lm
-+
-+# OpenBSD lacks PAM, use bsd_auth(3) instead.
-+ifeq ($(UNAME),OpenBSD)
-+ CPPFLAGS += -DUSE_BSDAUTH
-+else
-+ LIBS += -lpam
-+endif
- FILES:=$(wildcard *.c)
- FILES:=$(FILES:.c=.o)
Index: patches/patch-i3lock_c
===
RCS file: patches/patch-i3lock_c
diff -N patches/patch-i3lock_c
--- patches/patch-i3lock_c 15 Apr 2017 12:53:02 - 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,231 +0,0 @@
-$OpenBSD: patch-i3lock_c,v 1.1.1.1 2017/04/15 12:53:02 jasper Exp $
-
-Add bsd_auth(3) support.
-
i3lock.c.orig Sun Mar 26 15:01:23 2017
-+++ i3lock.c Fri Apr 14 19:42:14 2017
-@@ -18,7 +18,12 @@
- #include
- #include
- #include
-+#ifdef USE_BSDAUTH
-+#include
-+#include
-+#else
- #include
-+#endif
- #include
- #include
- #include
-@@ -29,6 +34,9 @@
- #include
- #include
-
-+#ifdef __OpenBSD__
-+#include /* explicit_bzero(3) */
-+#endif
- #include "i3lock.h"
- #include "xcb.h"
- #include "cursors.h"
-@@ -49,7 +57,9 @@ char color[7] = "ff";
- uint32_t last_resolution[2];
- xcb_window_t win;
- static xcb_cursor_t cursor;
-+#ifndef USE_BSDAUTH
- static pam_handle_t *pam_handle;
-+#endif /* !USE_BSDAUTH */
- int input_position = 0;
- /* Holds the password you enter (in UTF-8). */
- static char password[512];
-@@ -59,11 +69,11 @@ bool unlock_indicator = true;
- char *modifier_string = NULL;
- static bool dont_fork = false;
- struct ev_loop *main_loop;
--static struct ev_timer *clear_pam_wrong_timeout;
-+static struct ev_timer *clear_auth_wrong_timeout;
- static struct ev_timer *clear_indicator_timeout;
- static struct ev_timer *discard_passwd_timeout;
- extern unlock_state_t unlock_state;
--extern pam_state_t pam_state;
-+extern auth_state_t auth_state;
- int failed_attempts = 0;
- bool show_failed_attempts = false;
- bool retry_verification = false;
-@@ -158,6 +168,9 @@ static bool load_compose_table(const char *locale) {
- *
- */
- static void clear_password_memory(void) {
UPDATE: discount 2.1.6 - 2.1.8a
Hello ports@, This updates discount from 2.1.6 to 2.1.8a. The binary is (still) renamed from markdown to discount to avoid collision with textproc/markdown. Passes all tests on amd64. OK? -- Kaashif Hymabaccus GPG: 3E810B04 Index: Makefile === RCS file: /cvs/ports/textproc/discount/Makefile,v retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile1 Nov 2014 11:06:55 - 1.7 +++ Makefile13 Jun 2015 14:48:59 - @@ -2,7 +2,7 @@ COMMENT = fast C implementation of Markdown -DISTNAME = discount-2.1.6 +DISTNAME = discount-2.1.8a EXTRACT_SUFX = .tar.bz2 CATEGORIES = textproc Index: distinfo === RCS file: /cvs/ports/textproc/discount/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo1 Nov 2014 11:06:55 - 1.3 +++ distinfo13 Jun 2015 14:48:59 - @@ -1,2 +1,2 @@ -SHA256 (discount-2.1.6.tar.bz2) = cCuynhfjh/guQPrgYtXkk5vG+yLc9T5hCZgqX6oRB5Y= -SIZE (discount-2.1.6.tar.bz2) = 83823 +SHA256 (discount-2.1.8a.tar.bz2) = wBUC9O7bqBY9zTDGE7pe4jigaPdSkb4SeFYmFyfgNSY= +SIZE (discount-2.1.8a.tar.bz2) = 85161 Index: patches/patch-Makefile_in === RCS file: /cvs/ports/textproc/discount/patches/patch-Makefile_in,v retrieving revision 1.3 diff -u -p -r1.3 patch-Makefile_in --- patches/patch-Makefile_in 1 Nov 2014 11:06:55 - 1.3 +++ patches/patch-Makefile_in 13 Jun 2015 14:48:59 - @@ -1,6 +1,6 @@ -$OpenBSD: patch-Makefile_in,v 1.3 2014/11/01 11:06:55 jca Exp $ Makefile.in.orig Sat Aug 16 12:01:00 2014 -+++ Makefile.inSat Aug 16 12:03:28 2014 +$OpenBSD$ +--- Makefile.in.orig Sat Jun 13 15:27:59 2015 Makefile.inSat Jun 13 15:28:45 2015 @@ -9,7 +9,7 @@ MANDIR=@mandir@ LIBDIR=@libdir@ INCDIR=@prefix@/include @@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile_in,v 1.3 2014/1 SAMPLE_PGMS=mkd2html makepage @THEME@SAMPLE_PGMS+= theme MKDLIB=libmarkdown -@@ -50,7 +50,8 @@ install.man: +@@ -52,7 +52,8 @@ install.man: @INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man7 @INSTALL_DATA@ markdown.7 mkd-extensions.7 $(DESTDIR)$(MANDIR)/man7 @INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man1 @@ -20,14 +20,14 @@ $OpenBSD: patch-Makefile_in,v 1.3 2014/1 install.everything: install install.man -@@ -82,8 +83,8 @@ blocktags: mktags +@@ -84,8 +85,8 @@ blocktags: mktags mkd2html: mkd2html.o $(MKDLIB) mkdio.h - $(CC) $(LFLAGS) -o mkd2html mkd2html.o -lmarkdown @LIBS@ + $(CC) $(CFLAGS) $(LFLAGS) -o mkd2html mkd2html.o -lmarkdown @LIBS@ -markdown: main.o pgm_options.o $(MKDLIB) -- $(CC) $(LFLAGS) -o markdown main.o pgm_options.o -lmarkdown @LIBS@ +- $(CC) $(CFLAGS) $(LFLAGS) -o markdown main.o pgm_options.o -lmarkdown @LIBS@ +discount: main.o pgm_options.o $(MKDLIB) -+ $(CC) $(LFLAGS) -o discount main.o pgm_options.o -lmarkdown @LIBS@ ++ $(CC) $(CFLAGS) $(LFLAGS) -o discount main.o pgm_options.o -lmarkdown @LIBS@ makepage: makepage.c pgm_options.o $(MKDLIB) mkdio.h - $(CC) $(LFLAGS) -o makepage makepage.c pgm_options.o -lmarkdown @LIBS@ + $(CC) $(CFLAGS) $(LFLAGS) -o makepage makepage.c pgm_options.o -lmarkdown @LIBS@
NEW: x11/sxhkd
Hello ports@, sxhkd is a simple X hotkey daemon, similar in function to xbindkeys. Works fine on amd64. -- Kaashif Hymabaccus GPG: 3E810B04 sxhkd.tgz Description: application/tar-gz
UPDATE: discount 1.6.6 - 2.1.6
Hello ports@,
This patch brings discount from 1.6.6 (very old) to 2.1.6. Just like
before, the binary is renamed from markdown to discount to avoid
conflict with other ports.
All tests pass on amd64.
ok?
Index: Makefile
===
RCS file: /cvs/ports/textproc/discount/Makefile,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile
--- Makefile11 Mar 2013 11:42:41 - 1.6
+++ Makefile16 Aug 2014 11:54:43 -
@@ -2,7 +2,9 @@
COMMENT = fast C implementation of Markdown
-DISTNAME = discount-1.6.6
+DISTNAME = discount-2.1.6
+EXTRACT_SUFX = .tar.bz2
+
CATEGORIES = textproc
HOMEPAGE = http://www.pell.portland.or.us/~orc/Code/markdown/
@@ -14,22 +16,16 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB += c
-# Stupid github.
-MASTER_SITES = http://distfiles.nl/
-WRKDIST = ${WRKDIR}/Orc-discount-9dabdb8
+MASTER_SITES = http://www.pell.portland.or.us/~orc/Code/discount/
CONFIGURE_STYLE = simple
CONFIGURE_SCRIPT = configure.sh
CONFIGURE_ARGS += ${CONFIGURE_SHARED}
-BUILD_DEPENDS =archivers/gtar
-TAR = ${LOCALBASE}/bin/gtar
-
INSTALL_TARGET = install.everything
-TEST_TARGET = test
-USE_GROFF =Yes
+TEST_TARGET = test
pre-configure:
- @perl -pi -e 's,\./markdown,\./discount,' ${WRKSRC}/tests/*.t
+ @perl -pi -e 's,\./markdown,\./discount,' ${WRKSRC}/tests/*
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/textproc/discount/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- distinfo30 Aug 2010 21:40:29 - 1.2
+++ distinfo16 Aug 2014 11:54:43 -
@@ -1,5 +1,2 @@
-MD5 (discount-1.6.6.tar.gz) = wFy4BL31ATrqLoFuXSIz1w==
-RMD160 (discount-1.6.6.tar.gz) = a+hDjXvYYgHgTy5b/D5HRi13mvI=
-SHA1 (discount-1.6.6.tar.gz) = Ii8ka+XoKlEKT191HDm5/VvU1b0=
-SHA256 (discount-1.6.6.tar.gz) = 1Zu9/eQY80h6v88kH7l8h9cuXL3KiHPQDO05w+7bgnc=
-SIZE (discount-1.6.6.tar.gz) = 93003
+SHA256 (discount-2.1.6.tar.bz2) = cCuynhfjh/guQPrgYtXkk5vG+yLc9T5hCZgqX6oRB5Y=
+SIZE (discount-2.1.6.tar.bz2) = 83823
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/textproc/discount/patches/patch-Makefile_in,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-Makefile_in
--- patches/patch-Makefile_in 30 Aug 2010 21:40:29 - 1.2
+++ patches/patch-Makefile_in 16 Aug 2014 11:54:43 -
@@ -1,7 +1,7 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2010/08/30 21:40:29 jasper Exp $
Makefile.in.orig Thu Jun 17 03:14:33 2010
-+++ Makefile.inMon Aug 30 15:01:46 2010
-@@ -7,7 +7,7 @@ MANDIR=@mandir@
+$OpenBSD$
+--- Makefile.in.orig Sat Aug 16 12:01:00 2014
Makefile.inSat Aug 16 12:03:28 2014
+@@ -9,7 +9,7 @@ MANDIR=@mandir@
LIBDIR=@libdir@
INCDIR=@prefix@/include
@@ -9,24 +9,25 @@ $OpenBSD: patch-Makefile_in,v 1.2 2010/0
+PGMS=discount
SAMPLE_PGMS=mkd2html makepage
@THEME@SAMPLE_PGMS+= theme
- MKDLIB=libmarkdown.a
-@@ -47,15 +47,16 @@ install.man:
- @INSTALL_DIR@ $(DESTDIR)/$(MANDIR)/man7
- @INSTALL_DATA@ markdown.7 mkd-extensions.7 $(DESTDIR)/$(MANDIR)/man7
- @INSTALL_DIR@ $(DESTDIR)/$(MANDIR)/man1
-- @INSTALL_DATA@ markdown.1 $(DESTDIR)/$(MANDIR)/man1
+ MKDLIB=libmarkdown
+@@ -50,7 +50,8 @@ install.man:
+ @INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man7
+ @INSTALL_DATA@ markdown.7 mkd-extensions.7 $(DESTDIR)$(MANDIR)/man7
+ @INSTALL_DIR@ $(DESTDIR)$(MANDIR)/man1
+- @INSTALL_DATA@ markdown.1 $(DESTDIR)$(MANDIR)/man1
+ @mv markdown.1 discount.1
-+ @INSTALL_DATA@ discount.1 $(DESTDIR)/$(MANDIR)/man1
++ @INSTALL_DATA@ discount.1 $(DESTDIR)$(MANDIR)/man1
install.everything: install install.man
- version.o: version.c VERSION
- $(CC) -DVERSION=\`cat VERSION`\ -c version.c
+@@ -82,8 +83,8 @@ blocktags: mktags
+ mkd2html: mkd2html.o $(MKDLIB) mkdio.h
+ $(CC) $(LFLAGS) -o mkd2html mkd2html.o -lmarkdown @LIBS@
--markdown: main.o $(MKDLIB)
-- $(CC) -o markdown main.o -lmarkdown @LIBS@
-+discount: main.o $(MKDLIB)
-+ $(CC) -o discount main.o -lmarkdown @LIBS@
-
- # example programs
- @THEME@theme: theme.o $(MKDLIB) mkdio.h
+-markdown: main.o pgm_options.o $(MKDLIB)
+- $(CC) $(LFLAGS) -o markdown main.o pgm_options.o -lmarkdown @LIBS@
++discount: main.o pgm_options.o $(MKDLIB)
++ $(CC) $(LFLAGS) -o discount main.o pgm_options.o -lmarkdown @LIBS@
+
+ makepage: makepage.c pgm_options.o $(MKDLIB) mkdio.h
+ $(CC) $(LFLAGS) -o makepage makepage.c pgm_options.o -lmarkdown @LIBS@
Index: patches/patch-cstring_h
===
RCS file: /cvs/ports/textproc/discount/patches/patch-cstring_h,v
retrieving revision 1.2
diff -u -p -u
Re: Screen sharing program
On Thu, May 29, 2014 at 03:21:16PM +0100, Stuart Henderson wrote: On 2014/05/29 10:10, Jiri B wrote: On Thu, May 29, 2014 at 01:44:35PM +0100, Kaashif Hymabaccus wrote: I've searched the internet for screen sharing programs (like Teamviewer, for example) that work on OpenBSD and haven't found anything. All of the web-based solutions require a download of some proprietary plugin (join.me, Google Hangouts) and I can't find anything that will let me share my screen with other (not tech-savvy) people. Should I install a VNC server or is there another solution? If that is the only way, the people I'd want to share with would say that it'd be easier (for them) if I used Linux or Windows and installed the Hangouts plugin, but I'd rather not do that. * r/o - x11vnc * r/w - x11vnc, try http://bigbluebutton.org/overview/ j. Console or X? If it's console, shared tmux/screen sessions are good. You know, I hadn't thought of that. I'm fairly sure using tmux and ssh would be satisfactory and the people I work with who use Windows tend to have PuTTY installed, so the only setup needed would be on my side. Thanks for the suggestion.
Screen sharing program
I've searched the internet for screen sharing programs (like Teamviewer, for example) that work on OpenBSD and haven't found anything. All of the web-based solutions require a download of some proprietary plugin (join.me, Google Hangouts) and I can't find anything that will let me share my screen with other (not tech-savvy) people. Should I install a VNC server or is there another solution? If that is the only way, the people I'd want to share with would say that it'd be easier (for them) if I used Linux or Windows and installed the Hangouts plugin, but I'd rather not do that.
[UPDATE] stow-2.2.0
Hello,
This is an update for GNU Stow from 1.3.3 to 2.2.0. OK?
Index: Makefile
===
RCS file: /cvs/ports/sysutils/stow/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile1 Jan 2014 20:46:29 - 1.9
+++ Makefile13 May 2014 21:24:40 -
@@ -1,20 +1,20 @@
# $OpenBSD: Makefile,v 1.9 2014/01/01 20:46:29 naddy Exp $
COMMENT= manages software package installations with symlinks
-
-DISTNAME= stow-1.3.3
-REVISION = 1
+DISTNAME= stow-2.2.0
CATEGORIES=sysutils
-HOMEPAGE= https://www.gnu.org/software/stow/stow.html
-
+HOMEPAGE= http://www.gnu.org/software/stow/stow.html
MAINTAINER=Andreas Kahari andreas.kah...@gmail.com
-# GPL
+# GPLv3
PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${MASTER_SITE_GNU:=stow/}
+TEST_DEPENDS= devel/p5-Test-Output
+
+USE_GMAKE= Yes
CONFIGURE_STYLE=gnu
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/sysutils/stow/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo5 Apr 2007 17:26:13 - 1.3
+++ distinfo13 May 2014 21:24:40 -
@@ -1,5 +1,2 @@
-MD5 (stow-1.3.3.tar.gz) = WaB4xwVt2d2X+3BwY7adAw==
-RMD160 (stow-1.3.3.tar.gz) = qxksPHCcEeCn057I3iaO5r4yZfM=
-SHA1 (stow-1.3.3.tar.gz) = VwxQH4Zj/rJjYNsl3wvjQieLe5k=
-SHA256 (stow-1.3.3.tar.gz) = DNx/t4Yeg3he3S3hJyaPinLtmuUk3cS+yiNs/WPR+LA=
-SIZE (stow-1.3.3.tar.gz) = 139417
+SHA256 (stow-2.2.0.tar.gz) = i4nXmTnPmuh9LyI7s2o7LQxmd1tirrmVPG0z2rQNPCs=
+SIZE (stow-2.2.0.tar.gz) = 479109
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/stow/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 4 Sep 2005 23:35:59 - 1.3
+++ pkg/PLIST 13 May 2014 21:24:40 -
@@ -1,4 +1,45 @@
-@comment $OpenBSD: PLIST,v 1.3 2005/09/04 23:35:59 espie Exp $
+@comment $OpenBSD$
+bin/chkstow
bin/stow
@info info/stow.info
+libdata/perl5/site_perl/Stow/
+libdata/perl5/site_perl/Stow.pm
+libdata/perl5/site_perl/Stow/Util.pm
@man man/man8/stow.8
+share/doc/stow/
+share/doc/stow/ChangeLog
+share/doc/stow/ChangeLog.OLD
+share/doc/stow/README
+share/doc/stow/manual-single.html
+share/doc/stow/manual-split/
+share/doc/stow/manual-split/Bootstrapping.html
+share/doc/stow/manual-split/Compile_002dtime-vs-Install_002dtime.html
+share/doc/stow/manual-split/Conflicts.html
+share/doc/stow/manual-split/Cygnus-Software.html
+share/doc/stow/manual-split/Deferred-Operation.html
+share/doc/stow/manual-split/Deleting-Packages.html
+share/doc/stow/manual-split/GNU-Emacs.html
+share/doc/stow/manual-split/GNU-General-Public-License.html
+share/doc/stow/manual-split/Ignore-Lists.html
+share/doc/stow/manual-split/Index.html
+share/doc/stow/manual-split/Installing-Packages.html
+share/doc/stow/manual-split/Introduction.html
+share/doc/stow/manual-split/Invoking-Stow.html
+share/doc/stow/manual-split/Justification-For-Yet-Another-Set-Of-Ignore-Files.html
+share/doc/stow/manual-split/Known-Bugs.html
+share/doc/stow/manual-split/Mixing-Operations.html
+share/doc/stow/manual-split/Motivation-For-Ignore-Lists.html
+share/doc/stow/manual-split/Multiple-Stow-Directories.html
+share/doc/stow/manual-split/Other-FSF-Software.html
+share/doc/stow/manual-split/Perl-and-Perl-5-Modules.html
+share/doc/stow/manual-split/Reporting-Bugs.html
+share/doc/stow/manual-split/Resource-Files.html
+share/doc/stow/manual-split/Target-Maintenance.html
+share/doc/stow/manual-split/Terminology.html
+share/doc/stow/manual-split/Tree-unfolding.html
+share/doc/stow/manual-split/Types-And-Syntax-Of-Ignore-Lists.html
+share/doc/stow/manual-split/index.html
+share/doc/stow/manual-split/tree-folding.html
+share/doc/stow/manual-split/tree-refolding.html
+share/doc/stow/manual.pdf
+share/doc/stow/version.texi
Re: [UPDATE] stow-2.2.0
On Tue, May 13, 2014 at 11:13:55PM +0100, Stuart Henderson wrote:
On 2014/05/13 18:09, Jiri B wrote:
On Tue, May 13, 2014 at 10:37:50PM +0100, Kaashif Hymabaccus wrote:
[...]
I'm not using stow but IIUC we don't usually shipt manuals.
j.
Depends. But installing what looks like 5 differently-formatted
versions of the same manual for a simple utility definitely seems
a bit much.
Here's an updated diff. Also, I had somehow forgotten the actual install
target, so the diff in my original email won't work, anyway. Sorry about
that, it's my first time updating a port.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/stow/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile1 Jan 2014 20:46:29 - 1.9
+++ Makefile13 May 2014 23:22:05 -
@@ -1,20 +1,26 @@
# $OpenBSD: Makefile,v 1.9 2014/01/01 20:46:29 naddy Exp $
COMMENT= manages software package installations with symlinks
-
-DISTNAME= stow-1.3.3
-REVISION = 1
+DISTNAME= stow-2.2.0
CATEGORIES=sysutils
-HOMEPAGE= https://www.gnu.org/software/stow/stow.html
-
+HOMEPAGE= http://www.gnu.org/software/stow/stow.html
MAINTAINER=Andreas Kahari andreas.kah...@gmail.com
-# GPL
+# GPLv3
PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${MASTER_SITE_GNU:=stow/}
+TEST_DEPENDS= devel/p5-Test-Output
+
+USE_GMAKE= Yes
CONFIGURE_STYLE=gnu
+
+do-install:
+ ${INSTALL_SCRIPT} ${WRKSRC}/bin/stow ${PREFIX}/bin/
+ ${INSTALL_DATA_DIR} ${PREFIX}/libdata/perl5/site_perl/Stow
+ ${INSTALL_DATA} ${WRKSRC}/lib/Stow.pm ${PREFIX}/libdata/perl5/site_perl/
+ ${INSTALL_DATA} ${WRKSRC}/lib/Stow/Util.pm
${PREFIX}/libdata/perl5/site_perl/Stow
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/sysutils/stow/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo5 Apr 2007 17:26:13 - 1.3
+++ distinfo13 May 2014 23:22:05 -
@@ -1,5 +1,2 @@
-MD5 (stow-1.3.3.tar.gz) = WaB4xwVt2d2X+3BwY7adAw==
-RMD160 (stow-1.3.3.tar.gz) = qxksPHCcEeCn057I3iaO5r4yZfM=
-SHA1 (stow-1.3.3.tar.gz) = VwxQH4Zj/rJjYNsl3wvjQieLe5k=
-SHA256 (stow-1.3.3.tar.gz) = DNx/t4Yeg3he3S3hJyaPinLtmuUk3cS+yiNs/WPR+LA=
-SIZE (stow-1.3.3.tar.gz) = 139417
+SHA256 (stow-2.2.0.tar.gz) = i4nXmTnPmuh9LyI7s2o7LQxmd1tirrmVPG0z2rQNPCs=
+SIZE (stow-2.2.0.tar.gz) = 479109
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/stow/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 4 Sep 2005 23:35:59 - 1.3
+++ pkg/PLIST 13 May 2014 23:22:05 -
@@ -1,4 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.3 2005/09/04 23:35:59 espie Exp $
+@comment $OpenBSD$
bin/stow
@info info/stow.info
+libdata/perl5/site_perl/Stow/
+libdata/perl5/site_perl/Stow.pm
+libdata/perl5/site_perl/Stow/Util.pm
@man man/man8/stow.8
