Attachment #127929 for bug #171812

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

Lines 1-10 Link Here

(-)files/patch-aa (-10 lines)
1	--- fpx/f_fpxvw.cpp 2005-02-25 21:23:05.000000000 -0500
2	+++ fpx/f_fpxvw.cpp 2012-01-19 19:44:34.425688599 +0200
3	@@ -613,6 +613,7 @@ HRESULT OleRegGetUserType(REFCLSID clsid
4	const OLECHAR *src=OLESTR("Flashpix Toolkit Application");
5	OLECHAR dest=pszUserType;
6	while(src) dest++=*src++;
7	+ *dest=(OLECHAR)0;
8
9	return S_OK;
10	}




LIB	=	fpx
INCS	=	fpxlib.h
SHLIB_MAJOR=	2
SHLIB_MINOR=	7
WARNS=	3

LIBDIR	=	${LOCALBASE}/lib
INCSDIR	=	${LOCALBASE}/include
INCDIR	=	${INCSDIR}		# for pre-bsd.incs.mk API

NO_PROFILE=	Don't want it
NOPROFILE=	${NO_PROFILE}
HAVES=		-DHAVE_WCHAR_H -DHAVE_DLFCN_H \
		-DHAVE_SYS_TIME_H \
		-DHAVE_SYS_PARAM_H -DHAVE_SYS_MOUNT_H
CFLAGS+=	${HAVES}

CPPS	!=	find ${.CURDIR} -name \*.cpp -print
# Some of the .cxx files are #include-ed into others, so can't use `find' here:
OLESS	:=	ascii.cxx cdocfile.cxx chinst.cxx dffuncs.cxx dfiter.cxx \
		dfstream.cxx difat.cxx dir.cxx dirp.cxx docfile.cxx entry.cxx \
		expdf.cxx expiter.cxx expst.cxx fat.cxx funcs.cxx header.cxx \
		iter.cxx mem.cxx msf.cxx msfiter.cxx mstream.cxx page.cxx \
		refilb.cxx rexpdf.cxx sstream.cxx storage.cxx time.cxx \
		vect.cxx wchar.c
JPGS	!=	find ${.CURDIR}/jpeg -name \*.c

CPPS	+=	${OLESS:S/^/${.CURDIR}\/oless\//} ${JPGS}

SRCS	=	${CPPS:T:Nejpeg.c}

CXXFLAGS+=	-fno-rtti -fno-exceptions -fno-strict-aliasing ${HAVES}
LDADD	+=	-L${LOCALBASE}/lib -lm -lstdc++

.PATH: ${CPPS:H}

.for d in oless/h jpeg ole basics ri_image oless fpx .
CXXFLAGS+=	-I${.CURDIR}/$d
.endfor

CXXFLAGS+=	-I${LOCALBASE}/include -D_UNIX

.include <bsd.lib.mk>

# Work-around the bug in g++4.2's system header:
# /usr/include/c++/4.2/bits/basic_ios.h:156: warning: empty body in an if-statement
CXXFLAGS:=	${CXXFLAGS:N-Wsystem-headers}




#

PORTNAME=	libfpx
PORTVERSION=	1.3.1
PORTREVISION=	2
CATEGORIES=	graphics
MASTER_SITES=	http://www.imagemagick.org/download/delegates/
DISTNAME=	${PORTNAME}-${PORTVERSION}-1

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

USE_BZIP2=	yes
PLIST_FILES=	lib/libfpx.so.1 lib/libfpx.so lib/libfpx.a include/fpxlib.h \
		include/fpxlib-config.h lib/libfpx.la
	${RM} ${WRKSRC}/ri_image/wchar.c ${WRKSRC}/fpx/fpxlib.h

PLIST_FILES=lib/libfpx.so.2 lib/libfpx.so lib/libfpx.a include/fpxlib.h
USE_LDCONFIG=	yes
MAKEFILE=	${FILESDIR}/Makefile.bsd
MAKE_JOBS_SAFE=	yes
GNU_CONFIGURE=	yes

.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=*}

Lines 1-4 Link Here

(-)distinfo (-4 / +2 lines)
1	SHA256 (libfpx-1.2.0.12.tar.bz2) = c9b5ec94c255cbfebcefa6a045f5c7ca3c8ab9de2ad17b88ba4bfce924b91a97	1	SHA256 (libfpx-1.3.1-1.tar.bz2) = 4e08834db7a4f4a9f5261ee526bbe8ed6be3c23fde62b752e9b5bec2014f5cd3
2	SIZE (libfpx-1.2.0.12.tar.bz2) = 2301747	2	SIZE (libfpx-1.3.1-1.tar.bz2) = 2335759
3	SHA256 (fpx.mega-patch.2007-11-01.bz2) = 1b71d5178c2b85d673e5fece161834d27942c829918ff2c04840f07ffecfab6d
4	SIZE (fpx.mega-patch.2007-11-01.bz2) = 122232

Return to bug 171812

Lines 1-47 Link Here

(-)files/Makefile.bsd (-47 lines)
1	LIB = fpx
2	INCS = fpxlib.h
3	SHLIB_MAJOR= 2
4	SHLIB_MINOR= 7
5	WARNS= 3
6
7	LIBDIR = ${LOCALBASE}/lib
8	INCSDIR = ${LOCALBASE}/include
9	INCDIR = ${INCSDIR} # for pre-bsd.incs.mk API
10
11	NO_PROFILE= Don't want it
12	NOPROFILE= ${NO_PROFILE}
13	HAVES= -DHAVE_WCHAR_H -DHAVE_DLFCN_H \
14	-DHAVE_SYS_TIME_H \
15	-DHAVE_SYS_PARAM_H -DHAVE_SYS_MOUNT_H
16	CFLAGS+= ${HAVES}
17
18	CPPS != find ${.CURDIR} -name \*.cpp -print
19	# Some of the .cxx files are #include-ed into others, so can't use `find' here:
20	OLESS := ascii.cxx cdocfile.cxx chinst.cxx dffuncs.cxx dfiter.cxx \
21	dfstream.cxx difat.cxx dir.cxx dirp.cxx docfile.cxx entry.cxx \
22	expdf.cxx expiter.cxx expst.cxx fat.cxx funcs.cxx header.cxx \
23	iter.cxx mem.cxx msf.cxx msfiter.cxx mstream.cxx page.cxx \
24	refilb.cxx rexpdf.cxx sstream.cxx storage.cxx time.cxx \
25	vect.cxx wchar.c
26	JPGS != find ${.CURDIR}/jpeg -name \*.c
27
28	CPPS += ${OLESS:S/^/${.CURDIR}\/oless\//} ${JPGS}
29
30	SRCS = ${CPPS:T:Nejpeg.c}
31
32	CXXFLAGS+= -fno-rtti -fno-exceptions -fno-strict-aliasing ${HAVES}
33	LDADD += -L${LOCALBASE}/lib -lm -lstdc++
34
35	.PATH: ${CPPS:H}
36
37	.for d in oless/h jpeg ole basics ri_image oless fpx .
38	CXXFLAGS+= -I${.CURDIR}/$d
39	.endfor
40
41	CXXFLAGS+= -I${LOCALBASE}/include -D_UNIX
42
43	.include <bsd.lib.mk>
44
45	# Work-around the bug in g++4.2's system header:
46	# /usr/include/c++/4.2/bits/basic_ios.h:156: warning: empty body in an if-statement
47	CXXFLAGS:= ${CXXFLAGS:N-Wsystem-headers}

Lines 6-38 Link Here

(-)Makefile (-19 / +6 lines)
6	#	6	#
7		7
8	PORTNAME= libfpx	8	PORTNAME= libfpx
9	PORTVERSION= 1.2.0.12	9	PORTVERSION= 1.3.1
10	PORTREVISION= 2
11	CATEGORIES= graphics	10	CATEGORIES= graphics
12	MASTER_SITES= ${MASTER_SITE_LOCAL}	11	MASTER_SITES= http://www.imagemagick.org/download/delegates/
13	MASTER_SITE_SUBDIR= ehaupt	12	DISTNAME= ${PORTNAME}-${PORTVERSION}-1
14		13
15	PATCHFILES= fpx.mega-patch.2007-11-01.bz2
16	PATCH_SITES= http://aldan.algebra.com/~mi/
17
18	MAINTAINER= mi@aldan.algebra.com	14	MAINTAINER= mi@aldan.algebra.com
19	COMMENT= Library routines for working with Flashpix images	15	COMMENT= Library routines for working with Flashpix images
20		16
21	USE_BZIP2= yes	17	USE_BZIP2= yes
22		18	PLIST_FILES= lib/libfpx.so.1 lib/libfpx.so lib/libfpx.a include/fpxlib.h \
23	post-patch:	19	include/fpxlib-config.h lib/libfpx.la
24	${RM} ${WRKSRC}/ri_image/wchar.c ${WRKSRC}/fpx/fpxlib.h
25
26	PLIST_FILES=lib/libfpx.so.2 lib/libfpx.so lib/libfpx.a include/fpxlib.h
27	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
28	MAKEFILE= ${FILESDIR}/Makefile.bsd
29	MAKE_JOBS_SAFE= yes	21	MAKE_JOBS_SAFE= yes
		22	GNU_CONFIGURE= yes
30		23
31	.include <bsd.port.mk>	24	.include <bsd.port.mk>
32		25
33	# We want the port's Makefile to build compiler-flags from scratch
34	# (based on WARNS= in particular) instead of being influenced by
35	# the environment... There is no obvious way to prevent bsd.port.mk
36	# from adding CFLAGS and CXXFLAGS to the build environment, so we
37	# remove them here.
38	MAKE_ENV:= ${MAKE_ENV:NCFLAGS=:NCXXFLAGS=}