diff options
| author | Rong-En Fan <rafan@FreeBSD.org> | 2006-12-02 12:20:36 +0000 |
|---|---|---|
| committer | Rong-En Fan <rafan@FreeBSD.org> | 2006-12-02 12:20:36 +0000 |
| commit | 4528470eb0cac074f2cf91e8d974ce0e932804fb (patch) | |
| tree | c0804bc1b674551dee590a464aac2ccf3ac4690a /vietnamese | |
| parent | 65b8cfa7be637f7ba11ba4b4b753cb0909acaac0 (diff) | |
| download | ports-4528470eb0cac074f2cf91e8d974ce0e932804fb.tar.gz ports-4528470eb0cac074f2cf91e8d974ce0e932804fb.zip | |
- 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 <chinhngt at sectorb.msk.ru> (maintainer)
Notes
Notes:
svn path=/head/; revision=178576
Diffstat (limited to 'vietnamese')
| -rw-r--r-- | vietnamese/xvnkb/Makefile | 9 | ||||
| -rw-r--r-- | vietnamese/xvnkb/files/patch-config__configure | 18 |
2 files changed, 12 insertions, 15 deletions
diff --git a/vietnamese/xvnkb/Makefile b/vietnamese/xvnkb/Makefile index 66720da5360a..027fbce2a36b 100644 --- a/vietnamese/xvnkb/Makefile +++ b/vietnamese/xvnkb/Makefile @@ -20,10 +20,9 @@ USE_XLIB= yes 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 @@ CONFIGURE_ARGS+= --no-xft 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 @@ MAN1= xvnkb.1 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 diff --git a/vietnamese/xvnkb/files/patch-config__configure b/vietnamese/xvnkb/files/patch-config__configure index 35f443c05db2..9fc7ffab1a6e 100644 --- a/vietnamese/xvnkb/files/patch-config__configure +++ b/vietnamese/xvnkb/files/patch-config__configure @@ -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 |