- Fix build

- Get rid of libtool archives

PR:		ports/73248
Submitted by:	Igor Pokrovsky <ip@doom.homeunix.org> (maintainer)

6 files changed, 131 insertions, 12 deletions

diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile
index 790c85927e5..c1029df1eb6 100644
--- a/graphics/pixie/Makefile
+++ b/graphics/pixie/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	pixie
 PORTVERSION=	1.3.16
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -39,8 +40,6 @@ PIXIE_SHLIBS=	file framebuffer rgbe
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${REINPLACE_CMD} -i "" -e 's|malloc\.h|stdlib\.h|g' \
 		`${FIND} -E ${WRKSRC} -iregex '.*\.(cpp|h)'`
@@ -66,8 +65,6 @@ do-install:
 .for i in sdr ri
 	${INSTALL_DATA} ${WRKSRC}/src/${i}/.libs/lib${i}.a \
 		${PREFIX}/lib/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/src/${i}/.libs/lib${i}.la \
-		${PREFIX}/lib/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${i}/.libs/lib${i}.so.0 \
 		${PREFIX}/lib/${PORTNAME}
 	${LN} -sf ${PREFIX}/lib/${PORTNAME}/lib${i}.so.0 \
@@ -77,8 +74,6 @@ do-install:
 .for i in ${PIXIE_SHLIBS}
 	${INSTALL_DATA} ${WRKSRC}/src/${i}/.libs/${i}.a \
 		${PREFIX}/lib/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/src/${i}/.libs/${i}.la \
-		${PREFIX}/lib/${PORTNAME}
 	${INSTALL_PROGRAM} ${WRKSRC}/src/${i}/.libs/${i}.so.0 \
 		${PREFIX}/lib/${PORTNAME}
 	${LN} -sf ${PREFIX}/lib/${PORTNAME}/${i}.so.0 \
@@ -112,4 +107,4 @@ post-install:
 	@(${SED} -e 's|%%PREFIX%%|${PREFIX}|; s|%%PORTNAME%%|${PORTNAME}|' \
 		<pkg-message >${PKGMESSAGE} && ${CAT} ${PKGMESSAGE})
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/pixie/files/patch-src_common_containers.h b/graphics/pixie/files/patch-src_common_containers.h
new file mode 100644
index 00000000000..6740262f98f
--- /dev/null
+++ b/graphics/pixie/files/patch-src_common_containers.h
@@ -0,0 +1,11 @@
+--- src/common/containers.h.orig
++++ src/common/containers.h
+@@ -589,7 +589,7 @@
+ 							memoryBase		=	new unsigned char[pageSize+16];
+ 							memory			=	memoryBase+16;
+ 							available		=	pageSize;
+-							savedPages		=	NULL;
++							savedPages		=	(T32 *)NULL;
+ 						}
+ 
+ 						~CMemStack() {
diff --git a/graphics/pixie/files/patch-src_file_file.cpp b/graphics/pixie/files/patch-src_file_file.cpp
new file mode 100644
index 00000000000..f5f2f3a01fc
--- /dev/null
+++ b/graphics/pixie/files/patch-src_file_file.cpp
@@ -0,0 +1,36 @@
+--- src/file/file.cpp.orig
++++ src/file/file.cpp
+@@ -56,13 +56,13 @@
+ 				// Date last edited		:	5/9/2002
+ 				CFramebuffer(const char *name,int width,int height,int numSamples,const char *samples,TDisplayParameterFunction findParameter) {
+ 					int			i;
+-					char		*comment	=	NULL;
++					char		*comment	=	(char*)NULL;
+ 					float		*tmp;
+ 					float		worldToNDC[16];
+ 					float		worldToCamera[16];
+ 					char		*software;
+ 					char		desc[1024];
+-					const char	*compression	=	NULL;
++					const char	*compression	=	(char*)NULL;
+ 
+ 					// Open the image file
+ 					image				=	TIFFOpen(name,"w");
+@@ -189,7 +189,7 @@
+ 					scanlineUsage	=	new int[height];
+ 
+ 					for (i=0;i<height;i++) {
+-						scanlines[i]		=	NULL;
++						scanlines[i]		=	(unsigned char*)NULL;
+ 						scanlineUsage[i]	=	width;
+ 					}
+ 
+@@ -315,7 +315,7 @@
+ 								if (scanlines[lastSavedLine] != NULL) {
+ 									TIFFWriteScanline(image,scanlines[lastSavedLine],lastSavedLine,0);
+ 									delete [] scanlines[lastSavedLine];
+-									scanlines[lastSavedLine]	=	NULL;
++									scanlines[lastSavedLine]	=	(unsigned char*)NULL;
+ 								}
+ 							} else {
+ 								break;
diff --git a/graphics/pixie/files/patch-src_ri_renderer.h b/graphics/pixie/files/patch-src_ri_renderer.h
new file mode 100644
index 00000000000..3bd61fbdf50
--- /dev/null
+++ b/graphics/pixie/files/patch-src_ri_renderer.h
@@ -0,0 +1,35 @@
+--- src/ri/renderer.h.orig
++++ src/ri/renderer.h
+@@ -107,7 +107,7 @@
+ class	CRendererContext : public CRiInterface {
+ public:
+ 
+-						CRendererContext(char *ribName=NULL,char *netString=NULL);
++						CRendererContext(char *ribName=(char*)NULL,char *netString=(char*)NULL);
+ 						~CRendererContext();
+ 
+ 	///////////////////////////////////////////////////////////////////////
+@@ -253,7 +253,7 @@
+ 	CEnvironment		*environmentLoad(const char *,TSearchpath *,float *);	// Load a new environment map
+ 
+ 																				// Delayed object junk
+-	void				processDelayedObject(CDelayedObject *,void	(*subdivisionFunction)(char *,float),char *,float,CRay *ray = NULL);
++	void				processDelayedObject(CDelayedObject *,void	(*subdivisionFunction)(char *,float),char *,float,CRay *ray = (CRay *)NULL);
+ 
+ 	void				addObject(CObject *);									// Add an object into the scene
+ 	void				addInstance(void *);									// Add an instance into the scene
+@@ -267,11 +267,11 @@
+ 	CVariable			*retrieveVariable(const char *);
+ 
+ 																				// Locate (download) a file
+-	int					locateFileEx(char *,const char *,const char *extension=NULL,TSearchpath *search=NULL);
+-	int					locateFile(char *,const char *,TSearchpath *search=NULL);
++	int					locateFileEx(char *,const char *,const char *extension=(char*)NULL,TSearchpath *search=(TSearchpath *)NULL);
++	int					locateFile(char *,const char *,TSearchpath *search=(TSearchpath *)NULL);
+ 
+ 																				// Open (download) a file
+-	FILE				*openFile(const char *,const char *,const char *extension=NULL,TSearchpath *search=NULL);
++	FILE				*openFile(const char *,const char *,const char *extension=(char*)NULL,TSearchpath *search=(TSearchpath *)NULL);
+ 
+ 																				// The following functions are about texture management and are implemented in texture.cpp
+ 	void				rendererThread(void *);
diff --git a/graphics/pixie/files/patch-src_ri_texmake.cpp b/graphics/pixie/files/patch-src_ri_texmake.cpp
new file mode 100644
index 00000000000..4f778299e8e
--- /dev/null
+++ b/graphics/pixie/files/patch-src_ri_texmake.cpp
@@ -0,0 +1,47 @@
+--- src/ri/texmake.cpp.orig
++++ src/ri/texmake.cpp
+@@ -455,7 +455,7 @@
+ 	RtFilterFunc	filter			=	filt;
+ 	float			filterWidth		=	fwidth;
+ 	float			filterHeight	=	fheight;
+-	char			*outPath		=	NULL;
++	char			*outPath		=	(char*)NULL;
+ 	int				pyramidSize;
+ 	char			inputFileName[OS_MAX_PATH_LENGTH];
+ 	TIFF			*outHandle;
+@@ -522,7 +522,7 @@
+ 	RtFilterFunc	filter			=	filt;
+ 	float			filterWidth		=	fwidth;
+ 	float			filterHeight	=	fheight;
+-	char			*outPath		=	NULL;
++	char			*outPath		=	(char*)NULL;
+ 	int				pyramidSize;
+ 	char			inputFileName[OS_MAX_PATH_LENGTH];
+ 	TIFF			*outHandle;
+@@ -618,7 +618,7 @@
+ 	RtFilterFunc	filter			=	filt;
+ 	float			filterWidth		=	fwidth;
+ 	float			filterHeight	=	fheight;
+-	char			*outPath		=	NULL;
++	char			*outPath		=	(char*)NULL;
+ 	int				pyramidSize;
+ 	char			inputFileName[OS_MAX_PATH_LENGTH];
+ 	TIFF			*outHandle;
+@@ -723,7 +723,7 @@
+ 	RtFilterFunc	filter			=	filt;
+ 	float			filterWidth		=	fwidth;
+ 	float			filterHeight	=	fheight;
+-	char			*outPath		=	NULL;
++	char			*outPath		=	(char*)NULL;
+ 	int				pyramidSize;
+ 	char			inputFileName[OS_MAX_PATH_LENGTH];
+ 	TIFF			*outHandle;
+@@ -793,7 +793,7 @@
+ 	RtFilterFunc	filter			=	filt;
+ 	float			filterWidth		=	fwidth;
+ 	float			filterHeight	=	fheight;
+-	char			*outPath		=	NULL;
++	char			*outPath		=	(char*)NULL;
+ 	int				pyramidSize;
+ 	char			inputFileName[OS_MAX_PATH_LENGTH];
+ 	TIFF			*outHandle;
diff --git a/graphics/pixie/pkg-plist b/graphics/pixie/pkg-plist
index e74337577dd..d305215300b 100644
--- a/graphics/pixie/pkg-plist
+++ b/graphics/pixie/pkg-plist
@@ -11,23 +11,18 @@ include/pixie/ri.h
 include/pixie/sdr.h
 include/pixie/shadeop.h
 lib/pixie/file.a
-lib/pixie/file.la
 lib/pixie/file.so
 lib/pixie/file.so.0
 lib/pixie/framebuffer.a
-lib/pixie/framebuffer.la
 lib/pixie/framebuffer.so
 lib/pixie/framebuffer.so.0
 lib/pixie/libri.a
-lib/pixie/libri.la
 lib/pixie/libri.so
 lib/pixie/libri.so.0
 lib/pixie/libsdr.a
-lib/pixie/libsdr.la
 lib/pixie/libsdr.so
 lib/pixie/libsdr.so.0
 lib/pixie/rgbe.a
-lib/pixie/rgbe.la
 lib/pixie/rgbe.so
 lib/pixie/rgbe.so.0
 %%PORTDOCS%%%%DOCSDIR%%/attributes.htm