- Fix build on 4-stable

- Avoid installing arch-dependent loadable modules under PREFIX/share

PR:		83856
Submitted by:	Ports Fury

4 files changed, 59 insertions, 13 deletions

diff --git a/graphics/g3dviewer/Makefile b/graphics/g3dviewer/Makefile
index 6adfe5819e4c..d57407eb287d 100644
--- a/graphics/g3dviewer/Makefile
+++ b/graphics/g3dviewer/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	g3dviewer
 PORTVERSION=	0.1.0
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://automagically.de/files/
 
@@ -17,16 +17,19 @@ COMMENT=	A 3D file viewer for GTK+
 
 LIB_DEPENDS=	gtkglext-x11-1.0.2:${PORTSDIR}/x11-toolkits/gtkglext
 
-USE_GNOME=	gtk20 pkgconfig
-USE_MESA=	yes
+USE_GNOME=	gnometarget gtk20
+USE_GL=		yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
-		LDFLAGS="-L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
 
-post-install:
-	@${FIND} ${DATADIR} ! -type d | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${DATADIR} -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include 
+LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib 
+
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|$$(pkgdatadir)/plugins/|$$(pkglibdir)/plugins/|g'
+	@${REINPLACE_CMD} -e 's|DBG_CFLAGS="-O2"|DBG_CFLAGS=""|g ; \
+		 s|$$datadir/$$PACKAGE/|$$libdir/$$PACKAGE/|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/graphics/g3dviewer/files/patch-src-glarea.c b/graphics/g3dviewer/files/patch-src-glarea.c
new file mode 100644
index 000000000000..d9765631e4d9
--- /dev/null
+++ b/graphics/g3dviewer/files/patch-src-glarea.c
@@ -0,0 +1,19 @@
+--- src/glarea.c.orig	Wed Jul 13 05:18:12 2005
++++ src/glarea.c	Wed Jul 20 02:34:25 2005
+@@ -55,6 +55,7 @@
+ #ifdef HAVE_GTKGLEXT
+ 	GdkGLDrawable *gldrawable;
+ 	GdkGLContext *glcontext;
++	G3DModel *model;
+ 
+ 	gldrawable = gtk_widget_get_gl_drawable(widget);
+ 	glcontext = gtk_widget_get_gl_context(widget);
+@@ -64,7 +65,7 @@
+ 	if(gtk_gl_area_make_current(GTK_GL_AREA(widget)))
+ 	{
+ #endif
+-		G3DModel *model = (G3DModel*)gtk_object_get_data(GTK_OBJECT(widget),
++		model = (G3DModel*)gtk_object_get_data(GTK_OBJECT(widget),
+ 			"model");
+ 		glViewport(0,0, widget->allocation.width, widget->allocation.height);
+ 		model->aspect = (float)widget->allocation.width /
diff --git a/graphics/g3dviewer/pkg-descr b/graphics/g3dviewer/pkg-descr
index ab0febcfab4f..bacb80ba6a5b 100644
--- a/graphics/g3dviewer/pkg-descr
+++ b/graphics/g3dviewer/pkg-descr
@@ -1,15 +1,18 @@
 G3DViewer is a 3D file viewer for GTK+ supporting a variety of file types:
    - 3D Studio (.3ds, .prj)
    - LightWave (.lw, .lwb, .lwo)
-   - Alias Wavefront Maya (.obj)
+   - Alias Wavefront (.obj)
    - Impulse TurboSilver / Imagine (.iob)
    - AutoCAD (.dxf)
    - Quake II Models (.md2)
-   - Neutral File Format (.nff) new
+   - Neutral File Format (.nff)
+   - 3D Metafile (.3dmf, .3mf, .b3d)
+   - Caligari TrueSpace Objects (.cob)
+   - Quick3D Objects & Scenes (.q3o, q3s)
 
 Some of the features are:
    - Wireframe mode
    - Specular lighting (not really nice at the moment)
    - changable background color :)
 
-WWW: http://automagically.de/?g3dviewer
+WWW: http://automagically.de/index.shtml?g3dviewer
diff --git a/graphics/g3dviewer/pkg-plist b/graphics/g3dviewer/pkg-plist
index 176de1c4ee81..010f920209ce 100644
--- a/graphics/g3dviewer/pkg-plist
+++ b/graphics/g3dviewer/pkg-plist
@@ -1,2 +1,23 @@
 bin/g3dviewer
 include/g3dviewer_plugin.h
+lib/g3dviewer/plugins/image/img_bmp.so
+lib/g3dviewer/plugins/import/imp_3dmf.so
+lib/g3dviewer/plugins/import/imp_3ds.so
+lib/g3dviewer/plugins/import/imp_cob.so
+lib/g3dviewer/plugins/import/imp_dxf.so
+lib/g3dviewer/plugins/import/imp_heightfield.so
+lib/g3dviewer/plugins/import/imp_iob.so
+lib/g3dviewer/plugins/import/imp_lwo.so
+lib/g3dviewer/plugins/import/imp_md2.so
+lib/g3dviewer/plugins/import/imp_nff.so
+lib/g3dviewer/plugins/import/imp_obj.so
+lib/g3dviewer/plugins/import/imp_q3o.so
+%%DATADIR%%/pixmaps/icon16_material.xpm
+%%DATADIR%%/pixmaps/icon16_model.xpm
+%%DATADIR%%/pixmaps/icon16_plugins.xpm
+@dirrm %%DATADIR%%/pixmaps
+@dirrm %%DATADIR%%
+@dirrm lib/g3dviewer/plugins/import
+@dirrm lib/g3dviewer/plugins/image
+@dirrm lib/g3dviewer/plugins
+@dirrm lib/g3dviewer