Attachment #80727 for bug #115741

View | Details | Raw Unified | Return to bug 115741
Collapse All | Expand All




#

PORTNAME=	lib3ds
PORTVERSION=	1.3.0
PORTREVISION=	0
CATEGORIES=	graphics
MASTER_SITES=	SF
MASTER_SITE_SUBDIR=	${PORTNAME}

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=		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>

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (lib3ds-1.2.0.tar.gz) = 3a7f891d18af0151876b98bc05d3b373	1	MD5 (lib3ds-1.3.0.zip) = 2572f7b0f29b591d494c1a0658b35c86
2	SHA256 (lib3ds-1.2.0.tar.gz) = 6204b0fdf308d191bfc650b8a90b96c86c1c6fbfb03f3046f72aedc8bc7686bb	2	SHA256 (lib3ds-1.3.0.zip) = f5b00c302955a67fa5fb1f2d3f2583767cdc61fdbc6fd843c0c7c9d95c5629e3
3	SIZE (lib3ds-1.2.0.tar.gz) = 136806	3	SIZE (lib3ds-1.3.0.zip) = 443675




bin/3ds2m
bin/3ds2rib
bin/3dsdump
bin/3dsplayer
bin/lib3ds-config
include/lib3ds/atmosphere.h
include/lib3ds/background.h

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/viewport.h
lib/lib3ds.a
lib/lib3ds.so
lib/lib3ds-1.so
lib/lib3ds-1.so.3
share/aclocal/lib3ds.m4
@dirrm include/lib3ds





$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..





$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)




--- 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"





$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
 
 

Return to bug 115741

Lines 6-33 Link Here

(-)Makefile (-11 / +5 lines)
6	#	6	#
7		7
8	PORTNAME= lib3ds	8	PORTNAME= lib3ds
9	PORTVERSION= 1.2.0	9	PORTVERSION= 1.3.0
10	PORTREVISION= 2	10	PORTREVISION= 0
11	CATEGORIES= graphics	11	CATEGORIES= graphics
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= SF
13	MASTER_SITE_SUBDIR= ${PORTNAME}
14		13
15	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
16	COMMENT= A library for handling 3DS (3D Studio) files	15	COMMENT= A library for handling 3DS (3D Studio) files
17		16
18	LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut	17	LIB_DEPENDS= glut.4:${PORTSDIR}/graphics/libglut
19		18
		19	USE_ZIP= yes
20	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
21	GNU_CONFIGURE= yes	21	GNU_CONFIGURE= yes
22	CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \	22	CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include" \
23	LDFLAGS="-L${X11BASE}/lib"	23	LDFLAGS="-L${X11BASE}/lib"
24		24
25	MAN1= 3ds2m.1 3dsdump.1 lib3ds-config.1	25	MAN1= 3dsdump.1 lib3ds-config.1
26
27	post-install:
28	${INSTALL_PROGRAM} ${WRKSRC}/examples/3ds2rib ${PREFIX}/bin
29	${INSTALL_PROGRAM} ${WRKSRC}/examples/player ${PREFIX}/bin/3dsplayer
30	${INSTALL_PROGRAM} ${WRKSRC}/lib3ds/lib3ds.so.1 ${PREFIX}/lib
31	${LN} -sf ${PREFIX}/lib/lib3ds.so.1 ${PREFIX}/lib/lib3ds.so
32		26
33	.include <bsd.port.mk>	27	.include <bsd.port.mk>

Lines 1-7 Link Here

(-)pkg-plist (-5 / +2 lines)
1	bin/3ds2m
2	bin/3ds2rib
3	bin/3dsdump	1	bin/3dsdump
4	bin/3dsplayer
5	bin/lib3ds-config	2	bin/lib3ds-config
6	include/lib3ds/atmosphere.h	3	include/lib3ds/atmosphere.h
7	include/lib3ds/background.h	4	include/lib3ds/background.h
Lines 9-15 Link Here
9	include/lib3ds/chunk.h	6	include/lib3ds/chunk.h
10	include/lib3ds/ease.h	7	include/lib3ds/ease.h
11	include/lib3ds/file.h	8	include/lib3ds/file.h
12	include/lib3ds/float.h
13	include/lib3ds/io.h	9	include/lib3ds/io.h
14	include/lib3ds/light.h	10	include/lib3ds/light.h
15	include/lib3ds/material.h	11	include/lib3ds/material.h
Lines 25-30 Link Here
25	include/lib3ds/viewport.h	21	include/lib3ds/viewport.h
26	lib/lib3ds.a	22	lib/lib3ds.a
27	lib/lib3ds.so	23	lib/lib3ds.so
28	lib/lib3ds.so.1	24	lib/lib3ds-1.so
		25	lib/lib3ds-1.so.3
29	share/aclocal/lib3ds.m4	26	share/aclocal/lib3ds.m4
30	@dirrm include/lib3ds	27	@dirrm include/lib3ds

Removed Link Here

(-)files/patch-examples::Makefile.in (-36 lines)
1
2	$FreeBSD: ports/graphics/lib3ds/files/patch-examples::Makefile.in,v 1.1 2002/04/24 14:00:29 sobomax Exp $
3
4	--- examples/Makefile.in.orig Mon Jan 14 16:24:34 2002
5	+++ examples/Makefile.in Wed Apr 24 13:08:54 2002
6	@@ -88,26 +88,26 @@
7	@GLUT_CHECK_TRUE@PLAYER = @GLUT_CHECK_TRUE@player
8	@GLUT_CHECK_FALSE@PLAYER =
9
10	-noinst_PROGRAMS = \
11	+PROGRAMS = \
12	3ds2rib \
13	$(PLAYER)
14
15
16	LDADD = \
17	- $(top_builddir)/lib3ds/lib3ds.a \
18	+ -L$(top_builddir)/lib3ds -l3ds \
19	@DMALLOC_LIBS@ -lm
20
21
22	player_SOURCES = player.c
23	player_LDADD = \
24	- $(top_builddir)/lib3ds/lib3ds.a \
25	+ -L$(top_builddir)/lib3ds -l3ds \
26	@GLUT_LIBS@ \
27	@DMALLOC_LIBS@ -lm
28
29	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
30	CONFIG_HEADER = ../config.h
31	CONFIG_CLEAN_FILES = glstub.h
32	-PROGRAMS = $(noinst_PROGRAMS)
33	+#PROGRAMS = $(noinst_PROGRAMS)
34
35
36	DEFS = @DEFS@ -I. -I$(srcdir) -I..

Removed Link Here

(-)files/patch-lib3ds::Makefile.in (-60 lines)
1
2	$FreeBSD: ports/graphics/lib3ds/files/patch-lib3ds::Makefile.in,v 1.1 2002/04/24 14:00:29 sobomax Exp $
3
4	--- lib3ds/Makefile.in.orig Mon Jan 14 16:24:32 2002
5	+++ lib3ds/Makefile.in Wed Apr 24 12:57:03 2002
6	@@ -85,6 +85,7 @@
7	INCLUDES = -I$(top_srcdir)
8
9	lib_LIBRARIES = lib3ds.a
10	+lib_SHLIBRARIES = lib3ds.so.1
11
12	lib3ds_a_SOURCES = \
13	io.c \
14	@@ -139,7 +140,7 @@
15	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
16	CONFIG_HEADER = ../config.h
17	CONFIG_CLEAN_FILES =
18	-LIBRARIES = $(lib_LIBRARIES)
19	+LIBRARIES = $(lib_LIBRARIES) $(lib_SHLIBRARIES)
20
21
22	DEFS = @DEFS@ -I. -I$(srcdir) -I..
23	@@ -150,6 +151,7 @@
24	lib3ds_a_OBJECTS = io.o float.o vector.o matrix.o quat.o tcb.o ease.o \
25	chunk.o file.o background.o atmosphere.o shadow.o viewport.o material.o \
26	mesh.o camera.o light.o tracks.o node.o
27	+lib3ds_so_OBJECTS = $(lib3ds_a_OBJECTS:S/.o$/.so/)
28	AR = ar
29	CFLAGS = @CFLAGS@
30	COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
31	@@ -169,7 +171,7 @@
32
33	all: all-redirect
34	.SUFFIXES:
35	-.SUFFIXES: .S .c .o .s
36	+.SUFFIXES: .S .c .o .s .so
37	$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
38	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps lib3ds/Makefile
39
40	@@ -219,6 +221,9 @@
41	.S.o:
42	$(COMPILE) -c $<
43
44	+.c.so:
45	+ $(COMPILE) -fpic -DPIC -c $< -o $(.TARGET)
46	+
47	mostlyclean-compile:
48	-rm -f .o core .core
49
50	@@ -233,6 +238,10 @@
51	-rm -f lib3ds.a
52	$(AR) cru lib3ds.a $(lib3ds_a_OBJECTS) $(lib3ds_a_LIBADD)
53	$(RANLIB) lib3ds.a
54	+
55	+lib3ds.so.1: $(lib3ds_so_OBJECTS) $(lib3ds_a_DEPENDENCIES)
56	+ $(CC) -shared -o lib3ds.so.1 -Wl,-soname=lib3ds.so.1 $(lib3ds_so_OBJECTS) $(lib3ds_a_LIBADD)
57	+ ln -sf lib3ds.so.1 lib3ds.so
58
59	install-lib3dsHEADERS: $(lib3ds_HEADERS)
60	@$(NORMAL_INSTALL)

Added Link Here

(-)files/patch-ltmain.sh (+15 lines)
1	--- ltmain.sh.orig Thu Aug 23 10:23:45 2007
2	+++ ltmain.sh Thu Aug 23 10:23:58 2007
3	@@ -6038,10 +6038,12 @@
4	fi
5
6	# Install the pseudo-library for information purposes.
7	+ if /usr/bin/false ; then
8	name=`$echo "X$file" \| $Xsed -e 's%^.*/%%'`
9	instname="$dir/$name"i
10	$show "$install_prog $instname $destdir/$name"
11	$run eval "$install_prog $instname $destdir/$name" \|\| exit $?
12	+ fi
13
14	# Maybe install the static library, too.
15	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"

Removed Link Here

(-)files/patch-tools::Makefile.in (-14 lines)
1
2	$FreeBSD: ports/graphics/lib3ds/files/patch-tools::Makefile.in,v 1.1 2002/04/24 14:00:29 sobomax Exp $
3
4	--- tools/Makefile.in 2002/04/24 09:50:45 1.1
5	+++ tools/Makefile.in 2002/04/24 09:51:15
6	@@ -91,7 +91,7 @@
7
8
9	LDADD = \
10	- $(top_builddir)/lib3ds/lib3ds.a \
11	+ -L$(top_builddir)/lib3ds -l3ds \
12	@DMALLOC_LIBS@ -lm
13
14