Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

whoops back out previous that wasn't supposed to go to pkgsrc-2007Q4

  • Loading branch information...
commit 7fef20cffcd08a26b5443cdc1c909488f5e93a19 1 parent 89734fe
rtr authored
View
5 net/rp-l2tp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10.2.1 2008/03/11 08:53:34 rtr Exp $
+# $NetBSD: Makefile,v 1.10.2.2 2008/03/11 09:08:34 rtr Exp $
#
DISTNAME= rp-l2tp-0.3
@@ -16,9 +16,6 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q}
USE_TOOLS+= gmake
-LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS}
-LDFLAGS.NetBSD+= -lutil
-
INSTALL_MAKE_FLAGS+= RPM_INSTALL_ROOT=${DESTDIR:Q}
PKG_DESTDIR_SUPPORT= user-destdir
View
5 net/rp-l2tp/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.4.2.1 2008/03/11 08:53:34 rtr Exp $
+$NetBSD: distinfo,v 1.4.2.2 2008/03/11 09:08:34 rtr Exp $
SHA1 (rp-l2tp-0.3.tar.gz) = 3f4f08a5271f0adf1dd90567851f1a8e223ecb72
RMD160 (rp-l2tp-0.3.tar.gz) = 25ed4a68a01c08f3acee1ce01a90673a568db55f
Size (rp-l2tp-0.3.tar.gz) = 191418 bytes
SHA1 (patch-aa) = a351d8bcea431bc47a0a375c770d07e059103841
-SHA1 (patch-ab) = 31b9b78bace8ab5c1717944e630f296b81cbbe11
+SHA1 (patch-ab) = 4a30988989688b1cdc30fdd73edd7fd60509d2e3
SHA1 (patch-ac) = ed6cb031b458027f7df8a97a051a1f12bc6b5e00
SHA1 (patch-ad) = 943de75b5928bca92ec739106f3c5679189557c3
SHA1 (patch-ae) = 62c6d5fb9ddd69467fbb6ed6b502add0ae646a29
SHA1 (patch-af) = 3fa6c660ca06ddf3ea49e33e31506f714f7ef9b5
SHA1 (patch-ag) = 5dc50f2ace17bb97717d628e9fdfe689443966c0
-SHA1 (patch-ah) = fcac0fb3c264d68df1f2dbbc0d548311abdaaa2c
View
14 net/rp-l2tp/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.2.2.1 2008/03/11 08:53:34 rtr Exp $
+$NetBSD: patch-ab,v 1.2.2.2 2008/03/11 09:08:34 rtr Exp $
---- Makefile.in.orig 2002-10-01 06:33:55.000000000 +1000
-+++ Makefile.in
-@@ -26,11 +26,20 @@ install=@INSTALL@
+--- Makefile.in.orig 2002-09-30 21:33:55.000000000 +0100
++++ Makefile.in 2003-12-18 10:24:07.000000000 +0000
+@@ -26,11 +26,20 @@
install_dir=@INSTALL@ -d
sbindir=@sbindir@
@@ -25,16 +25,16 @@ $NetBSD: patch-ab,v 1.2.2.1 2008/03/11 08:53:34 rtr Exp $
TARGETS=l2tpd libl2tp.a handlers
-@@ -43,7 +52,7 @@ libl2tp.a: $(OBJS)
+@@ -43,7 +52,7 @@
l2tpd: libl2tp.a libevent/libevent.a
$(MAKE) -C handlers
- @CC@ -o l2tpd -rdynamic $(OBJS) $(EXTRA_LIBS)
-+ @CC@ $(LDFLAGS) -o l2tpd $(DYNAMIC_FLAGS) $(OBJS) @LIBEVENT@/*.o $(EXTRA_LIBS)
++ @CC@ -o l2tpd $(DYNAMIC_FLAGS) $(OBJS) @LIBEVENT@/*.o $(EXTRA_LIBS)
libevent/libevent.a:
test -d libevent || ln -s ../libevent .
-@@ -82,8 +91,8 @@ distclean: clean
+@@ -82,8 +91,8 @@
install: all
-mkdir -p $(RPM_INSTALL_ROOT)$(sbindir)
$(install) -m 755 -s l2tpd $(RPM_INSTALL_ROOT)$(sbindir)
View
17 net/rp-l2tp/patches/patch-ah
@@ -1,17 +0,0 @@
-$NetBSD: patch-ah,v 1.1.2.1 2008/03/11 08:53:34 rtr Exp $
-
---- handlers/Makefile.in.orig 2008-03-10 15:31:14.000000000 +1100
-+++ handlers/Makefile.in
-@@ -28,10 +28,10 @@ cmd-control.o: cmd-control.c
- gcc $(CFLAGS) -fPIC -c -o $@ $<
-
- sync-pppd.so: pty.o sync-pppd.o
-- gcc -shared -o $@ $^
-+ gcc -shared $(LDFLAGS) -o $@ $^
-
- cmd.so: cmd.o dstring.o
-- gcc -shared -o $@ $^
-+ gcc -shared $(LDFLAGS) -o $@ $^
-
- clean:
- rm -f *.so *.o *~

0 comments on commit 7fef20c

Please sign in to comment.
Something went wrong with that request. Please try again.