Attachment 73057 Details for Bug 106020 – vi-xvnkb-0.2.9_1.patch

[patch] vi-xvnkb-0.2.9_1.patch

vi-xvnkb-0.2.9_1.patch (text/plain), 2.22 KB, created by Rong-En Fan on 2006-11-29 16:40:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rong-En Fan

Created: 2006-11-29 16:40:10 UTC

Size: 2.22 KB

patch

obsolete

>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

Actions: View | Diff

Attachments on bug 106020: 73057