Update libixp to 0.5. Tested on i386 running the June 5 snapshot of 4.7-CURRENT. Please test and comment.
-sl
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/libixp/Makefile,v
retrieving revision 1.4
diff -u -p Makefile
--- Makefile 11 Mar 2009 19:41:03 -0000 1.4
+++ Makefile 7 Jun 2010 00:48:25 -0000
@@ -2,8 +2,8 @@
COMMENT= stand-alone client/server 9P library
-DISTNAME= libixp-0.4
-PKGNAME= ${DISTNAME}p1
+DISTNAME= libixp-0.5
+PKGNAME= ${DISTNAME}
CATEGORIES= devel
HOMEPAGE= http://www.suckless.org
@@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-MASTER_SITES= ${HOMEPAGE}/download/
+MASTER_SITES= http://dl.suckless.org/libs/
WANTLIB= c
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/libixp/distinfo,v
retrieving revision 1.1.1.1
diff -u -p distinfo
--- distinfo 15 Mar 2008 12:38:53 -0000 1.1.1.1
+++ distinfo 7 Jun 2010 00:48:25 -0000
@@ -1,5 +1,5 @@
-MD5 (libixp-0.4.tar.gz) = WdnpGK3/r0QTsyrE9mck/Q==
-RMD160 (libixp-0.4.tar.gz) = JA/hyxbqwjzwC/+5PfGxMgHJwbo=
-SHA1 (libixp-0.4.tar.gz) = 7Brf60xfUC38sbmfz0QIQezuL5o=
-SHA256 (libixp-0.4.tar.gz) = Fxh437Z+z0eGaEPC0liCrq5Esu/ZoNaF87f/unm6hCw=
-SIZE (libixp-0.4.tar.gz) = 130229
+MD5 (libixp-0.5.tar.gz) = KjlDEMIJYFulTs9eq1GL/w==
+RMD160 (libixp-0.5.tar.gz) = g2cPgpof8YXy33RP0z1WZJsrKzU=
+SHA1 (libixp-0.5.tar.gz) = bLnT58YyOs1MOHb2oBrV2K+eHGo=
+SHA256 (libixp-0.5.tar.gz) = ZfTwu2foPL0UFPKX4iZIyGf5FOJJi9uuOv3A+DviHks=
+SIZE (libixp-0.5.tar.gz) = 142064
? patch-port
cvs server: warning: patches/patch-cmd_ixpc_c was lost
? patches/patch-cmd_ixpc_c
Index: patches/patch-config_mk
===================================================================
RCS file: /cvs/ports/devel/libixp/patches/patch-config_mk,v
retrieving revision 1.3
diff -u -p patches/patch-config_mk
--- patches/patch-config_mk 11 Mar 2009 19:41:03 -0000 1.3
+++ patches/patch-config_mk 7 Jun 2010 00:48:25 -0000
@@ -1,33 +1,23 @@
-$OpenBSD: patch-config_mk,v 1.3 2009/03/11 19:41:03 martin Exp $
---- config.mk.orig Mon Nov 5 15:36:22 2007
-+++ config.mk Tue Mar 10 23:02:26 2009
-@@ -11,9 +11,9 @@ RUBYINC = -I/usr/local/lib/ruby/1.8/i386-freebsd6
- TASKINC = -I${HOME}/libtask
+--- config.mk.orig Sun Jun 6 18:42:44 2010
++++ config.mk Sun Jun 6 18:43:12 2010
+@@ -5,10 +5,10 @@
+ libixp_pthread
- # paths
+ # Paths
-PREFIX = /usr/local
+#PREFIX = /usr/local
- BIN = ${PREFIX}/bin
--MAN = ${PREFIX}/share/man
-+MAN = ${PREFIX}/man
- ETC = ${PREFIX}/etc
- LIBDIR = ${PREFIX}/lib
- INCLUDE = ${PREFIX}/include
-@@ -24,15 +24,15 @@ LIBS = -L/usr/lib -lc
+ BIN = $(PREFIX)/bin
+- MAN = $(PREFIX)/share/man
+- ETC = $(PREFIX)/etc
++ MAN = $(PREFIX)/man
++ ETC = $(PREFIX)/share/examples
+ LIBDIR = $(PREFIX)/lib
+ INCLUDE = $(PREFIX)/include
- # Flags
- include ${ROOT}/mk/gcc.mk
--CFLAGS = -g -Wall ${INCS} -DVERSION=\"${VERSION}\"
-+CFLAGS = !!CFLAGS!! -g -Wall ${INCS} -DVERSION=\"${VERSION}\"
- LDFLAGS = -g ${LIBS}
-
- # Compiler
--CC = cc -c
-+CC = !!CC!! -c
- # Linker (Under normal circumstances, this should *not* be 'ld')
--LD = cc
-+LD = !!CC!!
- # Other
+@@ -25,7 +25,7 @@
+ CC = cc -c
+ LD = cc
+ # Archiver
-AR = ar crs
+AR = ar cr
#AR = sh -c 'ar cr "$$@" && ranlib "$$@"'
Index: patches/patch-libixp_server_c
===================================================================
RCS file: /cvs/ports/devel/libixp/patches/patch-libixp_server_c,v
retrieving revision 1.1.1.1
diff -u -p patches/patch-libixp_server_c
--- patches/patch-libixp_server_c 15 Mar 2008 12:38:53 -0000 1.1.1.1
+++ patches/patch-libixp_server_c 7 Jun 2010 00:48:25 -0000
@@ -1,11 +1,10 @@
-$OpenBSD: patch-libixp_server_c,v 1.1.1.1 2008/03/15 12:38:53 mcbride Exp $
---- libixp/server.c.orig Tue Feb 19 04:07:08 2008
-+++ libixp/server.c Tue Feb 19 04:07:24 2008
-@@ -6,6 +6,7 @@
- #include <stdlib.h>
+--- libixp/server.c.orig Sun Jun 6 17:21:00 2010
++++ libixp/server.c Sun Jun 6 17:21:12 2010
+@@ -7,6 +7,7 @@
+ #include <sys/types.h>
#include <sys/socket.h>
#include <unistd.h>
+#include <string.h>
#include "ixp_local.h"
- IxpConn *
+ /**
Index: patches/patch-mk_lib_mk
===================================================================
RCS file: /cvs/ports/devel/libixp/patches/patch-mk_lib_mk,v
retrieving revision 1.1
diff -u -p patches/patch-mk_lib_mk
--- patches/patch-mk_lib_mk 11 Mar 2009 19:41:03 -0000 1.1
+++ patches/patch-mk_lib_mk 7 Jun 2010 00:48:25 -0000
@@ -1,10 +1,10 @@
-$OpenBSD: patch-mk_lib_mk,v 1.1 2009/03/11 19:41:03 martin Exp $
---- mk/lib.mk.orig Thu Mar 5 21:52:46 2009
-+++ mk/lib.mk Thu Mar 5 21:53:05 2009
-@@ -22,5 +22,6 @@ ${LIB}: ${OFILES}
- echo AR $$($(ROOT)/util/cleanname $(BASE)/$@)
- mkdir ${ROOT}/lib 2>/dev/null || true
- ${AR} $@ ${OFILES}
-+ ranlib ${LIB}
+--- mk/lib.mk.orig Sun Jun 6 17:22:14 2010
++++ mk/lib.mk Sun Jun 6 17:22:49 2010
+@@ -24,6 +24,7 @@
+ echo AR $$($(CLEANNAME) $(BASE)/$@)
+ mkdir $(ROOT)/lib 2>/dev/null || true
+ $(AR) $@ $(OFILES)
++ ranlib $(LIB)
- include ${ROOT}/mk/common.mk
+ SOMKSH=case "$(MAKESO)" in 1|[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]) echo
$(ROOT)/mk/so.mk;; *) echo /dev/null;; esac
+ SOMK:=${shell $(SOMKSH)}
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/libixp/pkg/PLIST,v
retrieving revision 1.2
diff -u -p pkg/PLIST
--- pkg/PLIST 15 Mar 2008 15:52:53 -0000 1.2
+++ pkg/PLIST 7 Jun 2010 00:48:25 -0000
@@ -2,7 +2,6 @@
bin/ixpc
�...@comment etc/
include/ixp.h
-include/ixp_fcall.h
lib/libixp.a
lib/libixp_pthread.a
�...@man man/man1/ixpc.1
libixp-0.5.tar.gz
Description: application/tar-gz
