Date: Sat, 17 Jul 2010 00:10:10 +0400 From: Anonymous <swell.k@gmail.com> To: David Wolfskill <david@catwhisker.org> Cc: freebsd-ports@freebsd.org Subject: Re: Attempt to upgrade xpaint-2.7.8.1_4 to xpaint-2.9.1.4 fails Message-ID: <864ofzqjbx.fsf@gmail.com> In-Reply-To: <20100716183342.GE8973@albert.catwhisker.org> (David Wolfskill's message of "Fri, 16 Jul 2010 11:33:42 -0700") References: <20100716183342.GE8973@albert.catwhisker.org>
next in thread | previous in thread | raw e-mail | index | archive | help
David Wolfskill <david@catwhisker.org> writes:
[...]
> cc -c -I. -I/usr/include/X11/Xft -I/usr/include/freetype2 -I/usr/local/include -DCSRG_BASED -DFUNCPROTO=15 -DNARROWPROTO AsciiSink.c -o unshared/AsciiSink.o
> In file included from /usr/local/include/X11/Xft/Xft.h:39,
> from AsciiSink.c:56:
> /usr/local/include/ft2build.h:56:38: error: freetype/config/ftheader.h: No such file or directory
> In file included from AsciiSink.c:56:
> /usr/local/include/X11/Xft/Xft.h:40:10: error: #include expects "FILENAME" or <FILENAME>
> In file included from AsciiSink.c:56:
> /usr/local/include/X11/Xft/Xft.h:60: error: expected '=', ',', ';', 'asm' or '__attribute__' before '_XftFTlibrary'
> /usr/local/include/X11/Xft/Xft.h:94: error: expected specifier-qualifier-list before 'FT_UInt'
> /usr/local/include/X11/Xft/Xft.h:101: error: expected specifier-qualifier-list before 'FT_UInt'
> /usr/local/include/X11/Xft/Xft.h:188: error: expected ';', ',' or ')' before '*' token
> /usr/local/include/X11/Xft/Xft.h:293: error: expected ';', ',' or ')' before '*' token
> /usr/local/include/X11/Xft/Xft.h:352: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'XftLockFace'
> /usr/local/include/X11/Xft/Xft.h:391: error: expected ';', ',' or ')' before '*' token
> /usr/local/include/X11/Xft/Xft.h:397: error: expected ';', ',' or ')' before '*' token
> /usr/local/include/X11/Xft/Xft.h:406: error: expected declaration specifiers or '...' before 'FT_UInt'
> /usr/local/include/X11/Xft/Xft.h:407: error: expected declaration specifiers or '...' before 'FT_UInt'
> /usr/local/include/X11/Xft/Xft.h:416: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'XftCharIndex'
> /usr/local/include/X11/Xft/Xft.h:449: error: expected ';', ',' or ')' before '*' token
> *** Error code 1
Can you try following patch?
%%
Index: graphics/xpaint/Makefile
===================================================================
RCS file: /a/.cvsup/ports/graphics/xpaint/Makefile,v
retrieving revision 1.72
diff -u -p -r1.72 Makefile
--- graphics/xpaint/Makefile 16 Jul 2010 03:31:49 -0000 1.72
+++ graphics/xpaint/Makefile 16 Jul 2010 20:02:44 -0000
@@ -20,6 +20,10 @@ USE_BZIP2= yes
USE_IMAKE= yes
USE_XORG= xft xmu xpm
+MAKE_JOBS_UNSAFE=yes
+HAS_CONFIGURE= yes
+CONFIGURE_ARGS= xaw3dxft.a
+
MAN1= xpaint.1
post-extract:
@@ -32,7 +36,4 @@ post-patch:
s|@XPMDIR@|${LOCALBASE}|g ; \
s|@LOCALBASE@|${LOCALBASE}|g' ${WRKSRC}/Local.config
-pre-configure:
- @cd ${WRKSRC} && ${SH} ./configure xaw3dxft.a
-
.include <bsd.port.mk>
Index: graphics/xpaint/files/patch-xaw3dxft-Imakefile
===================================================================
RCS file: graphics/xpaint/files/patch-xaw3dxft-Imakefile
diff -N graphics/xpaint/files/patch-xaw3dxft-Imakefile
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ graphics/xpaint/files/patch-xaw3dxft-Imakefile 16 Jul 2010 19:19:20 -0000
@@ -0,0 +1,17 @@
+--- xaw3dxft/Imakefile~
++++ xaw3dxft/Imakefile
+@@ -1,3 +1,5 @@
++#include "../Local.config"
++
+ #ifndef XCOMM
+ #define XCOMM #
+ #endif
+@@ -25,7 +27,7 @@ XCOMM For scrollbars with arrows, define
+ #define IncSubSubdir Xaw3dxft
+
+ XCOMM When building outside an X11 source tree:
+-EXTRA_INCLUDES = -I. -I/usr/include/X11/Xft -I/usr/include/freetype2
++EXTRA_INCLUDES = -I. $(XFT_INCLUDE)
+
+ #ifdef SharedXawReqs
+ REQUIREDLIBS = SharedXawReqs -lXft
%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?864ofzqjbx.fsf>