Update giram to 0.3.5 Removed files: files/patch-configure How-To-Repeat: N/A.
Bad man pages handling noticed by krion@ here the correct patch: diff -Nru giram.old/Makefile giram/Makefile --- giram.old/Makefile Fri Jul 25 22:28:50 2003 +++ giram/Makefile Fri Jul 25 23:01:59 2003 @@ -2,7 +2,7 @@ # Date created: 17 June 1999 # Whom: Brandon Fosdick <bfoz@glue.umd.edu> # -# $FreeBSD: ports/graphics/giram/Makefile,v 1.21 2003/07/24 19:17:34 naddy Exp $ +# $FreeBSD: ports/graphics/giram/Makefile,v 1.17 2003/05/18 12:41:43 kris Exp $ # PORTNAME= giram @@ -11,33 +11,42 @@ MASTER_SITES= http://www.giram.org/downloads/ MAINTAINER= ports@FreeBSD.org -COMMENT= A POV-Ray oriented modeller +COMMENT= Giram is Really A Modeller + +RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray31 USE_X_PREFIX= yes -USE_PERL5_BUILD= yes -USE_GNOME= gtk20 +USE_REINPLACE= yes +USE_MESA= yes USE_GMAKE= yes -USE_LIBTOOL= yes +USE_GNOME= gtk20 +WANT_GNOME= yes +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --with-gl=${X11BASE} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ - LDFLAGS="-L${LOCALBASE}/lib" \ - INTLTOOL_PERL="${PERL}" -CONFIGURE_ARGS= --datadir="${PREFIX}/lib" \ - --with-tutorial-path="${DOCSDIR}" \ - --with-lib3ds-prefix="${LOCALBASE}" + LIBS="-L${LOCALBASE}/lib" + MAN1= giram.1 -.if defined(WITH_POVRAY31) -BUILD_DEPENDS= povray:${PORTSDIR}/graphics/povray31 -RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray31 +.include <bsd.port.pre.mk> + +.if ${HAVE_GNOME:Mlibcapplet}!="" +USE_GNOME+= libcapplet +PKGNAMESUFFIX= -gnome .else -BUILD_DEPENDS= povray:${PORTSDIR}/graphics/povray -RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray +CONFIGURE_ARGS+=--disable-gnome .endif +pre-patch: + @${REINPLACE_CMD} -e \ + 's|-lpthread|${PTHREAD_LIBS:S/"//g}|g ; \ + s|DATADIRNAME=lib|DATADIRNAME=share|g ; \ + s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \ + s|\$$(top_builddir)/intl/libintl.a|-lintl|g' \ + ${WRKSRC}/configure + post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/samples/*.pov ${EXAMPLESDIR} -.endif + @${MKDIR} ${PREFIX}/share/doc/giram/SampleScenes + #${INSTALL_DATA} ${WRKSRC}/SampleScenes/* ${PREFIX}/share/doc/giram/SampleScenes/ -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff -Nru giram.old/files/patch-configure giram/files/patch-configure --- giram.old/files/patch-configure Fri Jul 25 22:28:50 2003 +++ giram/files/patch-configure Thu Jan 1 01:00:00 1970 @@ -1,19 +0,0 @@ ---- configure.orig Sat Mar 8 21:30:47 2003 -+++ configure Sun May 25 21:41:54 2003 -@@ -5432,6 +5432,7 @@ - - # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" -+$ac_aux_dir/ltconfig $LIBTOOL_DEPS - - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' - +@@ -5843,7 +5844,7 @@ - fi - - --CFLAGS="-g -Wall -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED $CFLAGS" -+CFLAGS="-DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED $CFLAGS" - - if test -n "$DEBUGFLAG"; then - CFLAGS="$DEBUGFLAG $CFLAGS" diff -Nru giram.old/pkg-plist giram/pkg-plist --- giram.old/pkg-plist Fri Jul 25 22:28:50 2003 +++ giram/pkg-plist Fri Jul 25 22:59:11 2003 @@ -1,53 +1,43 @@ -bin/giram bin/povfront +bin/giram etc/giram/0.3/giramrc etc/giram/0.3/giramrc_user etc/giram/0.3/gtkrc etc/giram/0.3/gtkrc_user etc/giram/0.3/ps-menurc -lib/giram/0.3/color/color1.gcf -lib/giram/0.3/finish/finish1 -lib/giram/0.3/giram_logo.ppm -lib/giram/0.3/giram_splash.ppm -lib/giram/0.3/modules/librender_flat.so -lib/giram/0.3/modules/librender_gouraud.so -lib/giram/0.3/modules/librender_hiddenfaces.so -lib/giram/0.3/modules/librender_povray.so -lib/giram/0.3/modules/librender_raytracing.so -lib/giram/0.3/modules/librender_wireframe.so -lib/giram/0.3/normal/normal1 -lib/giram/0.3/pigment/pigment1 -lib/giram/0.3/shape/shape1 -lib/giram/0.3/texture/texture1 -lib/giram/0.3/tips/giram_conseils.fr.txt -lib/giram/0.3/tips/giram_tips.txt -lib/giram/0.3/user_install +libexec/giram/plug-ins/Spheres libexec/giram/plug-ins/Box libexec/giram/plug-ins/Rotate -libexec/giram/plug-ins/Spheres -%%DOCSDIR%%/Tutorial -%%PORTDOCS%%%%EXAMPLESDIR%%/Cone.pov -%%PORTDOCS%%%%EXAMPLESDIR%%/Disc.pov -%%PORTDOCS%%%%EXAMPLESDIR%%/Giram.pov -%%PORTDOCS%%%%EXAMPLESDIR%%/IntSphereBox1.pov -%%PORTDOCS%%%%EXAMPLESDIR%%/IntSphereBox2.pov -%%PORTDOCS%%%%EXAMPLESDIR%%/IntSphereBox3.pov -%%PORTDOCS%%%%EXAMPLESDIR%%/IntSpherePlane1.pov -%%PORTDOCS%%%%EXAMPLESDIR%%/IntSpherePlane2.pov -%%PORTDOCS%%%%EXAMPLESDIR%%/IntSpherePlane3.pov -%%PORTDOCS%%%%EXAMPLESDIR%%/Triangle.pov -%%PORTDOCS%%%%EXAMPLESDIR%%/basicvue.pov -%%PORTDOCS%%%%EXAMPLESDIR%%/basicvue2.pov -%%PORTDOCS%%%%EXAMPLESDIR%%/basicvue3.pov -%%PORTDOCS%%%%EXAMPLESDIR%%/basicvue4.pov -%%PORTDOCS%%%%EXAMPLESDIR%%/box.pov -%%PORTDOCS%%%%EXAMPLESDIR%%/checker.pov -%%PORTDOCS%%%%EXAMPLESDIR%%/lollipop.pov -%%PORTDOCS%%%%EXAMPLESDIR%%/superel1.pov -%%PORTDOCS%%%%EXAMPLESDIR%%/superel2.pov -%%PORTDOCS%%%%EXAMPLESDIR%%/superel3.pov -%%PORTDOCS%%%%EXAMPLESDIR%%/test.pov -%%PORTDOCS%%%%EXAMPLESDIR%%/torus.pov +share/doc/giram/Tutorial +share/giram/0.3/color/color1.gcf +share/giram/0.3/finish/finish1 +share/giram/0.3/normal/normal1 +share/giram/0.3/pigment/pigment1 +share/giram/0.3/shape/shape1 +share/giram/0.3/texture/texture1 +share/giram/0.3/modules/librender_wireframe.so +share/giram/0.3/modules/librender_wireframe.la +share/giram/0.3/modules/librender_wireframe.a +share/giram/0.3/modules/librender_hiddenfaces.so +share/giram/0.3/modules/librender_hiddenfaces.la +share/giram/0.3/modules/librender_hiddenfaces.a +share/giram/0.3/modules/librender_flat.so +share/giram/0.3/modules/librender_flat.la +share/giram/0.3/modules/librender_flat.a +share/giram/0.3/modules/librender_gouraud.so +share/giram/0.3/modules/librender_gouraud.la +share/giram/0.3/modules/librender_gouraud.a +share/giram/0.3/modules/librender_raytracing.so +share/giram/0.3/modules/librender_raytracing.la +share/giram/0.3/modules/librender_raytracing.a +share/giram/0.3/modules/librender_povray.so +share/giram/0.3/modules/librender_povray.la +share/giram/0.3/modules/librender_povray.a +share/giram/0.3/tips/giram_tips.txt +share/giram/0.3/tips/giram_conseils.fr.txt +share/giram/0.3/user_install +share/giram/0.3/giram_logo.ppm +share/giram/0.3/giram_splash.ppm share/locale/ca/LC_MESSAGES/giram.mo share/locale/cs/LC_MESSAGES/giram.mo share/locale/da/LC_MESSAGES/giram.mo @@ -59,8 +49,8 @@ share/locale/fr/LC_MESSAGES/giram.mo share/locale/ga/LC_MESSAGES/giram.mo share/locale/gl/LC_MESSAGES/giram.mo -share/locale/hr/LC_MESSAGES/giram.mo share/locale/hu/LC_MESSAGES/giram.mo +share/locale/hr/LC_MESSAGES/giram.mo share/locale/it/LC_MESSAGES/giram.mo share/locale/ja/LC_MESSAGES/giram.mo share/locale/ko/LC_MESSAGES/giram.mo @@ -76,18 +66,3 @@ share/locale/uk/LC_MESSAGES/giram.mo share/locale/zh_CN/LC_MESSAGES/giram.mo share/locale/zh_TW/LC_MESSAGES/giram.mo -%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% -@dirrm %%DOCSDIR%% -@dirrm libexec/giram/plug-ins -@dirrm libexec/giram -@dirrm lib/giram/0.3/tips -@dirrm lib/giram/0.3/texture -@dirrm lib/giram/0.3/shape -@dirrm lib/giram/0.3/pigment -@dirrm lib/giram/0.3/normal -@dirrm lib/giram/0.3/modules -@dirrm lib/giram/0.3/finish -@dirrm lib/giram/0.3/color_map -@dirrm lib/giram/0.3/color -@dirrm lib/giram/0.3 -@dirrm lib/giram
State Changed From-To: open->closed Committed, thanks!