summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsthen <sthen@openbsd.org>2017-05-25 14:39:58 (GMT)
committersthen <sthen@openbsd.org>2017-05-25 14:39:58 (GMT)
commiteb3d0f50400b742f8e5e32d2cc97d58a2f093908 (patch)
tree9a87200e01862f09aa7d904faf6d5cf7ad830683
parent4a7831cf7c7af50e601f5a781320c02aa4a694c1 (diff)
downloadopenbsd-ports-eb3d0f50400b742f8e5e32d2cc97d58a2f093908.tar.gz
openbsd-ports-eb3d0f50400b742f8e5e32d2cc97d58a2f093908.tar.xz
don't use a local copy of getopt, use libc's. ok mestre@
-rw-r--r--net/trickle/Makefile4
-rw-r--r--net/trickle/patches/patch-Makefile_in37
2 files changed, 36 insertions, 5 deletions
diff --git a/net/trickle/Makefile b/net/trickle/Makefile
index 6ae08b3..0696b39 100644
--- a/net/trickle/Makefile
+++ b/net/trickle/Makefile
@@ -1,7 +1,9 @@
-# $OpenBSD: Makefile,v 1.21 2017/02/03 16:21:10 naddy Exp $
+# $OpenBSD: Makefile,v 1.22 2017/05/25 14:39:58 sthen Exp $
COMMENT= lightweight userspace bandwidth shaper
DISTNAME= trickle-1.07
+REVISION= 0
+
CATEGORIES= net
HOMEPAGE= http://monkey.org/~marius/trickle/
diff --git a/net/trickle/patches/patch-Makefile_in b/net/trickle/patches/patch-Makefile_in
index 468647b..5c1cf4b 100644
--- a/net/trickle/patches/patch-Makefile_in
+++ b/net/trickle/patches/patch-Makefile_in
@@ -1,9 +1,38 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2015/01/22 00:02:41 jca Exp $
+$OpenBSD: patch-Makefile_in,v 1.2 2017/05/25 14:39:59 sthen Exp $
-undefined symbol '__guard_local'
+-nostdlib: undefined symbol '__guard_local'
+remove getopt.c: fix with clang
---- Makefile.in.orig Sat Jan 8 21:20:08 2005
-+++ Makefile.in Wed Jan 21 20:01:48 2015
+Index: Makefile.in
+--- Makefile.in.orig
++++ Makefile.in
+@@ -107,10 +107,10 @@ man_MANS = trickle.1 trickled.8 trickled.conf.5
+ bin_PROGRAMS = trickle trickled tricklectl
+
+ trickle_DEPENDENCIES = @ERRO@ @LIBOBJS@
+-trickle_SOURCES = trickle.c util.c getopt.c
++trickle_SOURCES = trickle.c util.c
+ trickle_LDADD = @ERRO@ @LIBOBJS@
+
+-trickled_SOURCES = trickled.c atomicio.c print.c bwstat.c client.c conf.c util.c cleanup.c getopt.c xdr.c
++trickled_SOURCES = trickled.c atomicio.c print.c bwstat.c client.c conf.c util.c cleanup.c xdr.c
+
+ trickled_LDADD = @EVENTLIB@ @LIBOBJS@
+
+@@ -138,11 +138,11 @@ DEFS = @DEFS@ -I. -I$(srcdir) -I.
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
+-trickle_OBJECTS = trickle.$(OBJEXT) util.$(OBJEXT) getopt.$(OBJEXT)
++trickle_OBJECTS = trickle.$(OBJEXT) util.$(OBJEXT)
+ trickle_LDFLAGS =
+ trickled_OBJECTS = trickled.$(OBJEXT) atomicio.$(OBJEXT) \
+ print.$(OBJEXT) bwstat.$(OBJEXT) client.$(OBJEXT) conf.$(OBJEXT) \
+-util.$(OBJEXT) cleanup.$(OBJEXT) getopt.$(OBJEXT) xdr.$(OBJEXT)
++util.$(OBJEXT) cleanup.$(OBJEXT) xdr.$(OBJEXT)
+ trickled_DEPENDENCIES = @LIBOBJS@
+ trickled_LDFLAGS =
+ tricklectl_OBJECTS = tricklectl.$(OBJEXT) trickledu.$(OBJEXT) \
@@ -618,7 +618,7 @@ mostlyclean distclean maintainer-clean
trickle-overload.so: $(TRICKLEOVERLOADFILES)
$(LIBTOOL) --mode=link $(CC) $(CFLAGS) -o libtmp$@.la \