--- libixp/Makefile	2009-02-26 17:51:34.000000000 +0100
+++ libixp/Makefile	2009-02-26 19:03:56.000000000 +0100
@@ -6,9 +6,10 @@ 
 #
 
 PORTNAME=	libixp
-PORTVERSION=	0.4
+PORTVERSION=	0.5
+PORTREVISION=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://www.suckless.org/download/
+MASTER_SITES=	http://code.suckless.org/dl/libs/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Standalone client/server 9P library
@@ -20,25 +21,19 @@ 
 		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAN1=		ixpc.1
-PLIST_FILES=	bin/ixpc include/ixp.h include/ixp_fcall.h \
-		lib/libixp.so lib/libixp.so.1 \
-		lib/libixp_pthread.so lib/libixp_pthread.so.1
 
-post-patch: .SILENT
+post-patch:
 	${REINPLACE_CMD} -e 's|\.a|.so|g; s|{AR}|{LD} -shared -fPIC -o|' \
 		${WRKSRC}/mk/lib.mk ${WRKSRC}/mk/hdr.mk
-# Fix garbled "awk" strings after previous sed(1) invocation
-	${REINPLACE_CMD} -e 's|\.sowk|.awk|' ${WRKSRC}/mk/hdr.mk
-	${REINPLACE_CMD} -e 's|\(echo.*\)AR|\1LD|' ${WRKSRC}/mk/lib.mk
-	${REINPLACE_CMD} -e 's|$${ROOT}/lib/libixp.a|-lixp|' \
-		${WRKSRC}/cmd/Makefile
-	${REINPLACE_CMD} -e 's|VERSION|"${PORTVERSION}"|' \
+	${REINPLACE_CMD} -e 's|VERSION|"${PORTVERSION}.${PORTREVISION}"|' \
 		${WRKSRC}/cmd/ixpc.c
 
-# XXX Apparently, vendor's install: target is broken for us XXX
+do-build:
+	cd ${WRKSRC}; ${MAKE};
+
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/ixp.h ${PREFIX}/include
-	${INSTALL_DATA} ${WRKSRC}/include/ixp_fcall.h ${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/include/ixp_srvutil.h ${PREFIX}/include
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/libixp.so ${PREFIX}/lib/libixp.so.1
 	${INSTALL_PROGRAM} ${WRKSRC}/lib/libixp_pthread.so \
 		${PREFIX}/lib/libixp_pthread.so.1
--- libixp/distinfo	2009-02-26 17:51:34.000000000 +0100
+++ libixp/distinfo	2009-02-26 17:54:08.000000000 +0100
@@ -1,3 +1,3 @@ 
-MD5 (libixp-0.4.tar.gz) = 59d9e918adffaf4413b32ac4f66724fd
-SHA256 (libixp-0.4.tar.gz) = 171878dfb67ecf47866843c2d25882aeae44b2efd9a0d685f3b7ffba79ba842c
-SIZE (libixp-0.4.tar.gz) = 130229
+MD5 (libixp-0.5.tar.gz) = 2a394310c209605ba54ecf5eab518bff
+SHA256 (libixp-0.5.tar.gz) = 65f4f0bb67e83cbd1414f297e22648c867f914e2498bdbae3afdc0f83be21e4b
+SIZE (libixp-0.5.tar.gz) = 142064
--- libixp/pkg-descr	2009-02-26 17:51:34.000000000 +0100
+++ libixp/pkg-descr	2009-02-26 17:53:19.000000000 +0100
@@ -5,4 +5,4 @@ 
 libixp's server API is based heavily on that of Plan 9's lib9p, and the
 two libraries export virtually identical data structures.
 
-WWW: http://www.suckless.org/wiki/libs
+WWW: http://www.suckless.org/libs/libixp.html
--- libixp/pkg-plist	1970-01-01 01:00:00.000000000 +0100
+++ libixp/pkg-plist	2009-02-26 19:00:30.000000000 +0100
@@ -0,0 +1,7 @@ 
+bin/ixpc 
+include/ixp.h 
+include/ixp_srvutil.h  
+lib/libixp.so 
+lib/libixp.so.1  
+lib/libixp_pthread.so 
+lib/libixp_pthread.so.1