ports/165912: [patch] x11/xcolorsel: fix build error with imake

[Conrad J. Sabatier]

>Number:         165912
>Category:       ports
>Synopsis:       [patch] x11/xcolorsel: fix build error with imake
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 11 04:30:07 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Conrad J. Sabatier
>Release:        FreeBSD 10.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD serene.no-ip.org 10.0-CURRENT FreeBSD 10.0-CURRENT #0: Sun Feb 12 19:15:46 CST 2012 conrads at serene.no-ip.org:/usr/obj/usr/src/sys/CUSTOM amd64

>Description:
		Build of x11/xcolorsel errors out with USE_IMAKE.
		Remove USE_IMAKE and manually run xmkmf instead.
		Also add one more expression to the sed command in
		the post-patch target, to correct the path at which
		the rgb.txt file is located, and set MANCOMPRESSED to
		avoid an error from bsd.ports.mk in handling the
		already compressed man page.
>How-To-Repeat:
		Build the port as is.  Errors occur during the imake
		step.
>Fix:
		patch below

--- xcolorsel.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/x11/xcolorsel/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- Makefile	13 Dec 2010 17:24:00 -0000	1.15
+++ Makefile	11 Mar 2012 04:13:53 -0000
@@ -20,18 +20,22 @@
 RUN_DEPENDS=	rgb>=1.0.3:${PORTSDIR}/x11/rgb
 
 WRKSRC=		${WRKDIR}/xcolorsel
-USE_IMAKE=	yes
 USE_XORG=	xpm
 
 .if !defined(NO_INSTALL_MANPAGES)
 MAN1=		xcolorsel.1
+MANCOMPRESSED=	yes
 .endif
 
 post-patch:
 	@${ECHO_CMD} "*.file: ${LOCALBASE}/lib/X11/rgb.txt" >> ${WRKSRC}/Xcolorsel.ad
 	@${REINPLACE_CMD} -e 's|#include <malloc.h>||g' \
-		-e 's|/Xaw/|/Xaw3d/|g' ${WRKSRC}/*.[ch]
+		-e 's|/Xaw/|/Xaw3d/|g' \
+		-e 's|/usr/lib/X11/rgb.txt|/usr/local/lib/X11/rgb.txt|g' ${WRKSRC}/*.[ch]
 	@${REINPLACE_CMD} -e 's|app2head|./app2head|g' \
 		-e 's|XawClientLibs|-lXaw3d $$(XMULIBONLY) $$(XTOOLLIB) $$(XPMLIB) $$(XLIB)|g' ${WRKSRC}/Imakefile
 
+do-configure:
+	cd ${WRKSRC} && xmkmf
+
 .include <bsd.port.mk>
--- xcolorsel.diff ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: