diff options
| author | Mikhail Teterin <mi@FreeBSD.org> | 2002-02-13 06:30:43 +0000 |
|---|---|---|
| committer | Mikhail Teterin <mi@FreeBSD.org> | 2002-02-13 06:30:43 +0000 |
| commit | c74bdc61c8b67ca0e5b42f95ac96e825cf79eb47 (patch) | |
| tree | 907bc1497dd3480d6d66b95c888716dbced3bca2 /graphics/libfpx | |
| parent | - Metamod update to fix problems with Day of Defeat mod (diff) | |
The ImageMagick crew took this library over and released the 1.2.0.4.
The changes:
. our patch-gcc3 (provided to me by Alex Vasylenko) is
incorporated;
. the library uses its own implementation of wchar; they
say, it can only work if sizeof(wchar_t) is 2 bytes, so
they can not rely on the OS provided wchar...
The port changed:
. the package is installed as libfpx-version rather than
fpx-version;
. make is passed `-j2', which is very efficient even for
non-SMP machines, since each file is compiled twice --
for .o and .So object -- with -j2 they are compiled at
the same time, utilizing the cache;
. don't insist on any particular version of -ljpeg;
. ftp.imagemagick.org added to the MASTER_SITES (time for
MASTER_SITE_IMAGEMAGICK);
. the ABI and API did not change, so, the installed library's
version remains the same.
Diffstat (limited to 'graphics/libfpx')
| -rw-r--r-- | graphics/libfpx/Makefile | 10 | ||||
| -rw-r--r-- | graphics/libfpx/distinfo | 2 | ||||
| -rw-r--r-- | graphics/libfpx/files/patch-basics::a_file.cpp | 8 | ||||
| -rw-r--r-- | graphics/libfpx/files/patch-gcc3 | 50 |
4 files changed, 5 insertions, 65 deletions
diff --git a/graphics/libfpx/Makefile b/graphics/libfpx/Makefile index b16021fe835d..29a44a23f555 100644 --- a/graphics/libfpx/Makefile +++ b/graphics/libfpx/Makefile @@ -5,8 +5,8 @@ # $FreeBSD$ # -PORTNAME= fpx -PORTVERSION= 1.2.0.3 +PORTNAME= libfpx +PORTVERSION= 1.2.0.4 CATEGORIES= graphics MASTER_SITES= http://imagemagick.sourceforge.net/http/delegates/ \ ftp://ftp.yggdrasil.com/mirrors/site/ftp.simplesystems.org/pub/%SUBDIR%/ \ @@ -26,13 +26,11 @@ MASTER_SITES= http://imagemagick.sourceforge.net/http/delegates/ \ ftp://ftp.fifi.org/pub/%SUBDIR%/ \ ftp://ftp.simplesystems.org/pub/%SUBDIR%/ MASTER_SITE_SUBDIR= ImageMagick/delegates -DISTNAME= ${PORTNAME}-${PORTVERSION:R}-${PORTVERSION:E} MAINTAINER= mi@aldan.algebra.com -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg - -WRKSRC= ${WRKDIR}/lib${PORTNAME}-${PORTVERSION:R} +LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg +MAKE_ARGS+= -j2 post-patch: # Replacing references to <malloc.h> with <stdlib.h> diff --git a/graphics/libfpx/distinfo b/graphics/libfpx/distinfo index 41a706ace5da..b697d71e209c 100644 --- a/graphics/libfpx/distinfo +++ b/graphics/libfpx/distinfo @@ -1 +1 @@ -MD5 (fpx-1.2.0-3.tar.gz) = 37dea1af585c8747c06c9845041afd51 +MD5 (libfpx-1.2.0.4.tar.gz) = e74bc1ed5c9d912563bec5ae19ad4676 diff --git a/graphics/libfpx/files/patch-basics::a_file.cpp b/graphics/libfpx/files/patch-basics::a_file.cpp index f9abb1a75eb7..b0069f69d690 100644 --- a/graphics/libfpx/files/patch-basics::a_file.cpp +++ b/graphics/libfpx/files/patch-basics::a_file.cpp @@ -14,11 +14,3 @@ +# include <sys/param.h> +# include <sys/mount.h> # include <stdio.h> -@@ -424,5 +425,4 @@ - struct statfs buf; -- int errNum=0, fstyp; -+ int errNum=0; - /* Get file system stats */ -- fstyp=0; -- errNum = statfs ( ".", &buf, sizeof( struct statfs ), fstyp); -+ errNum = statfs ( ".", &buf); diff --git a/graphics/libfpx/files/patch-gcc3 b/graphics/libfpx/files/patch-gcc3 deleted file mode 100644 index 90f6a387039b..000000000000 --- a/graphics/libfpx/files/patch-gcc3 +++ /dev/null @@ -1,50 +0,0 @@ -To make the port compile on my system using gcc30-3.0.1_1, I had -to add the attached patches. Please see, if these are worth committing. - -thanks, ---Alex. - ---- basics/geometry.h Sat Dec 23 14:10:00 2000 -+++ basics/geometry.h Wed Oct 24 18:52:42 2001 -@@ -16,7 +16,7 @@ - #define Geometrie_h - #ifndef Commun_h - #include "common.h" -- #endif Commun_h -+ #endif // Commun_h - // ------------------------------------------------------------------------------------------------ - - // Includes ---- ole/oleprops.h Sat Dec 23 14:12:08 2000 -+++ ole/oleprops.h Wed Oct 24 18:49:11 2001 -@@ -88,7 +88,7 @@ - - class OLEPropertySection : public PToolkitObject { - -- friend OLEPropertySet; -+ friend class OLEPropertySet; - - public: - // Use this constrctor when reading a section ---- ole/oleprop.h Sat Dec 23 14:12:08 2000 -+++ ole/oleprop.h Wed Oct 24 18:47:05 2001 -@@ -80,7 +80,7 @@ - - class OLEProperty : public PToolkitObject { - -- friend OLEPropertySection; -+ friend class OLEPropertySection; - - public: - OLEProperty (OLEPropertySet* parentPropSet, ---- ri_image/cp32to24.h Sat Dec 23 14:15:34 2000 -+++ ri_image/cp32to24.h Wed Oct 24 18:09:04 2001 -@@ -16,7 +16,7 @@ - #define Compresseur32Vers24_h - #ifndef Commun_h - #include "common.h" -- #endif Commun_h -+ #endif // Commun_h - // ------------------------------------------------------------------------------------------------ - - // Includes |