7 files changed, 127 insertions, 20 deletions

diff --git a/graphics/lib3ds/Makefile b/graphics/lib3ds/Makefile
index dfb9df5f7e35..84c1c87c996b 100644
--- a/graphics/lib3ds/Makefile
+++ b/graphics/lib3ds/Makefile
@@ -6,16 +6,25 @@
 #
 
 PORTNAME=	lib3ds
-PORTVERSION=	1.0.0
+PORTVERSION=	1.2.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	sobomax@FreeBSD.org
 
-USE_LIBTOOL=	yes
+USE_MESA=	yes
 INSTALLS_SHLIB=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${X11BASE}/include" \
+		LDFLAGS="-L${X11BASE}/lib"
 
-MAN1=		3ds2m.1 3ds2rib.1 3dsdump.1 lib3ds-config.1
+MAN1=		3ds2m.1 3dsdump.1 lib3ds-config.1
+
+post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/examples/3ds2rib ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/examples/player ${PREFIX}/bin/3dsplayer
+	${INSTALL_PROGRAM} ${WRKSRC}/lib3ds/lib3ds.so.1 ${PREFIX}/lib
+	${LN} -sf ${PREFIX}/lib/lib3ds.so.1 ${PREFIX}/lib/lib3ds.so
 
 .include <bsd.port.mk>
diff --git a/graphics/lib3ds/distinfo b/graphics/lib3ds/distinfo
index 8e457da1ca40..c0cd7bbd2b31 100644
--- a/graphics/lib3ds/distinfo
+++ b/graphics/lib3ds/distinfo
@@ -1 +1 @@
-MD5 (lib3ds-1.0.0.tar.gz) = ca34fe7a5b8e1640b9d88dd30a223583
+MD5 (lib3ds-1.2.0.tar.gz) = 3a7f891d18af0151876b98bc05d3b373
diff --git a/graphics/lib3ds/files/patch-examples::Makefile.in b/graphics/lib3ds/files/patch-examples::Makefile.in
new file mode 100644
index 000000000000..bcac6782b8ab
--- /dev/null
+++ b/graphics/lib3ds/files/patch-examples::Makefile.in
@@ -0,0 +1,36 @@
+
+$FreeBSD$
+
+--- examples/Makefile.in.orig	Mon Jan 14 16:24:34 2002
++++ examples/Makefile.in	Wed Apr 24 13:08:54 2002
+@@ -88,26 +88,26 @@
+ @GLUT_CHECK_TRUE@PLAYER = @GLUT_CHECK_TRUE@player
+ @GLUT_CHECK_FALSE@PLAYER = 
+ 
+-noinst_PROGRAMS = \
++PROGRAMS = \
+   3ds2rib \
+   $(PLAYER)
+ 
+ 
+ LDADD = \
+-  $(top_builddir)/lib3ds/lib3ds.a \
++  -L$(top_builddir)/lib3ds -l3ds \
+   @DMALLOC_LIBS@ -lm
+ 
+ 
+ player_SOURCES = player.c
+ player_LDADD = \
+-  $(top_builddir)/lib3ds/lib3ds.a \
++  -L$(top_builddir)/lib3ds -l3ds \
+   @GLUT_LIBS@ \
+   @DMALLOC_LIBS@ -lm
+ 
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES =  glstub.h
+-PROGRAMS =  $(noinst_PROGRAMS)
++#PROGRAMS =  $(noinst_PROGRAMS)
+ 
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I..
diff --git a/graphics/lib3ds/files/patch-lib3ds::Makefile.in b/graphics/lib3ds/files/patch-lib3ds::Makefile.in
new file mode 100644
index 000000000000..87a9c8feee4e
--- /dev/null
+++ b/graphics/lib3ds/files/patch-lib3ds::Makefile.in
@@ -0,0 +1,60 @@
+
+$FreeBSD$
+
+--- lib3ds/Makefile.in.orig	Mon Jan 14 16:24:32 2002
++++ lib3ds/Makefile.in	Wed Apr 24 12:57:03 2002
+@@ -85,6 +85,7 @@
+ INCLUDES = -I$(top_srcdir)
+ 
+ lib_LIBRARIES = lib3ds.a
++lib_SHLIBRARIES = lib3ds.so.1
+ 
+ lib3ds_a_SOURCES = \
+   io.c \
+@@ -139,7 +140,7 @@
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
+-LIBRARIES =  $(lib_LIBRARIES)
++LIBRARIES =  $(lib_LIBRARIES) $(lib_SHLIBRARIES)
+ 
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I..
+@@ -150,6 +151,7 @@
+ lib3ds_a_OBJECTS =  io.o float.o vector.o matrix.o quat.o tcb.o ease.o \
+ chunk.o file.o background.o atmosphere.o shadow.o viewport.o material.o \
+ mesh.o camera.o light.o tracks.o node.o
++lib3ds_so_OBJECTS = $(lib3ds_a_OBJECTS:S/.o$/.so/)
+ AR = ar
+ CFLAGS = @CFLAGS@
+ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+@@ -169,7 +171,7 @@
+ 
+ all: all-redirect
+ .SUFFIXES:
+-.SUFFIXES: .S .c .o .s
++.SUFFIXES: .S .c .o .s .so
+ $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+ 	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib3ds/Makefile
+ 
+@@ -219,6 +221,9 @@
+ .S.o:
+ 	$(COMPILE) -c $<
+ 
++.c.so:
++	$(COMPILE) -fpic -DPIC -c $< -o $(.TARGET)
++
+ mostlyclean-compile:
+ 	-rm -f *.o core *.core
+ 
+@@ -233,6 +238,10 @@
+ 	-rm -f lib3ds.a
+ 	$(AR) cru lib3ds.a $(lib3ds_a_OBJECTS) $(lib3ds_a_LIBADD)
+ 	$(RANLIB) lib3ds.a
++
++lib3ds.so.1: $(lib3ds_so_OBJECTS) $(lib3ds_a_DEPENDENCIES)
++	$(CC) -shared -o lib3ds.so.1 -Wl,-soname=lib3ds.so.1 $(lib3ds_so_OBJECTS) $(lib3ds_a_LIBADD)
++	ln -sf lib3ds.so.1 lib3ds.so
+ 
+ install-lib3dsHEADERS: $(lib3ds_HEADERS)
+ 	@$(NORMAL_INSTALL)
diff --git a/graphics/lib3ds/files/patch-lib3ds_Makefile.in b/graphics/lib3ds/files/patch-lib3ds_Makefile.in
deleted file mode 100644
index eaef6c273f27..000000000000
--- a/graphics/lib3ds/files/patch-lib3ds_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- lib3ds/Makefile.in	2001/01/18 17:32:01	1.1
-+++ lib3ds/Makefile.in	2001/01/18 17:32:22
-@@ -97,7 +97,7 @@
- EXTRA_DIST =    types.doc   chunktable.sed
- 
- 
--lib3ds_la_LDFLAGS =   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)  -release $(LT_RELEASE)
-+lib3ds_la_LDFLAGS =   -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- 
- 
- lib3ds_la_LIBADD =    -lm
diff --git a/graphics/lib3ds/files/patch-tools::Makefile.in b/graphics/lib3ds/files/patch-tools::Makefile.in
new file mode 100644
index 000000000000..a728cc470dd9
--- /dev/null
+++ b/graphics/lib3ds/files/patch-tools::Makefile.in
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- tools/Makefile.in	2002/04/24 09:50:45	1.1
++++ tools/Makefile.in	2002/04/24 09:51:15
+@@ -91,7 +91,7 @@
+ 
+ 
+ LDADD = \
+-  $(top_builddir)/lib3ds/lib3ds.a \
++  -L$(top_builddir)/lib3ds -l3ds \
+   @DMALLOC_LIBS@ -lm
+ 
+ 
diff --git a/graphics/lib3ds/pkg-plist b/graphics/lib3ds/pkg-plist
index fd282bb95c06..b3d889120f6d 100644
--- a/graphics/lib3ds/pkg-plist
+++ b/graphics/lib3ds/pkg-plist
@@ -1,6 +1,7 @@
 bin/3ds2m
 bin/3ds2rib
 bin/3dsdump
+bin/3dsplayer
 bin/lib3ds-config
 include/lib3ds/atmosphere.h
 include/lib3ds/background.h
@@ -9,20 +10,21 @@ include/lib3ds/chunk.h
 include/lib3ds/ease.h
 include/lib3ds/file.h
 include/lib3ds/float.h
+include/lib3ds/io.h
 include/lib3ds/light.h
 include/lib3ds/material.h
 include/lib3ds/matrix.h
 include/lib3ds/mesh.h
 include/lib3ds/node.h
 include/lib3ds/quat.h
-include/lib3ds/readwrite.h
 include/lib3ds/shadow.h
 include/lib3ds/tcb.h
 include/lib3ds/tracks.h
 include/lib3ds/types.h
 include/lib3ds/vector.h
 include/lib3ds/viewport.h
+lib/lib3ds.a
 lib/lib3ds.so
-lib/lib3ds.so.0
+lib/lib3ds.so.1
 share/aclocal/lib3ds.m4
 @dirrm include/lib3ds