Date: Wed, 07 Apr 2010 10:34:42 +0200 From: Pav Lucistnik <pav@FreeBSD.org> To: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp> Cc: freebsd-ports-bugs@FreeBSD.org, bug-followup@FreeBSD.org Subject: Re: ports/144138: failure in building x11-toolkits/xview Message-ID: <1270629282.10293.5.camel@pav.hide.vol.cz> In-Reply-To: <201004070214.AA01272@POLYMER5.scphys.kyoto-u.ac.jp> References: <201004020937.AA01268@POLYMER5.scphys.kyoto-u.ac.jp> <201004070214.AA01272@POLYMER5.scphys.kyoto-u.ac.jp>
next in thread | previous in thread | raw e-mail | index | archive | help
--=-XymKtOEWB9u7OjILD4TS
Content-Type: text/plain; charset="ISO-8859-2"
Content-Transfer-Encoding: quoted-printable
This works for me - committed, thanks!
Tsurutani Naoki p=ED=B9e v st 07. 04. 2010 v 11:14 +0900:
> Here is a patch (something ad-hoc...):
> --- xview/Makefile.orig 2009-08-07 06:00:08.000000000 +0900
> +++ xview/Makefile 2010-04-07 11:06:12.000000000 +0900
> @@ -28,7 +28,7 @@
> USE_IMAKE=3D yes
> USE_XORG=3D x11
> USE_LDCONFIG=3D yes
> -IMAKEINCLUDE=3D "-I${LOCALBASE}/lib/X11/config -I${WRKSRC}/config"
> +IMAKEINCLUDE=3D "-I${WRKSRC}/config -I${LOCALBASE}/lib/X11/config"
> MAKE_ENV+=3D IMAKEINCLUDE=3D${IMAKEINCLUDE}
> ALL_TARGET=3D World
> SUB_FILES=3D pkg-message
> @@ -49,6 +49,10 @@
> ${WRKSRC}/config/XView.cf
> @${REINPLACE_CMD} -e "s,CcCmd cc,CcCmd ${CC}," \
> ${WRKSRC}/config/XView.tmpl
> +.if ${OSVERSION} < 800090
> + @${REINPLACE_CMD} -e "s/-DCOMPAT_43TTY//" \
> + ${WRKSRC}/config/XView.tmpl
> +.endif
> @${REINPLACE_CMD} -e 's+/usr/X11/+${LOCALBASE}/+g;' \
> ${WRKSRC}/clients/olwm/screen.c
> ${REINPLACE_CMD} -e 's+/usr/lib+${PREFIX}/lib+' \
> --- xview/files/patch-config+XView.tmpl.orig 2003-12-14 08:38:20.00000000=
0 +0900
> +++ xview/files/patch-config+XView.tmpl 2010-04-07 10:39:10.000000000 +09=
00
> @@ -1,6 +1,6 @@
> ---- config/XView.tmpl.orig Mon Sep 29 00:02:17 2003
> -+++ config/XView.tmpl Mon Sep 29 00:02:17 2003
> -@@ -96,7 +96,7 @@
> +--- config/XView.tmpl.orig 2010-04-07 10:28:25.000000000 +0900
> ++++ config/XView.tmpl 2010-04-07 10:35:36.000000000 +0900
> +@@ -96,11 +96,13 @@
> * Work around small conflict with Project.tmpl file
> */
> #if UseInstalled
> @@ -9,7 +9,14 @@
> #endif
> =20
> #if OsHasLocale
> -@@ -192,14 +192,6 @@
> +- LOCALE_DEFINES =3D -DOS_HAS_LOCALE
> ++ LOCALE_DEFINES =3D -DOS_HAS_LOCALE -DCOMPAT_43TTY
> ++#else
> ++ LOCALE_DEFINES =3D -DCOMPAT_43TTY
> + #endif
> +=20
> + #if OsHasMmap
> +@@ -192,14 +194,6 @@
> AS =3D as
> */
> /*
> @@ -24,7 +31,7 @@
> * Temporary directory used during build process before the include
> * files are installed. This is just a place where symbolic links are
> * placed to point back to the actual files in the build hierarchy to
> -@@ -224,7 +216,7 @@
> +@@ -224,7 +218,7 @@
> * afterwards.
> */
> #ifndef XVIncludeDirName
> @@ -33,7 +40,7 @@
> #endif
> INCDIR =3D XVIncludeDirName
> /*
> -@@ -356,10 +348,10 @@
> +@@ -356,10 +350,10 @@
> =20
> #if SystemV4
> SYSV_CLIENT_LIB =3D -lintl -ldl
> @@ -46,7 +53,7 @@
> #endif
> =20
> /*
> -@@ -371,16 +363,16 @@
> +@@ -371,16 +365,16 @@
> */
> =20
> #if XvI18nLevel =3D=3D 4
> @@ -70,7 +77,7 @@
> =20
> /*
> * Define libraries for XView clients
> -@@ -410,7 +402,7 @@
> +@@ -410,7 +404,7 @@
> */
> #if SharedLibXView
> # ifndef SharedXViewRev
> @@ -79,7 +86,7 @@
> # define SharedXViewRev 3
> #else
> # define SharedXViewRev 3.2
> -@@ -449,12 +441,8 @@
> +@@ -449,12 +443,8 @@
> * Include the XView specific makefile macros.
> */
> =20
> ----
> IMAKEINCLUDE order should be fixed, to build on the host xview installed.
>=20
--=20
Pav Lucistnik <pav@oook.cz>
<pav@FreeBSD.org>
On real UNIX, /usr/bin/more prints -More-.
--=-XymKtOEWB9u7OjILD4TS
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Toto je =?UTF-8?Q?digit=C3=A1ln=C4=9B?=
=?ISO-8859-1?Q?_podepsan=E1?= =?UTF-8?Q?_=C4=8D=C3=A1st?=
=?ISO-8859-1?Q?_zpr=E1vy?=
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (FreeBSD)
iEYEABECAAYFAku8Q50ACgkQntdYP8FOsoI70gCgjXoNthEBxOXByYH1FWX+nzKT
YGwAnjyvahmgMQPAzRqVzIp8iceX1fo5
=ha5P
-----END PGP SIGNATURE-----
--=-XymKtOEWB9u7OjILD4TS--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1270629282.10293.5.camel>