From daniel+roe=marvin@roe.ch  Thu Jan  3 00:33:02 2008
Return-Path: <daniel+roe=marvin@roe.ch>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 96E6116A41B;
	Thu,  3 Jan 2008 00:33:02 +0000 (UTC)
	(envelope-from daniel+roe=marvin@roe.ch)
Received: from calvin.roe.ch (calvin.roe.ch [213.144.141.26])
	by mx1.freebsd.org (Postfix) with ESMTP id 41FCD13C4CC;
	Thu,  3 Jan 2008 00:33:02 +0000 (UTC)
	(envelope-from daniel+roe=marvin@roe.ch)
Received: from marvin.roe ([10.23.42.11])
	by calvin.roe.ch (envelope-from <daniel+roe=marvin@roe.ch>)
	with ESMTPS (TLSv1:AES256-SHA:256) id 1JADfc-0002Kk-Tb
	; Thu, 03 Jan 2008 01:10:48 +0100
Received: from marvin.roe (localhost [127.0.0.1])
	by marvin.roe (8.13.8/8.13.8) with ESMTP id m030CtFe067215;
	Thu, 3 Jan 2008 01:12:55 +0100 (CET)
	(envelope-from roe@marvin.roe)
Received: (from roe@localhost)
	by marvin.roe (8.13.8/8.13.8/Submit) id m030CtFn067214;
	Thu, 3 Jan 2008 01:12:55 +0100 (CET)
	(envelope-from roe)
Message-Id: <200801030012.m030CtFn067214@marvin.roe>
Date: Thu, 3 Jan 2008 01:12:55 +0100 (CET)
From: Daniel Roethlisberger <daniel@roe.ch>
Reply-To: Daniel Roethlisberger <daniel@roe.ch>
To: FreeBSD-gnats-submit@freebsd.org
Cc: daniel@roe.ch, infofarmer@freebsd.org, danfe@freebsd.org
Subject: [patch] Update devel/libixp to 0.4
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         119281
>Category:       ports
>Synopsis:       [patch] Update devel/libixp to 0.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    infofarmer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 03 00:40:01 UTC 2008
>Closed-Date:    Tue Jan 29 12:55:26 UTC 2008
>Last-Modified:  Tue Jan 29 12:55:26 UTC 2008
>Originator:     Daniel Roethlisberger
>Release:        FreeBSD 6.2-RELEASE-p9 i386
>Organization:
>Environment:
System: FreeBSD marvin.roe 6.2-RELEASE-p9 FreeBSD 6.2-RELEASE-p9 #0: Thu Nov 29 04:07:33 UTC 2007 root@i386-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386
>Description:
	Update libixp to 0.4.  Required for the x11-wm/wmii update to 3.6.
	Removed CENKES from MASTER_SITES - you (port maintainer?) might want
	to copy the tarball to the appropriate places instead.
>How-To-Repeat:
>Fix:
--- patch-libixp-0.4.diff begins here ---
diff -ruN libixp.orig/Makefile libixp/Makefile
--- libixp.orig/Makefile	Thu Mar  8 20:24:31 2007
+++ libixp/Makefile	Wed Jan  2 22:33:43 2008
@@ -6,29 +6,40 @@
 #
 
 PORTNAME=	libixp
-PORTVERSION=	0.2.${CHANGESET}
+PORTVERSION=	0.4
 CATEGORIES=	devel
-MASTER_SITES=	CENKES
+MASTER_SITES=	http://www.suckless.org/download/
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Standalone client/server 9P library
 
-CHANGESET=	42
 USE_LDCONFIG=	yes
-USE_BZIP2=	yes
-CFLAGS+=	-I. -fPIC
-LDFLAGS+=	-L.
-MAKE_ARGS=	PREFIX="${PREFIX}" CC="${CC}" MANPREFIX="${MANPREFIX}/man" \
+USE_GMAKE=	yes
+CFLAGS+=	-I. -I${WRKSRC}/include -fPIC
+LDFLAGS+=	-L. -L${WRKSRC}/lib
+MAKE_ARGS=	PREFIX="${PREFIX}" CC="${CC} -c" LD="${CC}" \
 		CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
-MAN1=	ixpc.1
-PLIST_FILES=	bin/ixpc include/ixp.h include/ixp_fcall.h lib/libixp.so lib/libixp.so.0
+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:
-	@${REINPLACE_CMD} -e 's|\.a|.so|g;/RANLIB/d;s|{AR}|{CC} -shared -fPIC -o|;s|AR|CC|'\
-		${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|"VERSION"|${PORTVERSION}|' ${WRKSRC}/ixpc.c
+	@${REINPLACE_CMD} -e 's|\.a|.so|g;s|{AR}|{LD} -shared -fPIC -o|' \
+		${WRKSRC}/config.mk ${WRKSRC}/mk/lib.mk ${WRKSRC}/mk/hdr.mk
+	@${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}"|' ${WRKSRC}/cmd/ixpc.c
 
-post-install:
-	@${LN} -sf ${PREFIX}/lib/libixp.so ${PREFIX}/lib/libixp.so.0
+do-install:
+	${INSTALL_DATA} ${WRKSRC}/include/ixp.h ${PREFIX}/include
+	${INSTALL_DATA} ${WRKSRC}/include/ixp_fcall.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
+	${INSTALL_PROGRAM} ${WRKSRC}/cmd/ixpc.O ${PREFIX}/bin/ixpc
+	${INSTALL_MAN} ${WRKSRC}/man/ixpc.1 ${PREFIX}/man/man1
+	${LN} -sf ${PREFIX}/lib/libixp.so.1 ${PREFIX}/lib/libixp.so
+	${LN} -sf ${PREFIX}/lib/libixp_pthread.so.1 ${PREFIX}/lib/libixp_pthread.so
 
 .include <bsd.port.mk>
diff -ruN libixp.orig/distinfo libixp/distinfo
--- libixp.orig/distinfo	Wed Jan  2 17:32:04 2008
+++ libixp/distinfo	Wed Jan  2 17:34:58 2008
@@ -1,3 +1,3 @@
-MD5 (libixp-0.2.42.tar.bz2) = fd282b80b69fe3046c464a49ccd5bc07
-SHA256 (libixp-0.2.42.tar.bz2) = a459adc9bf7dff737a1c88c19d2ce7a9c8edbce12df2bd11525d5bb3e3caccd2
-SIZE (libixp-0.2.42.tar.bz2) = 19964
+MD5 (libixp-0.4.tar.gz) = 59d9e918adffaf4413b32ac4f66724fd
+SHA256 (libixp-0.4.tar.gz) = 171878dfb67ecf47866843c2d25882aeae44b2efd9a0d685f3b7ffba79ba842c
+SIZE (libixp-0.4.tar.gz) = 130229
--- patch-libixp-0.4.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->infofarmer 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Jan 3 00:40:08 UTC 2008 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=119281 
State-Changed-From-To: open->closed 
State-Changed-By: danfe 
State-Changed-When: Tue Jan 29 12:54:49 UTC 2008 
State-Changed-Why:  
Committed along with `x11-wm/wmii' update, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=119281 
>Unformatted:
