Index: Makefile =================================================================== RCS file: /home/pcvs/ports/graphics/lib3ds/Makefile,v retrieving revision 1.7 diff -u -u -r1.7 Makefile --- Makefile 19 May 2007 20:09:43 -0000 1.7 +++ Makefile 23 Aug 2007 02:24:29 -0000 @@ -6,28 +6,22 @@ # PORTNAME= lib3ds -PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTVERSION= 1.3.0 +PORTREVISION= 0 CATEGORIES= graphics -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= A library for handling 3DS (3D Studio) files LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut +USE_ZIP= yes USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \ LDFLAGS="-L${X11BASE}/lib" -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 +MAN1= 3dsdump.1 lib3ds-config.1 .include Index: distinfo =================================================================== RCS file: /home/pcvs/ports/graphics/lib3ds/distinfo,v retrieving revision 1.4 diff -u -u -r1.4 distinfo --- distinfo 26 Nov 2005 01:47:46 -0000 1.4 +++ distinfo 23 Aug 2007 02:24:29 -0000 @@ -1,3 +1,3 @@ -MD5 (lib3ds-1.2.0.tar.gz) = 3a7f891d18af0151876b98bc05d3b373 -SHA256 (lib3ds-1.2.0.tar.gz) = 6204b0fdf308d191bfc650b8a90b96c86c1c6fbfb03f3046f72aedc8bc7686bb -SIZE (lib3ds-1.2.0.tar.gz) = 136806 +MD5 (lib3ds-1.3.0.zip) = 2572f7b0f29b591d494c1a0658b35c86 +SHA256 (lib3ds-1.3.0.zip) = f5b00c302955a67fa5fb1f2d3f2583767cdc61fdbc6fd843c0c7c9d95c5629e3 +SIZE (lib3ds-1.3.0.zip) = 443675 Index: pkg-plist =================================================================== RCS file: /home/pcvs/ports/graphics/lib3ds/pkg-plist,v retrieving revision 1.2 diff -u -u -r1.2 pkg-plist --- pkg-plist 24 Apr 2002 14:00:29 -0000 1.2 +++ pkg-plist 23 Aug 2007 02:24:29 -0000 @@ -1,7 +1,4 @@ -bin/3ds2m -bin/3ds2rib bin/3dsdump -bin/3dsplayer bin/lib3ds-config include/lib3ds/atmosphere.h include/lib3ds/background.h @@ -9,7 +6,6 @@ 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 @@ -25,6 +21,7 @@ include/lib3ds/viewport.h lib/lib3ds.a lib/lib3ds.so -lib/lib3ds.so.1 +lib/lib3ds-1.so +lib/lib3ds-1.so.3 share/aclocal/lib3ds.m4 @dirrm include/lib3ds Index: files/patch-examples::Makefile.in =================================================================== RCS file: files/patch-examples::Makefile.in diff -N files/patch-examples::Makefile.in --- files/patch-examples::Makefile.in 24 Apr 2002 14:00:29 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,36 +0,0 @@ - -$FreeBSD: ports/graphics/lib3ds/files/patch-examples::Makefile.in,v 1.1 2002/04/24 14:00:29 sobomax Exp $ - ---- 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.. Index: files/patch-lib3ds::Makefile.in =================================================================== RCS file: files/patch-lib3ds::Makefile.in diff -N files/patch-lib3ds::Makefile.in --- files/patch-lib3ds::Makefile.in 24 Apr 2002 14:00:29 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,60 +0,0 @@ - -$FreeBSD: ports/graphics/lib3ds/files/patch-lib3ds::Makefile.in,v 1.1 2002/04/24 14:00:29 sobomax Exp $ - ---- 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) Index: files/patch-ltmain.sh =================================================================== RCS file: files/patch-ltmain.sh diff -N files/patch-ltmain.sh --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-ltmain.sh 23 Aug 2007 02:24:29 -0000 @@ -0,0 +1,15 @@ +--- ltmain.sh.orig Thu Aug 23 10:23:45 2007 ++++ ltmain.sh Thu Aug 23 10:23:58 2007 +@@ -6038,10 +6038,12 @@ + fi + + # Install the pseudo-library for information purposes. ++ if /usr/bin/false ; then + name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` + instname="$dir/$name"i + $show "$install_prog $instname $destdir/$name" + $run eval "$install_prog $instname $destdir/$name" || exit $? ++ fi + + # Maybe install the static library, too. + test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" Index: files/patch-tools::Makefile.in =================================================================== RCS file: files/patch-tools::Makefile.in diff -N files/patch-tools::Makefile.in --- files/patch-tools::Makefile.in 24 Apr 2002 14:00:29 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ - -$FreeBSD: ports/graphics/lib3ds/files/patch-tools::Makefile.in,v 1.1 2002/04/24 14:00:29 sobomax Exp $ - ---- 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 - -