>Number:         22440
>Category:       pkg
>Synopsis:       pkgsrc/chat/psi doesn't build with xpkgwedge + fix
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Aug 11 15:52:00 UTC 2003
>Closed-Date:
>Last-Modified:
>Originator:     Juan RP
>Release:        NetBSD 1.6W
>Organization:
>Environment:
System: NetBSD Insomnio 1.6W NetBSD 1.6W (Insomnio) #0: Tue Aug 5 10:27:02 CEST 2003 juan@Insomnio:/usr/compile/obj/sys/arch/i386/compile/Insomnio i386
Architecture: i386
Machine: i386
>Description:

Building chat/psi with xpkgwedge previously installed fails because it wants
the files on X11BASE ... we need to use PREFIX instead, also minor fixes as
the harcoded path of sourceforge will be replaced with MASTER_SITE_SOURCEFORGE,
and lines of 80 characters ... 

bump PKGREVISION to 2.

>How-To-Repeat:

cd pkgsrc/chat/psi && make install 

>Fix:


Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/chat/psi/Makefile,v
retrieving revision 1.11
diff -b -u -r1.11 Makefile
--- Makefile	2003/08/05 13:36:16	1.11
+++ Makefile	2003/08/11 15:43:29
@@ -1,9 +1,9 @@
 # $NetBSD: Makefile,v 1.11 2003/08/05 13:36:16 drochner Exp $
 
 DISTNAME=	psi-0.9
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	chat
-MASTER_SITES=	http://belnet.dl.sourceforge.net/sourceforge/psi/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=psi/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jdolecek@NetBSD.org
@@ -15,22 +15,26 @@
 USE_BUILDLINK2=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-USE_X11BASE=	yes
+USE_X11=	yes
 HAS_CONFIGURE=	yes
 
 CONFIGURE_ARGS+= -p ${PREFIX}
 
 post-configure:
-	${SED} -e 's:^CHK_DIR_EXISTS *= *$$:CHK_DIR_EXISTS=test -d:' -e "s:^MKDIR *= *$$:MKDIR=${MKDIR}:" -e "s:/bin/true:${TRUE}:" < ${BUILD_DIRS}/Makefile > ${BUILD_DIRS}/Makefile.orig
+	${SED} \
+		-e 's:^CHK_DIR_EXISTS *= *$$:CHK_DIR_EXISTS=test -d:' \
+		-e "s:^MKDIR *= *$$:MKDIR=${MKDIR}:" \
+		-e "s:/bin/true:${TRUE}:" < ${BUILD_DIRS}/Makefile > \
+		${BUILD_DIRS}/Makefile.orig
 	${MV} ${BUILD_DIRS}/Makefile.orig ${BUILD_DIRS}/Makefile
 
 do-install:
 	cd ${WRKSRC} && ${QTDIR}/bin/lrelease psi.pro
-	${INSTALL_DATA_DIR} ${X11BASE}/share/psi
+	${INSTALL_DATA_DIR} ${PREFIX}/share/psi
 	cd ${WRKSRC} && ${CP} -f -pR image iconsets sound certs lang/*.qm \
 		README COPYING \
-		${X11BASE}/share/psi/
-	cd ${WRKSRC} && ${CP} -f psi ${X11BASE}/bin/psi
+		${PREFIX}/share/psi/
+	cd ${WRKSRC} && ${CP} -f psi ${PREFIX}/bin/psi
 
 .include "../../x11/qt3-libs/buildlink2.mk"
 BUILDLINK_DEPENDS.qt3-tools=	qt3-tools>=3.1.2nb2	# need lrelease
>Release-Note:
>Audit-Trail:
>Unformatted: