ports/52411: graphics/giram: upgrading to 0.3.5 and unbreaking.
Thierry Thomas
thierry at pompo.net
Sun May 18 21:00:40 UTC 2003
>Number: 52411
>Category: ports
>Synopsis: graphics/giram: upgrading to 0.3.5 and unbreaking.
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Sun May 18 14:00:37 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Thierry Thomas
>Release: FreeBSD 5.0-RELEASE-p7 i386
>Organization:
Kabbale Eros
>Environment:
System: FreeBSD ws90bj.pompo.net 5.0-RELEASE-p7 FreeBSD 5.0-RELEASE-p7 #0: Thu May 15 22:51:02 CEST 2003 thierry at ws90bj.pompo.net:/usr/obj/usr/src/sys/WS90BJ-030112 i386
>Description:
Giram-0.1.7 has been marked BROKEN. Upgrading to 0.3.5 make this port
build and run again.
>How-To-Repeat:
N/A.
>Fix:
Please apply the following patch.
Removed files:
- patch-aa;
- patch-configure.
--- giram.diff begins here ---
diff -urN graphics/giram.orig/Makefile graphics/giram/Makefile
--- graphics/giram.orig/Makefile Sun May 18 21:41:13 2003
+++ graphics/giram/Makefile Sun May 18 21:42:52 2003
@@ -6,29 +6,35 @@
#
PORTNAME= giram
-PORTVERSION= 0.1.7
+PORTVERSION= 0.3.5
CATEGORIES= graphics
-MASTER_SITES= ftp://ftp.giram.org/pub/
-DISTNAME= Giram-${PORTVERSION}
+MASTER_SITES= http://www.giram.org/downloads/
MAINTAINER= ports at FreeBSD.org
COMMENT= Giram is Really A Modeller
-RUN_DEPENDS= povray:${PORTSDIR}/graphics/povray31
-
-BROKEN= "Fails to patch"
+LIB_DEPENDS= 3ds.1:${PORTSDIR}/graphics/lib3ds
+.if !defined(WITH_POVRAY31)
+BUILD_DEPENDS= povray:${PORTSDIR}/graphics/povray
+.else
+BUILD_DEPENDS= povray:${PORTSDIR}/graphics/povray31
+.endif
+RUN_DEPENDS= ${BUILD_DEPENDS}
-USE_BZIP2= yes
USE_X_PREFIX= yes
USE_REINPLACE= yes
USE_MESA= yes
USE_GMAKE= yes
-USE_GNOME= gtk12
-WANT_GNOME= yes
-GNU_CONFIGURE= yes
+USE_GNOME= gtk20 atk gdkpixbuf pango
+USE_PERL5_BUILD=yes
+USE_LIBTOOL= yes
+
CONFIGURE_ARGS= --with-gl=${X11BASE}
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LIBS="-L${LOCALBASE}/lib"
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
+ LIBS="-L${LOCALBASE}/lib" \
+ INTLTOOL_PERL="${PERL}"
+
+MAN1= giram.1
.include <bsd.port.pre.mk>
@@ -48,7 +54,7 @@
${WRKSRC}/configure
post-install:
- @${MKDIR} ${PREFIX}/share/doc/giram/SampleScenes
- ${INSTALL_DATA} ${WRKSRC}/SampleScenes/* ${PREFIX}/share/doc/giram/SampleScenes/
+ @${MKDIR} ${EXAMPLESDIR}
+ @${INSTALL_DATA} ${WRKSRC}/samples/*pov ${EXAMPLESDIR}
.include <bsd.port.post.mk>
diff -urN graphics/giram.orig/distinfo graphics/giram/distinfo
--- graphics/giram.orig/distinfo Wed Dec 6 08:43:26 2000
+++ graphics/giram/distinfo Sun May 18 16:42:54 2003
@@ -1 +1 @@
-MD5 (Giram-0.1.7.tar.bz2) = 040f278a1466953d0031e3f970ebed52
+MD5 (giram-0.3.5.tar.gz) = 1197134bd838669f202fc2f2f1b5da9b
diff -urN graphics/giram.orig/files/patch-aa graphics/giram/files/patch-aa
--- graphics/giram.orig/files/patch-aa Tue Jul 11 15:14:06 2000
+++ graphics/giram/files/patch-aa Thu Jan 1 01:00:00 1970
@@ -1,19 +0,0 @@
---- src/view.c.orig Tue Jul 11 20:34:10 2000
-+++ src/view.c Tue Jul 11 20:52:40 2000
-@@ -223,6 +223,7 @@
- {
- ViewUserDataStruct *UserData;
- FrameStruct *LocalFrame;
-+ int fd;
- char *TmpFileName;
- gchar *CommandLine;
-
-@@ -230,7 +231,7 @@
- strcpy(TmpFileName, "/tmp/GiramXXXXXX");
- UserData = get_view_user_data();
- LocalFrame = UserData->FrameView;
-- mktemp(TmpFileName);
-+ fd = mkstemp(TmpFileName);
- SavePovByName(LocalFrame, TmpFileName);
- CommandLine = g_strdup_printf("povfront -p -s %s &", TmpFileName);
- system(CommandLine);
diff -urN graphics/giram.orig/files/patch-configure graphics/giram/files/patch-configure
--- graphics/giram.orig/files/patch-configure Thu Jan 17 07:22:50 2002
+++ graphics/giram/files/patch-configure Thu Jan 1 01:00:00 1970
@@ -1,31 +0,0 @@
---- configure.orig Thu Jan 17 01:15:12 2002
-+++ configure Thu Jan 17 01:17:15 2002
-@@ -4152,7 +4152,6 @@
- #
- have_pthread=no
- mesa_requires_pthread=no
-- if test "$ac_have_mesa_gl" = yes; then
- echo $ac_n "checking for pthread_create in -pthread""... $ac_c" 1>&6
- echo "configure:4158: checking for pthread_create in -pthread" >&5
- ac_lib_var=`echo pthread'_'pthread_create | sed 'y%./+-%__p_%'`
-@@ -4240,12 +4239,7 @@
- LIBS="$ac_save_LIBS"
-
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-- echo "$ac_t""yes" 1>&6
- mesa_requires_pthread=yes
--else
-- echo "$ac_t""no" 1>&6
--fi
-
- CPPFLAGS="$ac_save_CPPFLAGS"
- LDFLAGS="$ac_save_LDFLAGS"
-@@ -4253,7 +4247,6 @@
- if test "$mesa_requires_pthread" = yes; then
- GL_LIBS="$GL_LIBS -pthread"
- fi
-- fi
- # Check for OpenGL 1.1 features.
- #
-
diff -urN graphics/giram.orig/pkg-descr graphics/giram/pkg-descr
--- graphics/giram.orig/pkg-descr Wed Nov 21 21:40:39 2001
+++ graphics/giram/pkg-descr Sun May 18 19:23:11 2003
@@ -3,5 +3,4 @@
It is a Persistance Of Vision (POV-Ray) oriented modeller. But may become
more of a general modeller in the future.
-Author: David Odin <David.Odin at bigfoot.com>
WWW: http://www.giram.org/
diff -urN graphics/giram.orig/pkg-plist graphics/giram/pkg-plist
--- graphics/giram.orig/pkg-plist Sat Jul 15 18:14:46 2000
+++ graphics/giram/pkg-plist Sun May 18 20:51:26 2003
@@ -1,34 +1,107 @@
-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
+libexec/giram/plug-ins/Spheres
libexec/giram/plug-ins/Box
libexec/giram/plug-ins/Rotate
-libexec/giram/plug-ins/Spheres
-share/doc/giram/SampleScenes/Cone.pov
-share/doc/giram/SampleScenes/Disc.pov
-share/doc/giram/SampleScenes/Giram.gsf
-share/doc/giram/SampleScenes/Giram.pov
-share/doc/giram/SampleScenes/IntSphereBox1.pov
-share/doc/giram/SampleScenes/IntSphereBox2.pov
-share/doc/giram/SampleScenes/IntSphereBox3.pov
-share/doc/giram/SampleScenes/IntSpherePlane1.pov
-share/doc/giram/SampleScenes/IntSpherePlane2.pov
-share/doc/giram/SampleScenes/IntSpherePlane3.pov
-share/doc/giram/SampleScenes/Triangle.pov
-share/doc/giram/SampleScenes/basicvue.pov
-share/doc/giram/SampleScenes/basicvue2.pov
-share/doc/giram/SampleScenes/basicvue3.pov
-share/doc/giram/SampleScenes/basicvue4.pov
-share/doc/giram/SampleScenes/box.pov
-share/doc/giram/SampleScenes/lollipop.pov
-share/doc/giram/SampleScenes/superel1.pov
-share/doc/giram/SampleScenes/superel2.pov
-share/doc/giram/SampleScenes/superel3.pov
-share/doc/giram/SampleScenes/test.pov
-share/doc/giram/SampleScenes/torus.pov
-share/doc/giram/Tutorial
-share/locale/es/LC_MESSAGES/Giram.mo
-share/locale/fr/LC_MESSAGES/Giram.mo
- at dirrm share/doc/giram/SampleScenes
- at dirrm share/doc/giram
+%%DOCSDIR%%/Tutorial
+%%EXAMPLESDIR%%/Cone.pov
+%%EXAMPLESDIR%%/Disc.pov
+%%EXAMPLESDIR%%/Giram.pov
+%%EXAMPLESDIR%%/IntSphereBox1.pov
+%%EXAMPLESDIR%%/IntSphereBox2.pov
+%%EXAMPLESDIR%%/IntSphereBox3.pov
+%%EXAMPLESDIR%%/IntSpherePlane1.pov
+%%EXAMPLESDIR%%/IntSpherePlane2.pov
+%%EXAMPLESDIR%%/IntSpherePlane3.pov
+%%EXAMPLESDIR%%/Triangle.pov
+%%EXAMPLESDIR%%/basicvue.pov
+%%EXAMPLESDIR%%/basicvue2.pov
+%%EXAMPLESDIR%%/basicvue3.pov
+%%EXAMPLESDIR%%/basicvue4.pov
+%%EXAMPLESDIR%%/box.pov
+%%EXAMPLESDIR%%/checker.pov
+%%EXAMPLESDIR%%/lollipop.pov
+%%EXAMPLESDIR%%/superel1.pov
+%%EXAMPLESDIR%%/superel2.pov
+%%EXAMPLESDIR%%/superel3.pov
+%%EXAMPLESDIR%%/test.pov
+%%EXAMPLESDIR%%/torus.pov
+%%DATADIR%%/0.3/color/color1.gcf
+%%DATADIR%%/0.3/finish/finish1
+%%DATADIR%%/0.3/normal/normal1
+%%DATADIR%%/0.3/pigment/pigment1
+%%DATADIR%%/0.3/shape/shape1
+%%DATADIR%%/0.3/texture/texture1
+%%DATADIR%%/0.3/modules/librender_wireframe.so
+%%DATADIR%%/0.3/modules/librender_wireframe.la
+%%DATADIR%%/0.3/modules/librender_wireframe.a
+%%DATADIR%%/0.3/modules/librender_hiddenfaces.so
+%%DATADIR%%/0.3/modules/librender_hiddenfaces.la
+%%DATADIR%%/0.3/modules/librender_hiddenfaces.a
+%%DATADIR%%/0.3/modules/librender_flat.so
+%%DATADIR%%/0.3/modules/librender_flat.la
+%%DATADIR%%/0.3/modules/librender_flat.a
+%%DATADIR%%/0.3/modules/librender_gouraud.so
+%%DATADIR%%/0.3/modules/librender_gouraud.la
+%%DATADIR%%/0.3/modules/librender_gouraud.a
+%%DATADIR%%/0.3/modules/librender_raytracing.so
+%%DATADIR%%/0.3/modules/librender_raytracing.la
+%%DATADIR%%/0.3/modules/librender_raytracing.a
+%%DATADIR%%/0.3/modules/librender_povray.so
+%%DATADIR%%/0.3/modules/librender_povray.la
+%%DATADIR%%/0.3/modules/librender_povray.a
+%%DATADIR%%/0.3/tips/giram_tips.txt
+%%DATADIR%%/0.3/tips/giram_conseils.fr.txt
+%%DATADIR%%/0.3/user_install
+%%DATADIR%%/0.3/giram_logo.ppm
+%%DATADIR%%/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
+share/locale/de/LC_MESSAGES/giram.mo
+share/locale/el/LC_MESSAGES/giram.mo
+share/locale/en_GB/LC_MESSAGES/giram.mo
+share/locale/es/LC_MESSAGES/giram.mo
+share/locale/fi/LC_MESSAGES/giram.mo
+share/locale/fr/LC_MESSAGES/giram.mo
+share/locale/ga/LC_MESSAGES/giram.mo
+share/locale/gl/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
+share/locale/nl/LC_MESSAGES/giram.mo
+share/locale/no/LC_MESSAGES/giram.mo
+share/locale/pl/LC_MESSAGES/giram.mo
+share/locale/pt_BR/LC_MESSAGES/giram.mo
+share/locale/ro/LC_MESSAGES/giram.mo
+share/locale/ru/LC_MESSAGES/giram.mo
+share/locale/sk/LC_MESSAGES/giram.mo
+share/locale/sv/LC_MESSAGES/giram.mo
+share/locale/tr/LC_MESSAGES/giram.mo
+share/locale/uk/LC_MESSAGES/giram.mo
+share/locale/zh_CN/LC_MESSAGES/giram.mo
+share/locale/zh_TW/LC_MESSAGES/giram.mo
+ at dirrm etc/giram/0.3
+ at dirrm etc/giram
@dirrm libexec/giram/plug-ins
@dirrm libexec/giram
+ at dirrm %%DOCSDIR%%
+ at dirrm %%EXAMPLESDIR%%
+ at dirrm %%DATADIR%%/0.3/color
+ at dirrm %%DATADIR%%/0.3/color_map
+ at dirrm %%DATADIR%%/0.3/finish
+ at dirrm %%DATADIR%%/0.3/normal
+ at dirrm %%DATADIR%%/0.3/pigment
+ at dirrm %%DATADIR%%/0.3/shape
+ at dirrm %%DATADIR%%/0.3/texture
+ at dirrm %%DATADIR%%/0.3/modules
+ at dirrm %%DATADIR%%/0.3/tips
+ at dirrm %%DATADIR%%/0.3
+ at dirrm %%DATADIR%%
--- giram.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list