CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2015/01/10 02:39:21 Modified files: misc/redshift : Makefile distinfo misc/redshift/pkg: PLIST Removed files: misc/redshift/patches: patch-src_location-geoclue_c Log message: Update to redshift-1.10. based on a diff from scarlett at xavin dot net
Re: UPDATE: redshift 1.9.1 - 1.10
I don't think we will ever support that... so while I see no problem having these files around as part of a standard install target, I see no reason to force the installation of such files if upstream does not do it. Ok I just tried the diff and the appdata is properly installed without the need for a post-install target. So case closed on that particular one ;-) -- Antoine
Re: UPDATE: redshift 1.9.1 - 1.10
On Fri, Jan 09, 2015 at 08:00:53PM -0500, Brad Smith wrote: On 01/09/15 19:46, Antoine Jacoutot wrote: On Fri, Jan 09, 2015 at 09:34:02PM +, Scarlett wrote: Needs testing on non-amd64 and of redshift-gtk by someone with a gnomish setup. Are the makefile changes ok? Seems fine at first glance. I'll have a deeper look tomorrow, thanks for the diff. Just one question, what's the point in installing the appdata file -- I don't think there's any application that can make use of it on OpenBSD. I was curious what these files were for as I noticed one pop up when I updated Pidgin as I didn't have to install it myself with a post-install target. But looking around I see this is part of the fd.o specs. -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. It's only used by market-like stuffs so far. See https://wiki.gnome.org/Apps/Software for an example. I don't think we will ever support that... so while I see no problem having these files around as part of a standard install target, I see no reason to force the installation of such files if upstream does not do it. -- Antoine
Re: rsyslog crashes in debug printf
On 2015/01/09 23:17, Alexander Bluhm wrote:
Hi,
With MALLOC_OPTIONS=J rsyslogd crashes when it receives a line via
UDP in debug mode. There is no terminating '\0', so it tries to
print the line infinitly. Without debug printing, the missing '\0'
is added later.
I found this while testing interoprability of our syslogd with
rsyslog.
ok?
OK.
Is it worth adding a comment (maybe in the patch header, if not in the
diff itself) to say that this is normally done in MsgSetRawMsg()?
bluhm
Index: sysutils/rsyslog/Makefile
===
RCS file: /data/mirror/openbsd/cvs/ports/sysutils/rsyslog/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- sysutils/rsyslog/Makefile 9 Jan 2015 21:04:02 - 1.21
+++ sysutils/rsyslog/Makefile 9 Jan 2015 21:04:16 -
@@ -20,7 +20,7 @@ PKGNAME-mysql = rsyslog-mysql-$V
PKGNAME-pgsql = rsyslog-pgsql-$V
CATEGORIES = sysutils
-REVISION-main = 6
+REVISION-main = 7
REVISION-docs = 0
REVISION-mysql = 6
REVISION-pgsql = 3
Index: sysutils/rsyslog/patches/patch-plugins_imudp_imudp_c
===
RCS file: sysutils/rsyslog/patches/patch-plugins_imudp_imudp_c
diff -N sysutils/rsyslog/patches/patch-plugins_imudp_imudp_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ sysutils/rsyslog/patches/patch-plugins_imudp_imudp_c 9 Jan 2015
21:32:33 -
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- plugins/imudp/imudp.c.orig Thu Aug 5 11:33:54 2010
plugins/imudp/imudp.cFri Jan 9 22:31:59 2015
+@@ -241,6 +241,8 @@ processSocket(int fd, struct sockaddr_storage *fromine
+ }
+ }
+
++if(Debug)
++pRcvBuf[lenRcvBuf] = '\0';
+ DBGPRINTF(recv(%d,%d)/%s,acl:%d,msg:%s\n, fd, (int)
lenRcvBuf, fromHost, *pbIsPermitted, pRcvBuf);
+
+ if(*pbIsPermitted) {
Re: update: games/gnuchess 6.2.1
On Fri, January 9, 2015 21:53, Pascal Stumpf wrote:
ok?
I guess you've missed cvs up before. Currently gnuchess is at version 6.1.2.
in our tree.
This one should be correct (add HOMEPAGE while here):
Index: Makefile
===
RCS file: /cvs/ports/games/gnuchess/Makefile,v
retrieving revision 1.33
diff -u -r1.33 Makefile
--- Makefile25 Sep 2014 13:44:56 - 1.33
+++ Makefile10 Jan 2015 12:17:01 -
@@ -2,10 +2,11 @@
COMMENT= chess program
-DISTNAME= gnuchess-6.1.2
+DISTNAME= gnuchess-6.2.1
DISTFILES= ${DISTNAME}.tar.gz book_1.02.pgn.gz
CATEGORIES=games
+HOMEPAGE= http://www.gnu.org/software/chess/
MASTER_SITES= ${MASTER_SITE_GNU:=chess/}
# GPLv3+
Index: distinfo
===
RCS file: /cvs/ports/games/gnuchess/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo25 Sep 2014 13:44:56 - 1.9
+++ distinfo10 Jan 2015 12:17:01 -
@@ -1,4 +1,4 @@
SHA256 (book_1.02.pgn.gz) = 3qx37bBhpZJJoZ3rA9o0nK4FHlJSemy1r4CNk5jTLUQ=
-SHA256 (gnuchess-6.1.2.tar.gz) = FKESjxz6fXaiDU+YHX4N/I6dpFSMHXVBNKZc5l/iZpY=
+SHA256 (gnuchess-6.2.1.tar.gz) = F8qrclU5RHvLF6FLF5BSQsvyhwh+U6Z3dST+t7uu7QY=
SIZE (book_1.02.pgn.gz) = 26265281
-SIZE (gnuchess-6.1.2.tar.gz) = 720282
+SIZE (gnuchess-6.2.1.tar.gz) = 730761
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/gnuchess/pkg/PLIST,v
retrieving revision 1.8
diff -u -r1.8 PLIST
--- pkg/PLIST 25 Sep 2014 13:44:56 - 1.8
+++ pkg/PLIST 10 Jan 2015 12:17:01 -
@@ -3,8 +3,15 @@
bin/gnuchessu
bin/gnuchessx
@info info/gnuchess.info
+@man man/man1/gnuchess.1
share/doc/gnuchess/
share/doc/gnuchess/README
+share/games/
+share/games/plugins/
+share/games/plugins/logos/
+share/games/plugins/logos/gnuchess.png
+share/games/plugins/xboard/
+share/games/plugins/xboard/gnuchess.eng
share/gnuchess/
share/gnuchess/book.bin
share/gnuchess/gnuchess.ini
Index: Makefile
===
RCS file: /cvs/ports/games/gnuchess/Makefile,v
[...]
share/locale/uk/LC_MESSAGES/gnuchess.mo
+share/locale/vi/LC_MESSAGES/gnuchess.mo
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/01/10 05:49:15 Modified files: www/p5-Starman : Makefile distinfo www/p5-Starman/pkg: PLIST Log message: update to p5-Starman 0.4011, from Cesare Gargano, ok maintainer
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: k...@cvs.openbsd.org2015/01/10 08:22:53 Modified files: devel/hs-glib : Makefile Log message: Add devel/hs-utf8-string as a run dependency, to unbreak the build of (at least) devel/hs-gio and devel/hs-pango. Breakage noticed by naddy@.
NEW productivity/gbirthday
Hi, Another upcoming birthday just reminded about this port. gbirthday is simple and nice birthday reminder without a bunch of extra functions. from DESCR: GBirthday is a birthday reminder application that helps you to remember your contacts' birthdays. It can be used with Evolution Contacts, Thunderbird/Icedove Lightning and Sunbird/Iceowl Events, CVS-files, MySQL-Databases. It puts an icon on notification area which will blink when there is any of your contacts' birthday today. You can also check if there is any of your contacts' birhday on next days. OK to import? gbirthday.tar.gz Description: application/gzip
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2015/01/10 03:46:37 Modified files: graphics/ffmpeg: Makefile distinfo graphics/ffmpeg/patches: patch-configure Log message: Update to FFmpeg 20150107 snapshot. From 2.4 branch.
Re: NEW productivity/gbirthday
On Sat, January 10, 2015 13:51, Stuart Henderson wrote: On 2015/01/10 13:26, Kirill Bychkov wrote: Hi, Another upcoming birthday just reminded about this port. gbirthday is simple and nice birthday reminder without a bunch of extra functions. from DESCR: GBirthday is a birthday reminder application that helps you to remember your contacts' birthdays. It can be used with Evolution Contacts, Thunderbird/Icedove Lightning and Sunbird/Iceowl Events, CVS-files, MySQL-Databases. It puts an icon on notification area which will blink when there is any of your contacts' birthday today. You can also check if there is any of your contacts' birhday on next days. This text is OK, but pkg/DESCR in the tgz just says: lala :-) Errr, sorry. Now with full description :) OK to import? Mostly OK but please would you adjust COMMENT to mention notification trays? COMMENT = birthday reminder with tray notification gbirthday.tar.gz Description: application/gzip
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2015/01/10 04:40:09 Modified files: productivity : Makefile Log message: add gbirthday
Re: [NEW] devel/p5-Hash-Merge-Simple
On 2015/01/05 22:33, Cesare Gargano wrote: Hi ports@! Needed for upcoming www/p5-Dancer2. Tested on amd64. Slightly tweaked from original from Sergey Bronnikov estetus () gmail ! com (see http://marc.info/?l=openbsd-portsm=139870169331483w=4) - pkg/DESCR: Hash::Merge::Simple will recursively merge two or more hashes and return the result as a new hash reference. The merge function will descend and merge hashes that exist under the same node in both the left and right hash, but doesn't attempt to combine arrays, objects, scalars, or anything else. -- C. OK
Re: NEW: www/p5-Plack-Middleware-FixMissingBodyInRedirect
On 2015/01/08 19:29, Cesare Gargano wrote: Hi ports@! Needed for upcoming www/p5-Dancer2. Tested on amd64. - pkg/DESCR: This module sets body in redirect response, if it's not already set. -- C. OK
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bl...@cvs.openbsd.org 2015/01/10 04:48:04 Modified files: sysutils/rsyslog: Makefile Added files: sysutils/rsyslog/patches: patch-plugins_imudp_imudp_c Log message: With MALLOC_OPTIONS=J rsyslogd crashed when it received a line via UDP in debug mode. Append a terminating '\0' to prevent printing an infinite line. OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/01/10 06:13:16 Modified files: shells/nsh : Makefile Added files: shells/nsh/patches: patch-complete_c Log message: fix nsh use-after-free in tab completion of ifnames
Re: [NEW] devel/greg
On 2015/01/08 15:26, attila wrote: Hi ports@, Third time is a charm, I hope. Attached is an updated version of devel/greg, a parser generator based on Parsing Expression Grammars. This version corrects issues with my original patches discovered by bcallah@ and the update-patches target. The other port I have submitted, textproc/multimarkdown, built-depends on this port. pkg/DESCR: greg is a recursive-descent parser generator based on Ian Piumarta's peg/leg. It implements a formalism called Parsing Expression Grammars. --- Works well on i386. I'm working on getting my patches upstream. Thanks again to bcallah@ for helping me with this. Testing and comments welcome! Pax, -A -- att...@stalphonsos.com | http://trac.haqistan.net/~attila | +CFLAGS += -g -O3 -DYY_MAIN please drop -O3 | Fix the clean target. no objection to this, but clean isn't called by ports are the test failures important? -- -- echo '6*9' | samples/erract | tee samples/erract.out fail at PLUS fail at subtraction got multiplication fail at subtraction -- -- sprintf patches... we mostly gave up on these in ports, they can make updates awkward (and in some cases dangerous). no objection to keeping them since you've already done them, but can you try and upstream them please? so: basically OK with -O3 dropped, as long as you don't consider the test failures to be a problem.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2015/01/10 04:06:13 Modified files: x11/mplayer: Makefile Log message: Bump for FFmpeg 20150107.
Re: UPDATE: net/daq 2.0.4
On Thu, Jan 08, 2015 at 11:34:56PM -0500, Lawrence Teo wrote:
This updates DAQ to 2.0.4, needed by the upcoming Snort 2.9.7.0 port
which I will mail shortly.
Tested on amd64 with Snort 2.9.7.0.
ok?
Index: Makefile
===
RCS file: /cvs/ports/net/daq/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 30 Jan 2014 03:22:48 - 1.9
+++ Makefile 24 Dec 2014 20:42:59 -
@@ -2,7 +2,7 @@
COMMENT =data acquisition library for snort
-DISTNAME = daq-2.0.2
+DISTNAME = daq-2.0.4
SHARED_LIBS += daq 2.0 # 2.2
SHARED_LIBS += sfbpf 1.0 # 0.1
lib daq needs a minor bump
@@ -18,7 +18,7 @@ PERMIT_PACKAGE_CDROM = Yes
WANTLIB =pcap
-MASTER_SITES = http://www.snort.org/dl/snort-current/
+MASTER_SITES = https://www.snort.org/downloads/snort/
SEPARATE_BUILD = Yes
this hunk is already in-tree, in r1.10
Index: distinfo
===
RCS file: /cvs/ports/net/daq/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo 30 Jan 2014 03:22:48 - 1.4
+++ distinfo 24 Dec 2014 20:43:13 -
@@ -1,2 +1,2 @@
-SHA256 (daq-2.0.2.tar.gz) = 1l0eZ8SZTgLDFCxJpkhkLngLfj2UK0pR9gUwm+rCaag=
-SIZE (daq-2.0.2.tar.gz) = 474447
+SHA256 (daq-2.0.4.tar.gz) = opSqPQHNiQK/hC0yDn8sBDr56tldDnGYw7caDbydJTw=
+SIZE (daq-2.0.4.tar.gz) = 495316
diff attached
Regards,
Markus
Index: Makefile
===
RCS file: /cvs/ports/net/daq/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile12 Aug 2014 03:00:16 - 1.10
+++ Makefile10 Jan 2015 14:35:09 -
@@ -2,9 +2,9 @@
COMMENT = data acquisition library for snort
-DISTNAME = daq-2.0.2
+DISTNAME = daq-2.0.4
-SHARED_LIBS += daq 2.0 # 2.2
+SHARED_LIBS += daq 2.1 # 2.4
SHARED_LIBS += sfbpf 1.0 # 0.1
CATEGORIES = net
Index: distinfo
===
RCS file: /cvs/ports/net/daq/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo30 Jan 2014 03:22:48 - 1.4
+++ distinfo10 Jan 2015 14:35:09 -
@@ -1,2 +1,2 @@
-SHA256 (daq-2.0.2.tar.gz) = 1l0eZ8SZTgLDFCxJpkhkLngLfj2UK0pR9gUwm+rCaag=
-SIZE (daq-2.0.2.tar.gz) = 474447
+SHA256 (daq-2.0.4.tar.gz) = opSqPQHNiQK/hC0yDn8sBDr56tldDnGYw7caDbydJTw=
+SIZE (daq-2.0.4.tar.gz) = 495316
Index: patches/patch-api_daq_common_h
===
RCS file: /cvs/ports/net/daq/patches/patch-api_daq_common_h,v
retrieving revision 1.2
diff -u -p -r1.2 patch-api_daq_common_h
--- patches/patch-api_daq_common_h 21 Aug 2013 02:21:15 - 1.2
+++ patches/patch-api_daq_common_h 10 Jan 2015 14:35:09 -
@@ -1,8 +1,8 @@
$OpenBSD: patch-api_daq_common_h,v 1.2 2013/08/21 02:21:15 lteo Exp $
api/daq_common.h.orig Mon Jul 1 12:44:59 2013
-+++ api/daq_common.h Mon Aug 5 14:33:20 2013
-@@ -25,6 +25,10 @@
- #include unistd.h
+--- api/daq_common.h.orig Tue Sep 9 21:57:29 2014
api/daq_common.h Sat Oct 25 13:55:21 2014
+@@ -26,6 +26,10 @@
+ #include netinet/in.h
#ifndef WIN32
#include sys/time.h
+#if defined(__OpenBSD__)
@@ -12,7 +12,7 @@ $OpenBSD: patch-api_daq_common_h,v 1.2 2
#else
/* for struct timeavl */
#include winsock2.h
-@@ -92,7 +96,11 @@
+@@ -98,7 +102,11 @@
#define DAQ_PKTHDR_FLOOD-2 /* Egress is flooding */
typedef struct _daq_pkthdr
{
Index: patches/patch-configure
===
RCS file: /cvs/ports/net/daq/patches/patch-configure,v
retrieving revision 1.4
diff -u -p -r1.4 patch-configure
--- patches/patch-configure 30 Jan 2014 03:22:48 - 1.4
+++ patches/patch-configure 10 Jan 2015 14:35:09 -
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.4 2014/01/30 03:22:48 lteo Exp $
configure.orig Tue Nov 5 16:10:24 2013
-+++ configure Thu Jan 23 22:05:29 2014
-@@ -12806,12 +12806,20 @@ else
+--- configure.orig Sat Sep 20 01:30:04 2014
configure Sat Oct 25 13:55:21 2014
+@@ -12977,12 +12977,20 @@ else
#include pcap.h
#include string.h
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2015/01/10 08:50:58 Modified files: audio/flac : Makefile distinfo audio/flac/patches: patch-configure patch-man_flac_1 audio/flac/pkg : PLIST audio/xmms-flac: Makefile distinfo audio/xmms-flac/patches: patch-configure patch-src_plugin_xmms_Makefile_in Removed files: audio/flac/patches: patch-src_libFLAC_stream_decoder_c patch-src_libFLAC_stream_encoder_c audio/xmms-flac/patches: patch-src_plugin_xmms_plugin_c Log message: maintenance update to flac 1.3.1, no significant user-visible changes
Re: NEW: devel/p5-Signal-Mask
On 2015/01/08 20:10, Cesare Gargano wrote: Signal::Mask is an abstraction around your process or thread signal mask. It On 2015/01/08 20:09, Cesare Gargano wrote: This module contains utility functions for dealing with signals. OK for p5-Signal-Mask, p5-IPC-Signal. It would help to mention when things require dependencies from a separate mail, though it would be even better to include the relevant ports in a single mail (it's hard to keep track of things when you send about 20 different ports in a fairly short time so anything you can do to make it easier to review will increase the chances of it being looked at sooner).
Re: UPDATE: www/p5-Starman to 0.4011
On 2015/01/10 13:19, Cesare Gargano wrote: Attached a new diff. Thanks, committed.
NEW port module: databases/postgresql, take 2
So here is an improved version, after input from landry@.
Patch for port-modules(5) will be in a separate letter.
Okay?
--
WBR,
Vadim Zhukov
Index: databases/postgresql/postgresql.port.mk
===
RCS file: databases/postgresql/postgresql.port.mk
diff -N databases/postgresql/postgresql.port.mk
--- /dev/null 1 Jan 1970 00:00:00 -
+++ databases/postgresql/postgresql.port.mk 10 Jan 2015 16:16:07 -
@@ -0,0 +1,43 @@
+# $OpenBSD$
+#
+# Helps testing PostgreSQL-based software, no B/L/R-DEPS here.
+
+MODPOSTGRESQL_TEST_CMD ?= \
+ ${MAKE_PROGRAM} ${ALL_TEST_FLAGS} -f ${MAKE_FILE} ${TEST_TARGET}
+
+MODPOSTGRESQL_TEST_PGHOST ?= ${WRKDIR}
+_MODPOSTGRESQL_TEST_PGDATA = ${WRKDIR}/testdb
+
+TEST_DEPENDS +=databases/postgresql,-server
+TEST_ENV +=PGDATA=${_MODPOSTGRESQL_TEST_PGDATA} \
+ PGHOST=${MODPOSTGRESQL_TEST_PGHOST}
+.ifdef MODPOSTGRESQL_TEST_DBNAME
+TEST_ENV +=PGDATABASE=${MODPOSTGRESQL_TEST_DBNAME}
+.endif
+
+MODPOSTGRESQL_TEST_TARGET = \
+ rm -Rf ${_MODPOSTGRESQL_TEST_PGDATA}; \
+ export ${ALL_TEST_ENV}; \
+ ${LOCALBASE}/bin/initdb -D ${_MODPOSTGRESQL_TEST_PGDATA} \
+ -A trust --locale=C; \
+ ${LOCALBASE}/bin/pg_ctl start -w -D ${_MODPOSTGRESQL_TEST_PGDATA} \
+ -l ${WRKDIR}/pg-test.log \
+ -o -F -h '' -k ${MODPOSTGRESQL_TEST_PGHOST};
+.ifdef MODPOSTGRESQL_TEST_DBNAME
+MODPOSTGRESQL_TEST_TARGET += \
+ ${LOCALBASE}/bin/createdb ${MODPOSTGRESQL_TEST_DBNAME} || \
+ (${LOCALBASE}/bin/pg_ctl stop -D ${_MODPOSTGRESQL_TEST_PGDATA} \
+-m i exit 1);
+.endif
+MODPOSTGRESQL_TEST_TARGET += \
+ set +e; \
+ cd ${WRKBUILD}; \
+ ${MODPOSTGRESQL_TEST_CMD}; \
+ Q=$$?; \
+ ${LOCALBASE}/bin/pg_ctl stop -D ${_MODPOSTGRESQL_TEST_PGDATA} -m i; \
+ exit $$Q
+
+.if !target(do-test)
+do-test:
+ ${MODPOSTGRESQL_TEST_TARGET}
+.endif
Index: databases/libpqxx/Makefile
===
RCS file: /cvs/ports/databases/libpqxx/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- databases/libpqxx/Makefile 2 Oct 2014 10:16:34 - 1.18
+++ databases/libpqxx/Makefile 10 Jan 2015 16:16:07 -
@@ -18,7 +18,7 @@ MASTER_SITES= http://pqxx.org/download/s
LIB_DEPENDS= databases/postgresql
-MODULES= lang/python
+MODULES= databases/postgresql lang/python
MODPY_RUNDEP= No
MODPY_ADJ_FILES=tools/splitconfig \
tools/template2mak.py
@@ -29,27 +29,6 @@ SEPARATE_BUILD= No
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS=${CONFIGURE_SHARED}
-# Regression tests start up and use a real database
-TEST_DEPENDS = databases/postgresql,-server
-PGDATA = ${WRKDIR}/testdb
-PGDATABASE = pqxx-test
-TEST_ENV = PGDATABASE=${PGDATABASE} \
- PGHOST=${WRKDIR}
-
-# Make sure that server is always stopped after starting
-do-test:
- rm -Rf ${PGDATA}
- ${LOCALBASE}/bin/initdb -D ${PGDATA} -A trust --locale=C
- ${LOCALBASE}/bin/pg_ctl start -w -D ${PGDATA} -l ${WRKDIR}/pg.log \
- -o -F -h '' -k ${WRKDIR}
- ${TEST_ENV} ${LOCALBASE}/bin/createdb ${PGDATABASE} || \
- (${LOCALBASE}/bin/pg_ctl stop -D ${PGDATA} -m i; exit 1)
- cd ${WRKBUILD}; \
- set +e; \
- ${SETENV} ${ALL_TEST_ENV} ${MAKE_PROGRAM} ${ALL_TEST_FLAGS} \
- -f ${MAKE_FILE} ${TEST_TARGET}; \
- Q=$$?; \
- ${LOCALBASE}/bin/pg_ctl stop -D ${PGDATA} -m i; \
- exit $$Q
+MODPOSTGRESQL_TEST_DBNAME =pqxx-test
.include bsd.port.mk
Index: geo/pgrouting/Makefile
===
RCS file: /cvs/ports/geo/pgrouting/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- geo/pgrouting/Makefile 19 Dec 2014 21:16:55 - 1.2
+++ geo/pgrouting/Makefile 10 Jan 2015 16:16:07 -
@@ -20,20 +20,21 @@ MAINTAINER =Landry Breuil landry@openb
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
-MODULES = devel/cmake
+MODULES = databases/postgresql devel/cmake
LIB_DEPENDS = math/cgal
RUN_DEPENDS = geo/postgis
BUILD_DEPENDS =databases/postgresql,-server
TEST_DEPENDS = ${BUILD_PKGPATH}
+TEST_ENV = LD_PRELOAD=libpthread.so
WANTLIB += CGAL boost_system-mt boost_thread-mt gmp m stdc++
-do-test:
- regdir=$$(mktemp -t -d pgrouting-regress.XX) \
- LC_CTYPE=C initdb -D $${regdir} \
- LD_PRELOAD=libpthread.so pg_ctl -D $${regdir} -o '-p 12341' -l
$${regdir}/log start \
- cd ${WRKSRC} perl tools/test-runner.pl -pgport 12341 || \
- pg_ctl -D $${regdir} -o '-p 12341' stop -m fast
- #not all tests pass - ensure we stop the server
+MODPOSTGRESQL_TEST_CMD = \
+ cd ${WRKSRC}; \
+ ./tools/test-runner.pl
+
+SUBST_VARS +=
Re: NEW productivity/gbirthday
On 2015/01/10 13:26, Kirill Bychkov wrote: Hi, Another upcoming birthday just reminded about this port. gbirthday is simple and nice birthday reminder without a bunch of extra functions. from DESCR: GBirthday is a birthday reminder application that helps you to remember your contacts' birthdays. It can be used with Evolution Contacts, Thunderbird/Icedove Lightning and Sunbird/Iceowl Events, CVS-files, MySQL-Databases. It puts an icon on notification area which will blink when there is any of your contacts' birthday today. You can also check if there is any of your contacts' birhday on next days. This text is OK, but pkg/DESCR in the tgz just says: lala :-) OK to import? Mostly OK but please would you adjust COMMENT to mention notification trays?
Re: NEW: www/p5-Plack-Middleware-RemoveRedundantBody
On 2015/01/08 19:30, Cesare Gargano wrote: Hi ports@! Needed for upcoming www/p5-Dancer2. Tested on amd64. - pkg/DESCR: This module removes body in HTTP response, if it's not required. -- C. OK
Re: NEW: www/p5-Twiggy
On 2015/01/10 13:43, Cesare Gargano wrote: Hi ports@! pkg/DESCR: Twiggy is a lightweight and fast HTTP server with unique features such as: PSGI, AnyEvent, and fast header parser. It has low memory footprint and is superdaemon aware (supports Server::Starter for hot deploy and graceful restarts). Tested on amd64. -- C. OK sthen@ to import.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: e...@cvs.openbsd.org2015/01/10 06:06:29 Modified files: print/texlive/base: Makefile print/texlive/base/pkg: README print/texlive/texmf: Makefile Added files: print/texlive/texmf: adj.mk print/texlive/texmf/patches: patch-texmf-dist_scripts_a2ping_a2ping_pl patch-texmf-dist_scripts_bibexport_bibexport_sh patch-texmf-dist_scripts_context_stubs_unix_mtxrun patch-texmf-dist_scripts_installfont_installfont-tl patch-texmf-dist_scripts_latexfileversion_latexfileversion Removed files: print/texlive/base/patches: patch-texk_texlive_linked_scripts_a2ping_a2ping_pl patch-texk_texlive_linked_scripts_bibexport_bibexport_sh patch-texk_texlive_linked_scripts_installfont_installfont-tl patch-texk_texlive_linked_scripts_latexfileversion_latexfileversion Log message: FIx texlive interpreter paths. OK ajacoutot@, tested in a bulk by kili@, thanks.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/01/10 06:06:14 Modified files: shells/nsh/patches: patch-if_c Log message: oops, stray character
Re: UPDATE: www/p5-Starman to 0.4011
On 2015/01/08 19:42, Cesare Gargano wrote: Hi ports@! Update to 0.4011. Discussed and tested w/ MAINTAINER and afresh1@. Tests pass on amd64 (and required-by). This diff doesn't apply correctly. |Index: Makefile |=== |RCS file: /cvs/ports/www/p5-Starman/Makefile,v |retrieving revision 1.3 |diff -u -r1.3 Makefile |--- Makefile 19 Nov 2014 22:04:01 - 1.3 |+++ Makefile 8 Jan 2015 18:38:36 - -- Patching file Makefile using Plan A... Hunk #1 failed at 3. Hunk #2 failed at 12. 2 out of 2 hunks failed--saving rejects to Makefile.rej Hmm... The next patch looks like a unified diff to me... The text leading up to this was: -- |Index: distinfo |=== |RCS file: /cvs/ports/www/p5-Starman/distinfo,v |retrieving revision 1.1.1.1 |diff -u -r1.1.1.1 distinfo |--- distinfo 7 Jan 2011 13:45:39 - 1.1.1.1 |+++ distinfo 8 Jan 2015 18:38:36 - -- Patching file distinfo using Plan A... patch: malformed patch at line 139: Lq3/yEmFSIBZduPh8gfCcQWPAFk/qtZY0ZWurjDgjPE=
Re: UPDATE: www/p5-Starman to 0.4011
On 2015-01-10 12:45, Stuart Henderson wrote:
On 2015/01/08 19:42, Cesare Gargano wrote:
Hi ports@!
Update to 0.4011.
Discussed and tested w/ MAINTAINER and afresh1@.
Tests pass on amd64 (and required-by).
This diff doesn't apply correctly.
|Index: Makefile
|===
|RCS file: /cvs/ports/www/p5-Starman/Makefile,v
|retrieving revision 1.3
|diff -u -r1.3 Makefile
|--- Makefile 19 Nov 2014 22:04:01 - 1.3
|+++ Makefile 8 Jan 2015 18:38:36 -
--
Patching file Makefile using Plan A...
Hunk #1 failed at 3.
Hunk #2 failed at 12.
2 out of 2 hunks failed--saving rejects to Makefile.rej
Hmm... The next patch looks like a unified diff to me...
The text leading up to this was:
--
|Index: distinfo
|===
|RCS file: /cvs/ports/www/p5-Starman/distinfo,v
|retrieving revision 1.1.1.1
|diff -u -r1.1.1.1 distinfo
|--- distinfo 7 Jan 2011 13:45:39 - 1.1.1.1
|+++ distinfo 8 Jan 2015 18:38:36 -
--
Patching file distinfo using Plan A...
patch: malformed patch at line 139:
Lq3/yEmFSIBZduPh8gfCcQWPAFk/qtZY0ZWurjDgjPE=
Hi!
Attached a new diff.
--
C.Index: Makefile
===
RCS file: /cvs/ports/www/p5-Starman/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile 19 Nov 2014 22:04:01 - 1.3
+++ Makefile 10 Jan 2015 12:07:13 -
@@ -3,7 +3,7 @@
COMMENT = high-performance preforking PSGI/Plack web server
MODULES = cpan
-DISTNAME = Starman-0.2007
+DISTNAME = Starman-0.4011
CATEGORIES = www
MAINTAINER = Abel Abraham Camarillo Ojeda acam...@verlet.org
@@ -12,16 +12,35 @@
CPAN_AUTHOR = MIYAGAWA
-BUILD_DEPENDS = ${RUN_DEPENDS}
+BUILD_DEPENDS = www/p5-libwww \
+ devel/p5-Module-Build-Tiny=0.039 \
+ devel/p5-Test-Requires
+
RUN_DEPENDS = devel/p5-Data-Dump \
- devel/p5-Net-Server=0.91 \
- net/p5-Server-Starter \
- net/p5-Net-Server-SS-PreFork \
- www/p5-Plack=0.9931 \
+ www/p5-HTTP-Date \
+ www/p5-HTTP-Message \
www/p5-HTTP-Parser-XS \
+ devel/p5-Net-Server=2.007 \
+ www/p5-Plack=0.9971 \
+ net/p5-Server-Starter
+
+TEST_DEPENDS = www/p5-HTTP-Message \
+ devel/p5-Net-Server=2.007 \
+ www/p5-Plack=0.9971 \
+ devel/p5-Test-Requires \
+ net/p5-Test-TCP \
www/p5-libwww
-# XXX strange failure to find Test::More
-CONFIGURE_ARGS = --skipdeps
+CONFIGURE_STYLE = modbuild
+
+# Module::Build::Tiny like -- prefix for CLI options
+do-install:
+ @cd ${WRKSRC} perl \
+ ${MODPERL_BUILD} ${FAKE_TARGET} \
+ --destdir ${PREFIX} \
+ --install_path lib=libdata/perl5/site_perl \
+ --install_path=libdoc=man/man3p \
+ --install_path=bindoc=man/man1 \
+ --install_path script=bin
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/www/p5-Starman/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- distinfo 7 Jan 2011 13:45:39 - 1.1.1.1
+++ distinfo 10 Jan 2015 12:07:13 -
@@ -1,5 +1,2 @@
-MD5 (Starman-0.2007.tar.gz) = iwRw46KYRjfraWprRYqRPg==
-RMD160 (Starman-0.2007.tar.gz) = ivLx5a1IQuZVJ99NM+bbmaM48ew=
-SHA1 (Starman-0.2007.tar.gz) = nkbg8vRiMAt0THuRNZoaR1rSKOM=
-SHA256 (Starman-0.2007.tar.gz) = Lq3/yEmFSIBZduPh8gfCcQWPAFk/qtZY0ZWurjDgjPE=
-SIZE (Starman-0.2007.tar.gz) = 37287
+SHA256 (Starman-0.4011.tar.gz) = pyzfmWpkogT8BqqJqRDXPrzDlo9v6JzaI0+HbSL8Z4w=
+SIZE (Starman-0.4011.tar.gz) = 29311
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/p5-Starman/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- pkg/PLIST 7 Jan 2011 13:45:39 - 1.1.1.1
+++ pkg/PLIST 10 Jan 2015 12:07:13 -
@@ -9,5 +9,7 @@
${P5SITE}/Starman.pm
${P5SITE}/Starman/Server.pm
@man man/man1/starman.1
+@man man/man3p/HTTP::Server::PSGI::Net::Server::PreFork.3p
@man man/man3p/Plack::Handler::Starman.3p
@man man/man3p/Starman.3p
+@man man/man3p/Starman::Server.3p
Re: security/logsentry - problem with missing /var/tmp/logsentry/ dir
On Sat, January 3, 2015 21:40, J?r?mie Courr?ges-Anglas wrote: Markus Lude markus.l...@gmx.de writes: ping unfortunately I didn't get any response from MAINTAINER yet. I could also take MAINTAINER for this port. Committed, thanks. I also have added you as MAINTAINER. FWIW, logsentry looks dead and those folks take care of an updated version. http://www.logcheck.org/ hi, At first I thought that the old story with renaming is still going on: http://marc.info/?l=openbsd-portsm=138563089115744w=2 But after a close look I can say that logcheck.org is a different project written in perl, while old logcheck/logsentry is written in C. Looking at the rule-files shipped with logcheck.org I ust say it's too linux-cenrtric so it couldn't be a straight replacement for old logsentry port.
[wip] Firefox 35.0rc3
Hi, here's the wip update to ffx 35.0rc3, ETA next wednesday. Been using 35.0betas on amd64 for the past 6 weeks without issues, also tested on i386 and powerpc. http://cgit.rhaalovely.net/mozilla-firefox/?h=release git clone -b release http://git.rhaalovely.net/git/mozilla-firefox http://rhaalovely.net/stuff/amd64/firefox-35.0rc3.tgz http://rhaalovely.net/stuff/i386/firefox-35.0rc3.tgz Landry
Re: [PATCHES] www/w3m bug fixes
On Fri, Jan 09, 2015 at 08:22:13PM -0500, Brian Callahan wrote:
On 01/07/15 15:32, Scarlett wrote:
Updated diff to bump revision (whoops), and carrying over the change to use
overflow-detecting malloc to matrix.c (patch-matrix_c). I forgot about
this because my local fork of w3m has been fixed to build without MATRIX.
I think this is fine. I will note that you need to add RCS ID tags at
the top of every patch file (make update-patches is kind enough to do
this for you, for future reference). But besides that one nit w3m looks
like it works as expected. It's too bad you can't get all this
upstreamed (or can you?).
Anyone else want to weigh in/give oks?
~Brian
RCS tags added, and thank you.
My full diff against w3m-0.5.3 is much larger, and includes changes
such as the code being completely reformatted, DOS/Windows #ifdefs
removed, modern C changes (const, enums, using size_t instead of
int everywhere), attributes added to GC string library functions,
TLS support rewritten to use the unfinalized libtls API
(an older w3m had a CVE because of a flaw in the SSL code...),
NNTP support removed, Gopher support improved (:3), and a
restructuring of the build system using BSD make instead of autotools.
Backporting every change would take a long time and I doubt upstream
would be interested in a lot of the changes even if it was active.
I wouldn't object to becoming upstream if there is interest, but I
would definitely want to subject the code to more refactoring and
auditing before making a release.
Index: Makefile
===
RCS file: /cvs/ports/www/w3m/Makefile,v
retrieving revision 1.84
diff -u -p -r1.84 Makefile
--- Makefile16 Jul 2014 08:20:01 - 1.84
+++ Makefile10 Jan 2015 16:06:37 -
@@ -3,7 +3,7 @@
COMMENT= pager/text-based web browser
DISTNAME= w3m-0.5.3
-REVISION= 3
+REVISION= 4
CATEGORIES=www
HOMEPAGE= http://w3m.sourceforge.net/
@@ -50,6 +50,9 @@ DOCSRC= ${WRKSRC}/doc-jp
CONFIGURE_ARGS+=--enable-m17n=ISO-8859-1
DOCSRC=${WRKSRC}/doc
.endif
+
+post-patch:
+ @cp ${FILESDIR}/alloc.h ${WRKSRC}
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/w3m
Index: files/alloc.h
===
RCS file: files/alloc.h
diff -N files/alloc.h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ files/alloc.h 10 Jan 2015 16:06:37 -
@@ -0,0 +1,40 @@
+$OpenBSD$
+/*
+ * by Scarlett. public domain.
+ * replacements for w3m's allocation macros which add overflow
+ * detection and concentrate the macros in one file
+ */
+#ifndef W3_ALLOC_H
+#define W3_ALLOC_H
+#include gc.h
+#include stdlib.h
+#include stdio.h
+#include limits.h
+
+static inline size_t
+z_mult_no_oflow_(size_t n, size_t size)
+{
+ if (size != 0 n SIZE_MAX / size) {
+ fprintf(stderr,
+ w3m: overflow in malloc, %zu*%zu\n, n, size);
+ exit(1);
+ }
+ return n * size;
+}
+
+#define New(type) \
+ (GC_MALLOC(sizeof(type)))
+
+#define NewAtom(type) \
+ (GC_MALLOC_ATOMIC(sizeof(type)))
+
+#define New_N(type, n) \
+ (GC_MALLOC(z_mult_no_oflow_((n), sizeof(type
+
+#define NewAtom_N(type, n) \
+ (GC_MALLOC_ATOMIC(z_mult_no_oflow_((n), sizeof(type
+
+#define New_Reuse(type, ptr, n) \
+ (GC_REALLOC((ptr), z_mult_no_oflow_((n), sizeof(type
+
+#endif /* W3_ALLOC_H */
Index: patches/patch-Str_c
===
RCS file: patches/patch-Str_c
diff -N patches/patch-Str_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Str_c 10 Jan 2015 16:06:37 -
@@ -0,0 +1,129 @@
+$OpenBSD$
+
+Use asprintf() instead of rolling our own printf string length detection.
+
+--- Str.c.orig Mon Jan 5 22:49:07 2015
Str.c Mon Jan 5 22:52:59 2015
+@@ -427,103 +427,27 @@
+ Str
+ Sprintf(char *fmt, ...)
+ {
+-int len = 0;
+-int status = SP_NORMAL;
+-int p = 0;
+-char *f;
+-Str s;
+-va_list ap;
++ Str s;
++ char *cb;
++ int ret;
++ size_t n;
++ va_list ap;
+
+-va_start(ap, fmt);
+-for (f = fmt; *f; f++) {
+- redo:
+- switch (status) {
+- case SP_NORMAL:
+- if (*f == '%') {
+- status = SP_PREC;
+- p = 0;
+- }
+- else
+- len++;
+- break;
+- case SP_PREC:
+- if (IS_ALPHA(*f)) {
+- /* conversion char. */
+- double vd;
+- int vi;
+- char *vs;
+- void *vp;
+-
+- switch (*f) {
+- case 'l':
+- case 'h':
+- case 'L':
+- case 'w':
+- continue;
+- case 'd':
+- case 'i':
+- case 'o':
+- case 'x':
+- case 'X':
+-
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2015/01/10 10:29:14 Modified files: net/ruby-eventmachine: Makefile distinfo net/ruby-eventmachine/patches: patch-ext_ed_cpp patch-ext_extconf_rb net/ruby-eventmachine/pkg: PLIST Removed files: net/ruby-eventmachine/patches: patch-ext_fastfilereader_extconf_rb Log message: Update to eventmachine 1.0.4
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/01/10 05:00:07 Modified files: shells/nsh : Makefile distinfo shells/nsh/patches: patch-stats_c Removed files: shells/nsh/patches: patch-conf_c patch-if_c patch-kroute_c patch-sysctl_c patch-utils_c patch-version_c patch-who_c Log message: Switch shells/nsh to fetching from github, which has most of our patches rolled in. (Build currently fails due to noinet6 changes, this change doesn't fix this yet).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/01/10 05:44:01 Modified files: shells/nsh : Makefile shells/nsh/pkg : PLIST Added files: shells/nsh/patches: patch-conf_c patch-if_c Log message: Patch nsh with an initial fix following NOINET6 removal. no inet6 (to remove ip6 from an interface after it has been explicitly or implicitly added) is not yet supported. inet6 autoconf also needs to be handled (replacement for rtsol).
NEW: www/p5-Twiggy
Hi ports@! pkg/DESCR: Twiggy is a lightweight and fast HTTP server with unique features such as: PSGI, AnyEvent, and fast header parser. It has low memory footprint and is superdaemon aware (supports Server::Starter for hot deploy and graceful restarts). Tested on amd64. -- C. p5-Twiggy.tgz Description: GNU Zip compressed data
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2015/01/10 04:38:31 Log message: Import GBirthday, simple birthday reminder with tray notification. Comments and OK from sthen@ Status: Vendor Tag: kirby Release Tags: kirby_20150110 N ports/productivity/gbirthday/Makefile N ports/productivity/gbirthday/distinfo N ports/productivity/gbirthday/pkg/DESCR N ports/productivity/gbirthday/pkg/PLIST N ports/productivity/gbirthday/patches/patch-src_gbirthday_databases_lightning_py No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2015/01/10 06:55:32 Modified files: math/ntl : Makefile distinfo Log message: Update to ntl-8.1.0.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2015/01/10 10:35:06 Modified files: audio : Makefile converters : Makefile databases : Makefile devel : Makefile graphics : Makefile net: Makefile security : Makefile sysutils : Makefile textproc : Makefile www: Makefile Log message: Build ruby 2.2 versions of ruby C extension gems by default
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2015/01/10 13:08:58 Modified files: net/mtr: Makefile distinfo Removed files: net/mtr/patches: patch-report_c Log message: update to mtr 0.86
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: schwa...@cvs.openbsd.org2015/01/10 11:02:04 Modified files: textproc/urlview: Makefile Added files: textproc/urlview/patches: patch-urlview_man Log message: fix broken encoding of special characters which results in wrong regex code being displayed, and fix various other issues while here; feedback and ok sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: s...@cvs.openbsd.org2015/01/10 12:22:16 Modified files: devel/apr : Makefile devel/apr/pkg : PLIST Log message: Sync PLIST of devel/apr. It was missing some headers added in APR 1.5. found by and ok claudio@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jtur...@cvs.openbsd.org 2015/01/10 12:39:00 Modified files: sysutils/login_duo: Makefile distinfo Log message: Update login_duo to 1.9.14
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: z...@cvs.openbsd.org2015/01/10 15:02:56 Modified files: x11/qt5: Makefile x11/qt5/patches: patch-qtwebkit_Source_JavaScriptCore_heap_MachineStackMarker_cpp Log message: Better patch (likely to fix at least some crashes seen in Qt5Webkit), similar to what real upstream (i.e, WebKitGTK) has.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2015/01/10 19:44:44 Modified files: x11/mplayer: Makefile Log message: Remove USE_GROFF. naddy@ says its basically just whitespace differences and the pages look more than readable to me.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2015/01/10 16:13:29 Modified files: x11/mplayer: Makefile Log message: Tidy up the Makefile so my eyes don't bleed.
Re: UPDATE: x11/fluxbox 1.3.5 = 1.3.6
On 01/07/15 14:54, Brian Callahan wrote: Hi ports -- A new fluxbox was released today, attached is a diff to update it. Also do some Makefile rearrangement while here. Running it here on my machines. All is good. Testing on smaller archs appreciated. OK? ~Brian Ping. I have some positive user test reports. Will commit in a few days if I don't hear otherwise.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2015/01/11 00:29:29 Modified files: net/arping : Makefile distinfo Log message: Update to arping-2.15.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2015/01/11 00:53:08 Log message: Import p5-Plack-Middleware-RemoveRedundantBody. This module removes body in HTTP response, if it's not required. from Cesare Gargano (maintainer), ok sthen@ Status: Vendor Tag: benoit Release Tags: benoit_20150111 N ports/www/p5-Plack-Middleware-RemoveRedundantBody/Makefile N ports/www/p5-Plack-Middleware-RemoveRedundantBody/distinfo N ports/www/p5-Plack-Middleware-RemoveRedundantBody/pkg/PLIST N ports/www/p5-Plack-Middleware-RemoveRedundantBody/pkg/DESCR No conflicts created by this import
update games/freeciv
Hi!
This is an update for freeciv-2.4.4.
Among new features and fixes from upstream there are some changes to port
itself:
- sort variables to keep the same order as in Makefile.template
- move some files from -server to -client package where they belongs
- enable SEPARATE_BUILD
Tested on amd64. i386 and macppc. OK to commit?
Index: Makefile
===
RCS file: /cvs/ports/games/freeciv/Makefile,v
retrieving revision 1.96
diff -u -p -r1.96 Makefile
--- Makefile20 Aug 2013 22:05:52 - 1.96
+++ Makefile10 Jan 2015 20:20:49 -
@@ -4,16 +4,15 @@ COMMENT-main= Civilization clone for X11
COMMENT-client=Freeciv client
COMMENT-share= shared data files for Freeciv
-VERSION= 2.3.4
+VERSION= 2.4.4
DISTNAME= freeciv-${VERSION}
PKGNAME-main= freeciv-server-${VERSION}
PKGNAME-client=freeciv-client-${VERSION}
PKGNAME-share= freeciv-share-${VERSION}
+
CATEGORIES=games
-HOMEPAGE= http://www.freeciv.org/
-REVISION-main= 1
-REVISION-client=0
+HOMEPAGE= http://www.freeciv.org/
# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
@@ -21,62 +20,68 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=freeciv/}
EXTRACT_SUFX= .tar.bz2
-PSEUDO_FLAVORS=no_x11
-FLAVOR?=
-
-USE_GROFF =Yes
-MULTI_PACKAGES=-main -share
+cWANTLIB += bz2 c crypto curl idn lzma m pthread ssl z
+cWANTLIB += ${MODLUA_WANTLIB} ${MODGETTEXT_WANTLIB}
-MODULES= devel/gettext
-WANTLIB-main +=X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB-main +=Xrandr Xrender expat fontconfig freetype graphite2
-WANTLIB-main +=pixman-1 pthread pthread-stubs xcb xcb-render xcb-shm
+WANTLIB-main += ncurses readline ${cWANTLIB}
-CONFIGURE_ARGS=--with-ggz-client=no
+WANTLIB-client += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
Xrandr Xrender
+WANTLIB-client += atk-1.0 cairo expat ffi fontconfig freetype gdk_pixbuf-2.0
+WANTLIB-client += gdk-x11-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
graphite2 gthread-2.0
+WANTLIB-client += gtk-x11-2.0 harfbuzz pango-1.0 pangocairo-1.0 pangoft2-1.0
pcre
+WANTLIB-client += pixman-1 png pthread-stubs xcb xcb-render xcb-shm ${cWANTLIB}
-.if !${FLAVOR:Mno_x11}
-MULTI_PACKAGES+= -client
-CONFIGURE_ARGS+= --enable-client=gtk2 \
---disable-sdl-mixer
-.else
-CONFIGURE_ARGS+= --enable-client=no
-.endif
-
-PKG_ARCH-share=*
-LIB_DEPENDS-share=
WANTLIB-share=
-LIB_DEPENDS = archivers/bzip2 \
+MODULES= devel/gettext lang/lua
+
+LIB_DEPENDS= archivers/xz \
+ net/curl \
x11/gtk+2
-WANTLIB += bz2 c m z
-WANTLIB += atk-1.0 cairo ffi gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0
-WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 gtk-x11-2.0
-WANTLIB += harfbuzz pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pcre png
-
-WANTLIB-main +=${WANTLIB}
-WANTLIB-main +=ncurses readline
-
-WANTLIB-client += ${WANTLIB}
-WANTLIB-client += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
-WANTLIB-client += Xinerama Xrandr Xrender expat fontconfig freetype
graphite2
-WANTLIB-client += pixman-1 pthread pthread-stubs xcb xcb-render xcb-shm
+LIB_DEPENDS-share=
-RUN_DEPENDS-client= devel/desktop-file-utils \
- freeciv-share-${VERSION}:${BUILD_PKGPATH},-share \
+RUN_DEPENDS-client= freeciv-share-${VERSION}:${BUILD_PKGPATH},-share \
+ devel/desktop-file-utils \
x11/gtk+2,-guic
RUN_DEPENDS-main= freeciv-share-${VERSION}:${BUILD_PKGPATH},-share \
devel/desktop-file-utils \
x11/gtk+2,-guic
-USE_GMAKE= Yes
+SEPARATE_BUILD = Yes
+USE_GROFF =Yes
+USE_GMAKE =Yes
USE_LIBTOOL = No
CONFIGURE_STYLE=gnu
-CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
+CONFIGURE_ENV+=CPPFLAGS=-I${LOCALBASE}/include \
CFLAGS=-I${LOCALBASE}/include ${CFLAGS} \
- LDFLAGS=-L${LOCALBASE}/lib -lintl -liconv
+ LDFLAGS=-L${LOCALBASE}/lib -lintl -liconv \
+ LUA_CFLAGS=-I${MODLUA_INCL_DIR} \
+ LUA_LIBS=${MODLUA_LIB} -lm
+
+CONFIGURE_ARGS=--with-ggz-client=no \
+ --enable-mapimg=no \
+ --enable-sys-lua
+
+MULTI_PACKAGES=-main -share
+
+PSEUDO_FLAVORS=no_x11
+FLAVOR?=
+
+.if !${FLAVOR:Mno_x11}
+MULTI_PACKAGES+= -client
+CONFIGURE_ARGS+= --enable-client=gtk2 \
+--enable-fcmp=gtk2 \
+--disable-sdl-mixer
+.else
+CONFIGURE_ARGS+= --enable-client=no
+.endif
+
+PKG_ARCH-share=*
+
+post-install:
+ mv ${WRKINST}/etc/freeciv ${PREFIX}/share/examples/
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/games/freeciv/distinfo,v
retrieving revision 1.17
diff
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2015/01/11 00:45:54 Modified files: www: Makefile Log message: +p5-Plack-Middleware-FixMissingBodyInRedirect from Cesare Gargano (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2015/01/11 00:55:51 Modified files: www: Makefile Log message: +p5-Plack-Middleware-RemoveRedundantBody
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ben...@cvs.openbsd.org 2015/01/11 00:42:01 Log message: Import p5-Plack-Middleware-FixMissingBodyInRedirect. This module sets body in redirect response, if it's not already set. ok sthen@ Status: Vendor Tag: benoit Release Tags: benoit_20150111 N ports/www/p5-Plack-Middleware-FixMissingBodyInRedirect/Makefile N ports/www/p5-Plack-Middleware-FixMissingBodyInRedirect/distinfo N ports/www/p5-Plack-Middleware-FixMissingBodyInRedirect/pkg/PLIST N ports/www/p5-Plack-Middleware-FixMissingBodyInRedirect/pkg/DESCR No conflicts created by this import
