1. undefined symbol __guard_local -> drop -nostdlib
2. this uses a DSO -> SHARED_ONLY=Yes
3. there's a new release available since a few years
4. move MESSAGE to README.  Alternately I could just remove it: it
  basically says that the software comes with manpages, and parts of it
  can use a config file...

Tested on amd64.

ok / comments?

Index: Makefile
===================================================================
RCS file: /cvs/ports/net/trickle/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile    21 Mar 2013 08:46:35 -0000      1.18
+++ Makefile    21 Jan 2015 19:10:01 -0000
@@ -1,8 +1,9 @@
 # $OpenBSD: Makefile,v 1.18 2013/03/21 08:46:35 ajacoutot Exp $
 
+SHARED_ONLY=   Yes
+
 COMMENT=       lightweight userspace bandwidth shaper
-DISTNAME=      trickle-1.06
-REVISION=      5
+DISTNAME=      trickle-1.07
 CATEGORIES=    net
 
 HOMEPAGE=      http://monkey.org/~marius/trickle/
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/trickle/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo    18 Jan 2015 03:14:54 -0000      1.6
+++ distinfo    21 Jan 2015 19:01:30 -0000
@@ -1,2 +1,2 @@
-SHA256 (trickle-1.06.tar.gz) = nvg9JD1+kc1TM+96SX2PzlqhJ9JgDsCymTAvMcN7hgk=
-SIZE (trickle-1.06.tar.gz) = 166044
+SHA256 (trickle-1.07.tar.gz) = nTZQfgt6/fuHUzJE99ddqhwX8naJgmdPTJrdWubAOGg=
+SIZE (trickle-1.07.tar.gz) = 308863
Index: patches/patch-Makefile_in
===================================================================
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-Makefile_in   21 Jan 2015 19:02:24 -0000
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+undefined symbol '__guard_local'
+
+--- Makefile.in.orig   Sat Jan  8 21:20:08 2005
++++ Makefile.in        Wed Jan 21 20:01:48 2015
+@@ -618,7 +618,7 @@ mostlyclean distclean maintainer-clean
+ trickle-overload.so: $(TRICKLEOVERLOADFILES)
+       $(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libtmp$@.la                \
+               -rpath $(libdir)/trickle $(TRICKLEOVERLOADFILES) $(LIBS)     \
+-              $(LDFLAGS) -module -avoid-version -nostdlib @LIBDL@
++              $(LDFLAGS) -module -avoid-version @LIBDL@
+       @rm -f libtmp$@.la tmp$@.so* $@
+       @cp .libs/libtmp$@.so $@
+       @rm -f .libs/libtmp$@.*
Index: patches/patch-trickle-overload_c
===================================================================
RCS file: patches/patch-trickle-overload_c
diff -N patches/patch-trickle-overload_c
--- patches/patch-trickle-overload_c    24 May 2012 18:40:49 -0000      1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-trickle-overload_c,v 1.2 2012/05/24 18:40:49 gonzalo Exp $
---- trickle-overload.c.orig    Mon Jun  2 20:13:28 2003
-+++ trickle-overload.c Tue May  8 16:53:30 2012
-@@ -473,7 +473,7 @@ select(int nfds, fd_set *rfds, fd_set *wfds, fd_set *e
- #define POLL_WRMASK (POLLOUT | POLLWRNORM | POLLWRBAND)
- #define POLL_RDMASK (POLLIN | /* POLLNORM | */  POLLPRI | POLLRDNORM | 
POLLRDBAND)
- 
--#if defined(__linux__) || (defined(__svr4__) && defined(__sun__))
-+#if defined(__linux__) || (defined(__svr4__) && defined(__sun__)) || 
defined(__OpenBSD__)
- int
- poll(struct pollfd *fds, nfds_t nfds, int __timeout)
- #elif defined(__FreeBSD__)
Index: pkg/MESSAGE
===================================================================
RCS file: pkg/MESSAGE
diff -N pkg/MESSAGE
--- pkg/MESSAGE 24 May 2012 18:40:49 -0000      1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-Post Installation Set-Up of trickle
------------------------------------
-
-See trickle(1), trickled.conf(5), and trickled(8) for information on
-configuring and using trickle.  The optional trickled.conf configuration
-file should be placed at ${SYSCONFDIR}/trickled.conf.
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/trickle/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST
--- pkg/PLIST   24 May 2012 18:40:49 -0000      1.5
+++ pkg/PLIST   21 Jan 2015 19:35:58 -0000
@@ -7,5 +7,6 @@ lib/trickle/trickle-overload.so
 @man man/man1/trickle.1
 @man man/man5/trickled.conf.5
 @man man/man8/trickled.8
+share/doc/pkg-readmes/${FULLPKGNAME}
 @extra ${SYSCONFDIR}/trickled.conf
 @rcscript ${RCDIR}/trickled
Index: pkg/README
===================================================================
RCS file: pkg/README
diff -N pkg/README
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ pkg/README  21 Jan 2015 19:32:13 -0000
@@ -0,0 +1,11 @@
+$OpenBSD: README.template,v 1.4 2011/06/02 13:44:40 ajacoutot Exp $
+
++-----------------------------------------------------------------------
+| Running ${FULLPKGNAME} on OpenBSD
++-----------------------------------------------------------------------
+
+Documentation and configuration
+===============================
+See trickle(1), trickled.conf(5), and trickled(8) for information on
+configuring and using trickle.  The optional trickled.conf configuration
+file should be placed at ${SYSCONFDIR}/trickled.conf.


-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE

Reply via email to