PKGREVISION++

- build and install shared libraries and example programs
  (patches mostly from FreeBSD)
- better DESCR

3 files changed, 137 insertions, 0 deletions

diff --git a/graphics/lib3ds/patches/patch-aa b/graphics/lib3ds/patches/patch-aa
new file mode 100644
index 00000000000..f040b22c2c1
--- /dev/null
+++ b/graphics/lib3ds/patches/patch-aa
@@ -0,0 +1,43 @@
+$NetBSD: patch-aa,v 1.1 2003/05/24 09:32:34 salo Exp $
+
+--- examples/Makefile.in.orig	2002-01-14 15:24:34.000000000 +0100
++++ examples/Makefile.in	2003-05-24 10:54:12.000000000 +0200
+@@ -88,26 +88,25 @@
+ @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)
+ 
+ 
+ DEFS = @DEFS@ -I. -I$(srcdir) -I..
+@@ -239,6 +238,8 @@
+ installcheck-am:
+ installcheck: installcheck-am
+ install-exec-am:
++	${BSD_INSTALL_PROGRAM} 3ds2rib ${PREFIX}/bin
++	${BSD_INSTALL_PROGRAM} player ${PREFIX}/bin/3dsplayer
+ install-exec: install-exec-am
+ 
+ install-data-am:
diff --git a/graphics/lib3ds/patches/patch-ab b/graphics/lib3ds/patches/patch-ab
new file mode 100644
index 00000000000..c19833201fe
--- /dev/null
+++ b/graphics/lib3ds/patches/patch-ab
@@ -0,0 +1,81 @@
+$NetBSD: patch-ab,v 1.1 2003/05/24 09:32:34 salo Exp $
+
+--- lib3ds/Makefile.in.orig	2002-01-14 15:24:32.000000000 +0100
++++ lib3ds/Makefile.in	2003-05-24 10:45:16.000000000 +0200
+@@ -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
+ 
+@@ -187,10 +189,10 @@
+ 
+ maintainer-clean-libLIBRARIES:
+ 
+-install-libLIBRARIES: $(lib_LIBRARIES)
++install-libLIBRARIES: $(lib_LIBRARIES) $(lib_SHLIBRARIES)
+ 	@$(NORMAL_INSTALL)
+ 	$(mkinstalldirs) $(DESTDIR)$(libdir)
+-	@list='$(lib_LIBRARIES)'; for p in $$list; do \
++	@list='$(lib_LIBRARIES) $(lib_SHLIBRARIES)'; for p in $$list; do \
+ 	  if test -f $$p; then \
+ 	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \
+ 	    $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \
+@@ -203,6 +205,8 @@
+ 	    $(RANLIB) $(DESTDIR)$(libdir)/$$p; \
+ 	  else :; fi; \
+ 	done
++	cd $(DESTDIR)$(libdir); \
++	  ln -sf $(lib_SHLIBRARIES) $(lib_SHLIBRARIES:S/.1$//)
+ 
+ uninstall-libLIBRARIES:
+ 	@$(NORMAL_UNINSTALL)
+@@ -219,6 +223,9 @@
+ .S.o:
+ 	$(COMPILE) -c $<
+ 
++.c.so:
++	$(COMPILE) -fpic -DPIC -c $< -o $(.TARGET)
++
+ mostlyclean-compile:
+ 	-rm -f *.o core *.core
+ 
+@@ -234,6 +241,10 @@
+ 	$(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)
+ 	$(mkinstalldirs) $(DESTDIR)$(lib3dsdir)
diff --git a/graphics/lib3ds/patches/patch-ac b/graphics/lib3ds/patches/patch-ac
new file mode 100644
index 00000000000..fb978618f1e
--- /dev/null
+++ b/graphics/lib3ds/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2003/05/24 09:32:34 salo Exp $
+
+--- tools/Makefile.in.orig	2002-01-14 15:24:33.000000000 +0100
++++ tools/Makefile.in	2003-05-24 10:17:03.000000000 +0200
+@@ -91,7 +91,7 @@
+ 
+ 
+ LDADD = \
+-  $(top_builddir)/lib3ds/lib3ds.a \
++  -L$(top_builddir)/lib3ds -l3ds \
+   @DMALLOC_LIBS@ -lm
+ 
+