ports/53393: Update port: graphics/giram to 0.3.5 and take over maintainership

Ying-Chieh Chen yinjieh at csie.nctu.edu.tw
Tue Jun 17 01:10:11 UTC 2003


>Number:         53393
>Category:       ports
>Synopsis:       Update port: graphics/giram to 0.3.5 and take over maintainership
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jun 16 18:10:08 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Ying-Chieh Chen
>Release:        FreeBSD 4.8-RELEASE i386
>Organization:
yinjieh's lab
>Environment:
System: FreeBSD stable.yinjieh.com 4.8-RELEASE FreeBSD 4.8-RELEASE #0: Thu Apr 3 10:53:38 GMT 2003 root at freebsd-stable.sentex.ca:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:

	Update port: graphics/giram to 0.3.5 and take over maintainership.
	Both tested on 4.8-RELEASE and 5.1-RELEASE.

	Please commit it for me, thanks.

>How-To-Repeat:
	
>Fix:

	

--- giram.patch begins here ---
diff -ruN /usr/ports/graphics/giram/Makefile /tmp/giram/Makefile
--- /usr/ports/graphics/giram/Makefile	Sat Jun  7 02:35:10 2003
+++ /tmp/giram/Makefile	Mon Jun 16 08:12:13 2003
@@ -6,24 +6,20 @@
 #
 
 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
+MAINTAINER=	yinjieh at csie.nctu.edu.tw
 COMMENT=	Giram is Really A Modeller
 
 RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray31
 
-BROKEN=		"Fails to patch"
-
-USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_MESA=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gtk12
+USE_GNOME=	gtk20
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-gl=${X11BASE}
@@ -46,9 +42,5 @@
 		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
 		 s|\$$(top_builddir)/intl/libintl.a|-lintl|g' \
 		 ${WRKSRC}/configure
-
-post-install:
-	@${MKDIR} ${PREFIX}/share/doc/giram/SampleScenes
-	${INSTALL_DATA} ${WRKSRC}/SampleScenes/* ${PREFIX}/share/doc/giram/SampleScenes/
 
 .include <bsd.port.post.mk>
diff -ruN /usr/ports/graphics/giram/distinfo /tmp/giram/distinfo
--- /usr/ports/graphics/giram/distinfo	Wed Dec  6 15:43:26 2000
+++ /tmp/giram/distinfo	Sun Jun 15 21:06:29 2003
@@ -1 +1 @@
-MD5 (Giram-0.1.7.tar.bz2) = 040f278a1466953d0031e3f970ebed52
+MD5 (giram-0.3.5.tar.gz) = 1197134bd838669f202fc2f2f1b5da9b
diff -ruN /usr/ports/graphics/giram/files/patch-aa /tmp/giram/files/patch-aa
--- /usr/ports/graphics/giram/files/patch-aa	Tue Jul 11 21:14:06 2000
+++ /tmp/giram/files/patch-aa	Thu Jan  1 08: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 -ruN /usr/ports/graphics/giram/files/patch-ac /tmp/giram/files/patch-ac
--- /usr/ports/graphics/giram/files/patch-ac	Thu Oct  5 15:22:39 2000
+++ /tmp/giram/files/patch-ac	Thu Jan  1 08:00:00 1970
@@ -1,11 +0,0 @@
---- docs/Makefile.in.orig	Mon Mar  6 00:33:01 2000
-+++ docs/Makefile.in	Mon Mar  6 00:35:17 2000
-@@ -88,7 +88,7 @@
- helpfilepath = @helpfilepath@
- l = @l@
- 
--docsdir = @helpfilepath@
-+docsdir = @prefix@/share/doc/giram
- 
- docs_DATA = Tutorial
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff -ruN /usr/ports/graphics/giram/files/patch-configure /tmp/giram/files/patch-configure
--- /usr/ports/graphics/giram/files/patch-configure	Thu Jan 17 14:22:50 2002
+++ /tmp/giram/files/patch-configure	Thu Jan  1 08: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 -ruN /usr/ports/graphics/giram/files/patch-doc-Makefile.in /tmp/giram/files/patch-doc-Makefile.in
--- /usr/ports/graphics/giram/files/patch-doc-Makefile.in	Thu Jan  1 08:00:00 1970
+++ /tmp/giram/files/patch-doc-Makefile.in	Mon Jun 16 18:14:17 2003
@@ -0,0 +1,11 @@
+--- docs/Makefile.in.orig	Mon Jun 16 00:24:45 2003
++++ docs/Makefile.in	Mon Jun 16 01:12:34 2003
+@@ -137,7 +137,7 @@
+ shapedata = @shapedata@
+ texturedata = @texturedata@
+ 
+-docsdir = @helpfilepath@
++docsdir = @prefix@/share/doc/giram
+ 
+ docs_DATA = Tutorial
+ 
diff -ruN /usr/ports/graphics/giram/files/patch-src-view.c /tmp/giram/files/patch-src-view.c
--- /usr/ports/graphics/giram/files/patch-src-view.c	Thu Jan  1 08:00:00 1970
+++ /tmp/giram/files/patch-src-view.c	Mon Jun 16 18:11:14 2003
@@ -0,0 +1,19 @@
+--- src/view.c.orig	Mon Jun 16 00:18:19 2003
++++ src/view.c	Mon Jun 16 00:24:30 2003
+@@ -213,13 +213,15 @@
+ {
+   ViewStruct  *view_data;
+   FrameStruct *LocalFrame;
++  int fd;
+   gchar       *TmpFileName;
+   gchar       *CommandLine;
+ 
+   TmpFileName = g_strdup("/tmp/GiramXXXXXX");
+   view_data = get_current_view_data();
+   LocalFrame = view_data->frame;
+-  close(mkstemp(TmpFileName));
++  fd = mkstemp(TmpFileName);
++  close(fd);
+   SavePovByName(LocalFrame, TmpFileName);
+   CommandLine = g_strdup_printf("povfront -p -s %s &", TmpFileName);
+   system(CommandLine);
diff -ruN /usr/ports/graphics/giram/pkg-plist /tmp/giram/pkg-plist
--- /usr/ports/graphics/giram/pkg-plist	Sun Jul 16 00:14:46 2000
+++ /tmp/giram/pkg-plist	Tue Jun 17 00:02:40 2003
@@ -1,34 +1,84 @@
 bin/giram
 bin/povfront
+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/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
+share/giram/0.3/color/color1.gcf
+share/giram/0.3/finish/finish1
+share/giram/0.3/giram_logo.ppm
+share/giram/0.3/giram_splash.ppm
+share/giram/0.3/modules/librender_flat.a
+share/giram/0.3/modules/librender_flat.la
+share/giram/0.3/modules/librender_flat.so
+share/giram/0.3/modules/librender_gouraud.a
+share/giram/0.3/modules/librender_gouraud.la
+share/giram/0.3/modules/librender_gouraud.so
+share/giram/0.3/modules/librender_hiddenfaces.a
+share/giram/0.3/modules/librender_hiddenfaces.la
+share/giram/0.3/modules/librender_hiddenfaces.so
+share/giram/0.3/modules/librender_povray.a
+share/giram/0.3/modules/librender_povray.la
+share/giram/0.3/modules/librender_povray.so
+share/giram/0.3/modules/librender_raytracing.a
+share/giram/0.3/modules/librender_raytracing.la
+share/giram/0.3/modules/librender_raytracing.so
+share/giram/0.3/modules/librender_wireframe.a
+share/giram/0.3/modules/librender_wireframe.la
+share/giram/0.3/modules/librender_wireframe.so
+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/tips/giram_conseils.fr.txt
+share/giram/0.3/tips/giram_tips.txt
+share/giram/0.3/user_install
+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/hr/LC_MESSAGES/giram.mo
+share/locale/hu/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
+ at dirrm share/giram/0.3/color
+ at dirrm share/giram/0.3/color_map
+ at dirrm share/giram/0.3/finish
+ at dirrm share/giram/0.3/modules
+ at dirrm share/giram/0.3/normal
+ at dirrm share/giram/0.3/pigment
+ at dirrm share/giram/0.3/shape
+ at dirrm share/giram/0.3/texture
+ at dirrm share/giram/0.3/tips
+ at dirrm share/giram/0.3
+ at dirrm share/giram
 @dirrm share/doc/giram
 @dirrm libexec/giram/plug-ins
 @dirrm libexec/giram
--- giram.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list