aboutsummaryrefslogtreecommitdiff
path: root/graphics/libfpx
diff options
context:
space:
mode:
authorMikhail Teterin <mi@FreeBSD.org>2007-11-02 12:42:07 +0000
committerMikhail Teterin <mi@FreeBSD.org>2007-11-02 12:42:07 +0000
commitbc25ade382f6d0273bd9340e6cc6f92c27d22267 (patch)
tree8e65ca02ae190e0ae35d8ce14570c0c8f75a74a2 /graphics/libfpx
parent11e60f395e401f933770288b7dd78685769451d4 (diff)
Notes
Diffstat (limited to 'graphics/libfpx')
-rw-r--r--graphics/libfpx/Makefile14
-rw-r--r--graphics/libfpx/distinfo3
-rw-r--r--graphics/libfpx/files/Makefile.bsd5
-rw-r--r--graphics/libfpx/pkg-plist2
4 files changed, 19 insertions, 5 deletions
diff --git a/graphics/libfpx/Makefile b/graphics/libfpx/Makefile
index 0528b38c57a2..7d66fda56838 100644
--- a/graphics/libfpx/Makefile
+++ b/graphics/libfpx/Makefile
@@ -7,20 +7,30 @@
PORTNAME= libfpx
PORTVERSION= 1.2.0.12
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= ehaupt
+PATCHFILES= fpx.mega-patch.2007-11-01.bz2
+PATCH_SITES= http://aldan.algebra.com/~mi/
MAINTAINER= mi@aldan.algebra.com
COMMENT= Library routines for working with Flashpix images
-MAKE_ARGS+= -j2
+MAKE_ARGS+= -j`${SYSCTL} -n hw.ncpu`
USE_BZIP2= yes
post-patch:
- ${RM} ${WRKSRC}/ri_image/wchar.c
+ ${RM} ${WRKSRC}/ri_image/wchar.c ${WRKSRC}/fpx/fpxlib.h
USE_LDCONFIG= yes
MAKEFILE= ${FILESDIR}/Makefile.bsd
.include <bsd.port.mk>
+
+# We want the port's Makefile to build compiler-flags from scratch
+# (based on WARNS= in particular) instead of being influenced by
+# the environment... There is no obvious way to prevent bsd.port.mk
+# from adding CFLAGS and CXXFLAGS to the build environment, so we
+# remove them here.
+MAKE_ENV:= ${MAKE_ENV:NCFLAGS=*:NCXXFLAGS=*}
diff --git a/graphics/libfpx/distinfo b/graphics/libfpx/distinfo
index 92503d30c163..e2c25677dbb0 100644
--- a/graphics/libfpx/distinfo
+++ b/graphics/libfpx/distinfo
@@ -1,3 +1,6 @@
MD5 (libfpx-1.2.0.12.tar.bz2) = a82d33cc0ede71752802da0f410398b8
SHA256 (libfpx-1.2.0.12.tar.bz2) = c9b5ec94c255cbfebcefa6a045f5c7ca3c8ab9de2ad17b88ba4bfce924b91a97
SIZE (libfpx-1.2.0.12.tar.bz2) = 2301747
+MD5 (fpx.mega-patch.2007-11-01.bz2) = 56a2ad668275485c2767924abb8a7209
+SHA256 (fpx.mega-patch.2007-11-01.bz2) = 1b71d5178c2b85d673e5fece161834d27942c829918ff2c04840f07ffecfab6d
+SIZE (fpx.mega-patch.2007-11-01.bz2) = 122232
diff --git a/graphics/libfpx/files/Makefile.bsd b/graphics/libfpx/files/Makefile.bsd
index 634369593b7e..731f92620b51 100644
--- a/graphics/libfpx/files/Makefile.bsd
+++ b/graphics/libfpx/files/Makefile.bsd
@@ -1,7 +1,8 @@
LIB = fpx
INCS = fpxlib.h
-SHLIB_MAJOR= 1
+SHLIB_MAJOR= 2
SHLIB_MINOR= 7
+WARNS= 3
LIBDIR = ${LOCALBASE}/lib
INCSDIR = ${LOCALBASE}/include
@@ -26,7 +27,7 @@ JPGS != find ${.CURDIR}/jpeg -name \*.c
CPPS += ${OLESS:S/^/${.CURDIR}\/oless\//} ${JPGS}
-SRCS = ${CPPS:T}
+SRCS = ${CPPS:T:Nejpeg.c}
CXXFLAGS+= -fno-rtti -fno-exceptions ${HAVES}
LDADD += -L${LOCALBASE}/lib -lm -lstdc++
diff --git a/graphics/libfpx/pkg-plist b/graphics/libfpx/pkg-plist
index b215386b5a94..a45459828f33 100644
--- a/graphics/libfpx/pkg-plist
+++ b/graphics/libfpx/pkg-plist
@@ -1,4 +1,4 @@
-lib/libfpx.so.1
+lib/libfpx.so.2
lib/libfpx.so
lib/libfpx.a
include/fpxlib.h