1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-23 09:10:43 +00:00

- Fix build on 4.x

- Bump PORTREVISION
- Remove 4 patches (me)

PR:		90901
Submitted by:	Jose Alonso Cardenas Marquez <acardenas@bsd.org.pe>
This commit is contained in:
Emanuel Haupt 2005-12-26 14:44:33 +00:00
parent 010db4b621
commit d923a168f4
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=152108
5 changed files with 25 additions and 56 deletions

View File

@ -7,6 +7,7 @@
PORTNAME= cal3d
DISTVERSION= ${CAL3DVER}_pre20050823
PORTREVISION= 1
CATEGORIES= graphics devel
MASTER_SITES= ${MASTER_SITE_GENTOO}
MASTER_SITE_SUBDIR= distfiles
@ -20,19 +21,32 @@ CAL3DVER= 0.11.0
CONFLICTS= cal3d-[0-9]*
USE_BZIP2= yes
USE_GNOME= pkgconfig
USE_GCC= 3.2+
USE_BZIP2= yes
USE_REINPLACE= yes
INSTALLS_SHLIB= yes
USE_GNOME= pkgconfig
USE_GCC= 3.2+
USE_AUTOTOOLS= automake:19 autoheader:259 libtool:15:inc
AUTOMAKE_ARGS= "--add-missing"
INSTALLS_SHLIB= yes
CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
AUTOMAKE_ARGS= --add-missing
CPPFLAGS+= -I${LOCALBASE}/include -I${X11BASE}/include
LDFLAGS+= -L${LOCALBASE}/lib -L${X11BASE}/lib
CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" CXX="${CXX}"
CONFIGURE_ARGS= --disable-static
CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS= --disable-static
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS} ${CXX}"
WRKSRC= ${WRKDIR}/${PORTNAME}
WRKSRC= ${WRKDIR}/${PORTNAME}
post-patch:
@${REINPLACE_CMD} \
-e 's|^\(pkgconfigdir\ =\).*|\1 $$(prefix)/libdata/pkgconfig|' \
${WRKSRC}/Makefile.am
@${REINPLACE_CMD} -e 's|<istream>|<iostream>|' \
${WRKSRC}/src/cal3d/buffersource.h \
${WRKSRC}/src/cal3d/loader.h \
${WRKSRC}/src/cal3d/streamsource.h
@${REINPLACE_CMD} -e '/^all_libraries/d' ${WRKSRC}/src/cal3d/Makefile.am
pre-configure:
cd ${WRKSRC} && ${ACLOCAL} -I ${LOCALBASE}/share/aclocal

View File

@ -1,12 +0,0 @@
--- Makefile.am.orig Mon Jul 12 19:40:09 2004
+++ Makefile.am Mon Jul 12 19:41:07 2004
@@ -16,7 +16,8 @@
SUBDIRS = src docs
-pkgconfigdir = $(libdir)/pkgconfig
+#pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(prefix)/libdata/pkgconfig
pkgconfig_DATA = cal3d.pc

View File

@ -1,11 +0,0 @@
--- src/cal3d/buffersource.h.orig Tue Jul 13 10:03:53 2004
+++ src/cal3d/buffersource.h Tue Jul 13 10:04:11 2004
@@ -17,7 +17,7 @@
#include "cal3d/global.h"
#include "cal3d/datasource.h"
-#include <istream>
+#include <iostream>
/**
* CalBufferSource class.

View File

@ -1,11 +0,0 @@
--- src/cal3d/loader.h.orig Tue Jul 13 10:04:57 2004
+++ src/cal3d/loader.h Tue Jul 13 10:05:09 2004
@@ -17,7 +17,7 @@
#include <string>
-#include <istream>
+#include <iostream>
#include "cal3d/global.h"
#include "cal3d/datasource.h"

View File

@ -1,11 +0,0 @@
--- src/cal3d/streamsource.h.orig Tue Jul 13 10:05:35 2004
+++ src/cal3d/streamsource.h Tue Jul 13 10:05:47 2004
@@ -17,7 +17,7 @@
#include "cal3d/global.h"
#include "cal3d/datasource.h"
-#include <istream>
+#include <iostream>
/**
* CalStreamSource class.