Date: Sat, 19 Jun 2004 02:30:25 GMT From: Igor Pokrovsky <ip@doom.homeunix.org> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/67963: Update port: graphics/ftgl 2.07 -> 2.0.9 Message-ID: <200406190230.i5J2UPB4008524@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/67963; it has been noted by GNATS. From: Igor Pokrovsky <ip@doom.homeunix.org> To: Kirill Ponomarew <krion@voodoo.oberon.net> Cc: freebsd-gnats-submit@FreeBSD.org Subject: Re: ports/67963: Update port: graphics/ftgl 2.07 -> 2.0.9 Date: Sat, 19 Jun 2004 06:24:36 +0400 --+HP7ph2BbKc20aGI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Jun 18, 2004 at 11:33:44AM +0200, Kirill Ponomarew wrote: > Hi, > > On Thu, Jun 17, 2004 at 06:00:52PM +0400, Igor Pokrovsky wrote: > > On Wed, Jun 16, 2004 at 03:04:10PM +0000, Kirill Ponomarew wrote: > > > It doesn't install correctly: > > > /usr/bin/install -c -o root -g wheel -m 0644 html/* /var/tmp/ttt/share/doc/ftgl/html/ > > > install: html/*: No such file or directory > > > gmake[1]: *** [install-local] Error 71 > > I'm not getting this error... Could you send me full build log, > > so I could compare it with mine? > > The other problems are fixed with attached patch. > > Please submit the patch to the version in ports, not to the > version you submitted previously. Done. -ip -- New systems generate new problems. --+HP7ph2BbKc20aGI Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="ftgl.diff" diff -ruN /usr/ports/graphics/ftgl/Makefile ftgl/Makefile --- /usr/ports/graphics/ftgl/Makefile Fri Jun 4 15:45:27 2004 +++ ftgl/Makefile Thu Jun 17 17:48:42 2004 @@ -6,11 +6,10 @@ # PORTNAME= ftgl -PORTVERSION= 2.07 -PORTREVISION= 1 +PORTVERSION= 2.09 CATEGORIES= graphics MASTER_SITES= http://homepages.paradise.net.nz/henryj/code/ -DISTNAME= ${PORTNAME:U} +DISTNAME= ${PORTNAME}-${PORTVERSION:C/([[:digit:]])$/.\1/} MAINTAINER= tiamat@comset.net COMMENT= An OpenGL FreeType fonts rendering library @@ -20,39 +19,35 @@ USE_GMAKE= yes USE_GL= yes USE_X_PREFIX= yes +USE_REINPLACE= yes GNU_CONFIGURE= yes -CONFIGURE_WRKSRC= ${WRKDIR}/${DISTNAME}/unix +WRKSRC= ${WRKDIR}/${PORTNAME:U} +CONFIGURE_WRKSRC= ${WRKSRC}/unix CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ARGS= --with-gl-inc=${X11BASE}/include --with-gl-lib=${X11BASE}/lib BUILD_WRKSRC= ${CONFIGURE_WRKSRC} INSTALL_WRKSRC= ${CONFIGURE_WRKSRC} -INSTALLS_SHLIB= yes +MAKE_ENV= MKDIR="${MKDIR}" -do-install: - ${INSTALL_DATA} ${INSTALL_WRKSRC}/src/.libs/lib${PORTNAME}.a ${PREFIX}/lib - ${INSTALL_DATA} ${INSTALL_WRKSRC}/${PORTNAME}.pc ${PREFIX}/libdata/pkgconfig - @${MKDIR} ${PREFIX}/include/${PORTNAME} - ${INSTALL_DATA} ${WRKSRC}/include/*.h ${PREFIX}/include/${PORTNAME} +.ifdef (NOPORTDOCS) +DO_INSTALL_DOCS=\# +.endif + +post-patch: + @${REINPLACE_CMD} -e 's|%%PORTDOCS%%|${DO_INSTALL_DOCS}|' \ + ${BUILD_WRKSRC}/Makefile +post-install: @${MKDIR} ${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/demo/* ${EXAMPLESDIR} - ${PERL} -pi -e 's|%%CC%%|${CC}|g; \ - s|%%CXX%%|${CXX}|g; \ - s|%%RM%%|${RM}|g; \ - s|%%CFLAGS%%|${CFLAGS}|g; \ - s|%%CXXFLAGS%%|${CXXFLAGS}|g; \ - s|%%PREFIX%%|${PREFIX}|g; \ - s|%%X11BASE%%|${X11BASE}|g; \ - s|%%LOCALBASE%%|${LOCALBASE}|g' \ + @${SED} -e 's|%%CC%%|${CC}|g; \ + s|%%CXX%%|${CXX}|g; \ + s|%%RM%%|${RM}|g; \ + s|%%CFLAGS%%|${CFLAGS}|g; \ + s|%%CXXFLAGS%%|${CXXFLAGS}|g; \ + s|%%PREFIX%%|${PREFIX}|g; \ + s|%%X11BASE%%|${X11BASE}|g; \ + s|%%LOCALBASE%%|${LOCALBASE}|g' \ <${FILESDIR}/makefile.ex >${EXAMPLESDIR}/makefile - -.ifndef (NOPORTDOCS) - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/FTGL.html ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/docs/FTGL_1_3.gif ${DOCSDIR} - @${MKDIR} ${DOCSDIR}/images - ${INSTALL_DATA} ${WRKSRC}/docs/images/* ${DOCSDIR}/images -.endif .include <bsd.port.mk> diff -ruN /usr/ports/graphics/ftgl/distinfo ftgl/distinfo --- /usr/ports/graphics/ftgl/distinfo Wed Mar 31 07:08:14 2004 +++ ftgl/distinfo Thu Jun 17 17:48:43 2004 @@ -1,2 +1,2 @@ -MD5 (FTGL.tar.gz) = 62d363867d4906a428640e661c97f74f -SIZE (FTGL.tar.gz) = 569505 +MD5 (ftgl-2.0.9.tar.gz) = 2268267277c0655688879d0657b82650 +SIZE (ftgl-2.0.9.tar.gz) = 561543 diff -ruN /usr/ports/graphics/ftgl/files/makefile.ex ftgl/files/makefile.ex --- /usr/ports/graphics/ftgl/files/makefile.ex Sat Jan 17 12:03:29 2004 +++ ftgl/files/makefile.ex Thu Jun 17 17:14:30 2004 @@ -1,11 +1,13 @@ # Make sure, that you have graphics/libglut installed # in order to build example program +# +# $FreeBSD$ CC= %%CC%% CXX= %%CXX%% RM= %%RM%% -CFLAGS= %%CFLAGS%% -I. -I%%X11BASE%%/include -I%%PREFIX%%/include/ftgl -CXXFLAGS= %%CXXFLAGS%% -I. -I%%X11BASE%%/include -I%%PREFIX%%/include/ftgl +CFLAGS= %%CFLAGS%% -I. -I%%X11BASE%%/include -I%%PREFIX%%/include/FTGL +CXXFLAGS= %%CXXFLAGS%% -I. -I%%X11BASE%%/include -I%%PREFIX%%/include/FTGL LDFLAGS= -L%%X11BASE%%/lib -L%%PREFIX%%/lib -lglut -lftgl FREETYPE_CFLAGS!=%%LOCALBASE%%/bin/freetype-config --cflags diff -ruN /usr/ports/graphics/ftgl/files/patch-FTFace.cpp ftgl/files/patch-FTFace.cpp --- /usr/ports/graphics/ftgl/files/patch-FTFace.cpp Sat Jan 17 12:03:29 2004 +++ ftgl/files/patch-FTFace.cpp Thu Jan 1 03:00:00 1970 @@ -1,11 +0,0 @@ ---- src/FTFace.cpp.orig Fri Jan 16 13:23:11 2004 -+++ src/FTFace.cpp Fri Jan 16 13:23:23 2004 -@@ -62,7 +62,7 @@ - { - FT_Open_Args open; - -- open.flags = (FT_Open_Flags)1; // FT_OPEN_MEMORY; -+ open.flags = /*(FT_Open_Flags)*/1; // FT_OPEN_MEMORY; - open.memory_base = (FT_Byte *)pBufferBytes; - open.memory_size = bufferSizeInBytes; - diff -ruN /usr/ports/graphics/ftgl/files/patch-unix_Makefile ftgl/files/patch-unix_Makefile --- /usr/ports/graphics/ftgl/files/patch-unix_Makefile Thu Jan 1 03:00:00 1970 +++ ftgl/files/patch-unix_Makefile Thu Jun 17 17:29:14 2004 @@ -0,0 +1,22 @@ +--- unix/Makefile.orig Mon Jan 13 00:27:04 2003 ++++ unix/Makefile Thu Jun 17 17:20:29 2004 +@@ -1,7 +1,7 @@ + top_builddir=. + -include $(top_builddir)/Make.conf + +-SUBDIRS = src demo docs ++SUBDIRS = src demo %%PORTDOCS%%docs + + AUTOGEN = Make.conf config.log config.status libtool autom4te.cache ftgl.pc + AUTOGEN_MAINT = aclocal.m4 acinclude.m4 config.guess config.sub configure ltmain.sh install-sh +@@ -16,8 +16,8 @@ + ./configure + + install-local: ftgl.pc +- $(INSTALL) -d -m 0755 $(libdir)/pkgconfig +- $(INSTALL) -m 0644 ftgl.pc $(libdir)/pkgconfig/ ++ ${MKDIR} ${PREFIX}/libdata/pkgconfig ++ $(INSTALL) -m 0644 ftgl.pc ${PREFIX}/libdata/pkgconfig/ + + maint-clean-local: + $(RM) $(AUTOGEN_MAINT) diff -ruN /usr/ports/graphics/ftgl/files/patch-unix_src_Makefile ftgl/files/patch-unix_src_Makefile --- /usr/ports/graphics/ftgl/files/patch-unix_src_Makefile Thu Jan 1 03:00:00 1970 +++ ftgl/files/patch-unix_src_Makefile Thu Jun 17 17:14:30 2004 @@ -0,0 +1,13 @@ +--- unix/src/Makefile.orig Tue Jun 15 11:39:46 2004 ++++ unix/src/Makefile Tue Jun 15 11:40:03 2004 +@@ -75,8 +75,8 @@ + install-local: libftgl.la + $(INSTALL) -d -m 0755 $(libdir) + $(LIBTOOL) --mode=install $(INSTALL) -m 0644 $(TARGET) $(libdir) +- $(INSTALL) -d -m 0755 $(includedir)/FTGL +- $(INSTALL) -m 0644 $(HEADER_FILES) $(includedir)/FTGL ++ $(INSTALL) -d -m 0755 $(includedir)/FTGL ++ $(INSTALL) -m 0644 $(HEADER_FILES) $(includedir)/FTGL + + + clean-local: diff -ruN /usr/ports/graphics/ftgl/pkg-plist ftgl/pkg-plist --- /usr/ports/graphics/ftgl/pkg-plist Fri Jun 4 15:45:27 2004 +++ ftgl/pkg-plist Thu Jun 17 17:26:36 2004 @@ -1,32 +1,32 @@ -include/ftgl/FTBBox.h -include/ftgl/FTBitmapGlyph.h -include/ftgl/FTCharToGlyphIndexMap.h -include/ftgl/FTCharmap.h -include/ftgl/FTContour.h -include/ftgl/FTExtrdGlyph.h -include/ftgl/FTFace.h -include/ftgl/FTFont.h -include/ftgl/FTGL.h -include/ftgl/FTGLBitmapFont.h -include/ftgl/FTGLExtrdFont.h -include/ftgl/FTGLOutlineFont.h -include/ftgl/FTGLPixmapFont.h -include/ftgl/FTGLPolygonFont.h -include/ftgl/FTGLTextureFont.h -include/ftgl/FTGlyph.h -include/ftgl/FTGlyphContainer.h -include/ftgl/FTLibrary.h -include/ftgl/FTList.h -include/ftgl/FTOutlineGlyph.h -include/ftgl/FTPixmapGlyph.h -include/ftgl/FTPoint.h -include/ftgl/FTPolyGlyph.h -include/ftgl/FTSize.h -include/ftgl/FTTextureGlyph.h -include/ftgl/FTVector.h -include/ftgl/FTVectoriser.h -@dirrm include/ftgl +include/FTGL/FTBBox.h +include/FTGL/FTBitmapGlyph.h +include/FTGL/FTCharToGlyphIndexMap.h +include/FTGL/FTCharmap.h +include/FTGL/FTContour.h +include/FTGL/FTExtrdGlyph.h +include/FTGL/FTFace.h +include/FTGL/FTFont.h +include/FTGL/FTGL.h +include/FTGL/FTGLBitmapFont.h +include/FTGL/FTGLExtrdFont.h +include/FTGL/FTGLOutlineFont.h +include/FTGL/FTGLPixmapFont.h +include/FTGL/FTGLPolygonFont.h +include/FTGL/FTGLTextureFont.h +include/FTGL/FTGlyph.h +include/FTGL/FTGlyphContainer.h +include/FTGL/FTLibrary.h +include/FTGL/FTList.h +include/FTGL/FTOutlineGlyph.h +include/FTGL/FTPixmapGlyph.h +include/FTGL/FTPoint.h +include/FTGL/FTPolyGlyph.h +include/FTGL/FTSize.h +include/FTGL/FTTextureGlyph.h +include/FTGL/FTVector.h +include/FTGL/FTVectoriser.h lib/libftgl.a +lib/libftgl.la libdata/pkgconfig/ftgl.pc %%EXAMPLESDIR%%/makefile %%EXAMPLESDIR%%/tb.c @@ -35,11 +35,59 @@ %%EXAMPLESDIR%%/tb.h %%EXAMPLESDIR%%/trackball.h %%EXAMPLESDIR%%/README.txt -@dirrm %%EXAMPLESDIR%% -%%PORTDOCS%%%%DOCSDIR%%/images/ftgldemo.jpg -%%PORTDOCS%%%%DOCSDIR%%/images/metrics.png -%%PORTDOCS%%@dirrm %%DOCSDIR%%/images -%%PORTDOCS%%%%DOCSDIR%%/FTGL_1_3.gif -%%PORTDOCS%%%%DOCSDIR%%/FTGL.html -%%PORTDOCS%%%%DOCSDIR%%/README.txt +%%PORTDOCS%%%%DOCSDIR%%/html/FTBitmapGlyph_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTBitmapGlyph_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTCharmap_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTCharmap_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTContour_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTContour_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTExtrdGlyph_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTExtrdGlyph_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTFace_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTFace_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTFont_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTFont_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTGLBitmapFont_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTGLBitmapFont_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTGLExtrdFont_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTGLExtrdFont_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTGLOutlineFont_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTGLOutlineFont_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTGLPixmapFont_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTGLPixmapFont_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTGLPolygonFont_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTGLPolygonFont_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTGLTextureFont_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTGLTextureFont_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTGlyphContainer_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTGlyphContainer_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTGlyph_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTGlyph_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTLibrary_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTLibrary_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTOutlineGlyph_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTOutlineGlyph_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTPixmapGlyph_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTPixmapGlyph_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTPoint_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTPoint_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTPolyGlyph_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTPolyGlyph_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTSize_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTSize_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTTextureGlyph_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTTextureGlyph_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTVectoriser_8cpp-source.html +%%PORTDOCS%%%%DOCSDIR%%/html/FTVectoriser_8cpp.html +%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.css +%%PORTDOCS%%%%DOCSDIR%%/html/doxygen.png +%%PORTDOCS%%%%DOCSDIR%%/html/files.html +%%PORTDOCS%%%%DOCSDIR%%/html/globals.html +%%PORTDOCS%%%%DOCSDIR%%/html/globals_func.html +%%PORTDOCS%%%%DOCSDIR%%/html/globals_vars.html +%%PORTDOCS%%%%DOCSDIR%%/html/index.html +%%PORTDOCS%%@dirrm %%DOCSDIR%%/html %%PORTDOCS%%@dirrm %%DOCSDIR%% +@unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true +@dirrm include/FTGL +@dirrm %%EXAMPLESDIR%% --+HP7ph2BbKc20aGI--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200406190230.i5J2UPB4008524>