From rafan@svm.csie.ntu.edu.tw Wed Nov 29 16:33:45 2006 Return-Path: Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7D47416A403 for ; Wed, 29 Nov 2006 16:33:45 +0000 (UTC) (envelope-from rafan@svm.csie.ntu.edu.tw) Received: from svm.csie.ntu.edu.tw (svm.csie.ntu.edu.tw [140.112.90.75]) by mx1.FreeBSD.org (Postfix) with ESMTP id 46AB343CA5 for ; Wed, 29 Nov 2006 16:33:42 +0000 (GMT) (envelope-from rafan@svm.csie.ntu.edu.tw) Received: from svm.csie.ntu.edu.tw (localhost [127.0.0.1]) by svm.csie.ntu.edu.tw (8.13.8/8.13.8) with ESMTP id kATGXhnE074343; Thu, 30 Nov 2006 00:33:43 +0800 (CST) (envelope-from rafan@svm.csie.ntu.edu.tw) Received: (from rafan@localhost) by svm.csie.ntu.edu.tw (8.13.8/8.13.8/Submit) id kATGXeES092609; Thu, 30 Nov 2006 00:33:40 +0800 (CST) (envelope-from rafan) Message-Id: <200611291633.kATGXeES092609@svm.csie.ntu.edu.tw> Date: Thu, 30 Nov 2006 00:33:40 +0800 (CST) From: Rong-En Fan To: FreeBSD-gnats-submit@freebsd.org Cc: chinhngt@sectorb.msk.ru Subject: [PATCH] vietnamese/xvnkb: Respect X11BASE X-Send-Pr-Version: 3.113 X-GNATS-Notify: chinhngt@sectorb.msk.ru >Number: 106020 >Category: ports >Synopsis: [PATCH] vietnamese/xvnkb: Respect X11BASE >Confidential: no >Severity: non-critical >Priority: low >Responsible: rafan >State: closed >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Nov 29 16:40:10 GMT 2006 >Closed-Date: Sat Dec 02 12:20:51 GMT 2006 >Last-Modified: Sat Dec 2 12:30:06 GMT 2006 >Originator: Rong-En Fan >Release: FreeBSD 6.2-PRERELEASE amd64 >Organization: NTU CSIE >Environment: >Description: - Respect X11BASE The previous one does not work as expected. You also need to change tools/Makefile.dep. - Remove some unnecessary variables - configure already supports custom X11 path via XLIB_DIR, use that. Port maintainer (chinhngt@sectorb.msk.ru) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- vi-xvnkb-0.2.9_1.patch begins here --- Index: Makefile =================================================================== RCS file: /big/freebsd-cvsup/ncvs/ports/vietnamese/xvnkb/Makefile,v retrieving revision 1.7 diff -u -u -r1.7 Makefile --- Makefile 5 Nov 2005 05:22:01 -0000 1.7 +++ Makefile 29 Nov 2006 16:31:49 -0000 @@ -20,10 +20,9 @@ USE_GNOME= gtk20 GNU_CONFIGURE= yes -CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} -INSTALLS_SHLIB= yes +USE_LDCONFIG= yes -CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" X11BASE="${X11BASE}" +CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" XLIB_DIR="${X11BASE}" .if defined(WITHOUT_XFT) CONFIGURE_ARGS+= --no-xft @@ -31,7 +30,6 @@ LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft .endif -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} SUB_LIST= PORTVERSION=${PORTVERSION} SUB_FILES= pkg-message @@ -45,6 +43,9 @@ RUN_DEPENDS+= ${LOCALBASE}/share/locale/la_LN.UTF-8/LC_CTYPE:${PORTSDIR}/misc/utf8locale .endif +post-patch: + @${REINPLACE_CMD} -e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/tools/Makefile.dep + post-install: @${STRIP_CMD} ${PREFIX}/bin/xvnkb ${INSTALL_MAN} ${FILESDIR}/xvnkb.1 ${MANPREFIX}/man/man1 Index: files/patch-config__configure =================================================================== RCS file: /big/freebsd-cvsup/ncvs/ports/vietnamese/xvnkb/files/patch-config__configure,v retrieving revision 1.1 diff -u -u -r1.1 patch-config__configure --- files/patch-config__configure 26 Oct 2005 19:11:57 -0000 1.1 +++ files/patch-config__configure 29 Nov 2006 16:31:49 -0000 @@ -1,19 +1,15 @@ ---- config/configure.orig Tue Jan 6 10:55:26 2004 -+++ config/configure Wed Oct 26 17:04:29 2005 -@@ -28,10 +28,8 @@ +--- config/configure.orig Tue Jan 6 20:55:26 2004 ++++ config/configure Thu Nov 30 00:18:33 2006 +@@ -28,7 +28,7 @@ } xcc=$CC -#prefix=/usr/local --x_dirs="/usr/X11R6 /usr/X11 /usr/include \ -- /usr/local/X11R6 /usr/local/X11 /usr/local/include \ -- /opt/X11R6 /opt/X11 /opt/include" +prefix=${LOCALBASE} -+x_dirs=${X11BASE} - - if [ ! -f VERSION ]; then - echo -@@ -228,7 +226,7 @@ + x_dirs="/usr/X11R6 /usr/X11 /usr/include \ + /usr/local/X11R6 /usr/local/X11 /usr/local/include \ + /opt/X11R6 /opt/X11 /opt/include" +@@ -228,7 +228,7 @@ fi echo "VERSION=$version" > Makefile.cfg --- vi-xvnkb-0.2.9_1.patch ends here --- >Release-Note: >Audit-Trail: Responsible-Changed-From-To: freebsd-ports-bugs->rafan Responsible-Changed-By: edwin Responsible-Changed-When: Wed Nov 29 16:45:24 UTC 2006 Responsible-Changed-Why: Submitter has GNATS access http://www.freebsd.org/cgi/query-pr.cgi?pr=106020 State-Changed-From-To: open->feedback State-Changed-By: edwin State-Changed-When: Wed Nov 29 16:45:31 UTC 2006 State-Changed-Why: Awaiting maintainers feedback http://www.freebsd.org/cgi/query-pr.cgi?pr=106020 State-Changed-From-To: feedback->closed State-Changed-By: rafan State-Changed-When: Sat Dec 2 12:20:49 UTC 2006 State-Changed-Why: Committed. Thanks! http://www.freebsd.org/cgi/query-pr.cgi?pr=106020 From: dfilter@FreeBSD.ORG (dfilter service) To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/106020: commit references a PR Date: Sat, 2 Dec 2006 12:20:43 +0000 (UTC) rafan 2006-12-02 12:20:36 UTC FreeBSD ports repository Modified files: vietnamese/xvnkb Makefile vietnamese/xvnkb/files patch-config__configure Log: - Respect X11BASE The previous one does not work as expected. You also need to change tools/Makefile.dep. - Remove some unnecessary variables - configure already supports custom X11 path via XLIB_DIR, use that. PR: 106020 Submitted by: rafan Approved by: Nguyen Tam Chinh (maintainer) Revision Changes Path 1.8 +5 -4 ports/vietnamese/xvnkb/Makefile 1.2 +7 -11 ports/vietnamese/xvnkb/files/patch-config__configure _______________________________________________ cvs-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/cvs-all To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org" >Unformatted: