Attachment #132589 for bug #176919





PORTNAME=	tiff
PORTVERSION=	4.0.3
PORTREVISION=	1
CATEGORIES=	graphics
MASTER_SITES=	ftp://ftp.remotesensing.org/pub/libtiff/ \
		http://download.osgeo.org/libtiff/

MAINTAINER=	dinoex@FreeBSD.org
COMMENT=	Tools and library routines for working with TIFF images

LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
		jbig:${PORTSDIR}/graphics/jbigkit

LICENSE=	BSD
LICENSE_FILE=	${WRKSRC}/COPYRIGHT

LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
		jbig:${PORTSDIR}/graphics/jbigkit

USE_LDCONFIG=	yes
USE_AUTOTOOLS=	libtool
CONFIGURE_ARGS+=	--with-jpeg-include-dir=${LOCALBASE}/include \
			--with-jpeg-lib-dir=${LOCALBASE}/lib

.if defined(WITH_X11) && !defined(WITHOUT_X11)
USE_XORG=	sm ice xmu xi x11
USE_GL=		glut glu gl
PLIST_SUB+=	WITH_X11=""
.else
CONFIGURE_ARGS+=	--without-x --without-libgl
PLIST_SUB+=	WITH_X11="@comment "
.endif

MAN1=	bmp2tiff.1 tiff2pdf.1 fax2ps.1 fax2tiff.1 gif2tiff.1 pal2rgb.1 \
	ppm2tiff.1 ras2tiff.1 raw2tiff.1 rgb2ycbcr.1 sgi2tiff.1 \
	thumbnail.1 tiff2bw.1 tiff2ps.1 tiff2rgba.1 tiffcmp.1 tiffcp.1 \

	TIFFtile.3tiff           TIFFTileRowSize.3tiff \
	TIFFtile.3tiff           TIFFVTileSize.3tiff

PORTDOCS=	ChangeLog README TODO

OPTIONS_DEFINE=	DOCS X11

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MX11}
USE_XORG=	sm ice xmu xi x11
USE_GL=		glut glu gl
PLIST_SUB+=	WITH_X11=""
.else
CONFIGURE_ARGS+=	--without-x --without-libgl
PLIST_SUB+=	WITH_X11="@comment "
.endif

.if ${PORT_OPTIONS:MDOCS}
PLIST_SUB+=	PORTDOCS=""
.else
PLIST_SUB+=	PORTDOCS="@comment "
.endif

post-patch:
	@${REINPLACE_CMD} -e 's|pkgconfigdir = $$(libdir)/pkgconfig|pkgconfigdir = $$(prefix)/libdata/pkgconfig|' \
		${WRKSRC}/Makefile.in
.if ! ${PORT_OPTIONS:MDOCS}
	${REINPLACE_CMD} -e 's|^docfiles|no-docfiles|' \
		${WRKSRC}/Makefile.in
.endif

pre-configure:
	${REINPLACE_CMD} \
		-e 's|^LIBTIFF_VERSION_INFO =.*$$|LIBTIFF_VERSION_INFO = 4:0:0|' \
		${WRKSRC}/libtiff/Makefile.in
	${REINPLACE_CMD} -e 's|man html|man|' \
		${WRKSRC}/Makefile.in

.if ${PORT_OPTIONS:MDOCS}
post-install:
	@${MKDIR} ${DOCSDIR}/images ${DOCSDIR}/man
	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
	${INSTALL_DATA} ${WRKSRC}/html/*.html ${DOCSDIR}/
	${INSTALL_DATA} ${WRKSRC}/html/images/*.jpg ${DOCSDIR}/images/
	${INSTALL_DATA} ${WRKSRC}/html/images/*.gif ${DOCSDIR}/images/




--- Makefile.in.orig	2012-09-22 18:08:18.000000000 +0200
+++ Makefile.in	2013-03-13 16:14:10.000000000 +0100
@@ -375,7 +375,7 @@
 
 dist_doc_DATA = $(docfiles)
 SUBDIRS = port libtiff tools build contrib test man html
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(prefix)/libdata/pkgconfig
 pkgconfig_DATA = libtiff-4.pc
 all: all-recursive
 
@@ -427,19 +427,6 @@
 	-rm -f libtool config.lt
 install-dist_docDATA: $(dist_doc_DATA)

Lines 11-19 Link Here

(-)./pkg-descr (-5 lines)
11	follow the 5.0 or 6.0 TIFF spec. There is also considerable support	11	follow the 5.0 or 6.0 TIFF spec. There is also considerable support
12	for some of the more esoteric portions of the 6.0 TIFF spec.	12	for some of the more esoteric portions of the 6.0 TIFF spec.
13		13
14	Unless NOPORTDOCS is defined, the html documentations is also
15	installed locally in /usr/local/share/doc/tiff.
16
17	LICENSE: Permission to use, copy, modify, distribute, and sell for any purpose
18
19	WWW: http://www.remotesensing.org/libtiff/	14	WWW: http://www.remotesensing.org/libtiff/




lib/libtiffxx.so
lib/libtiffxx.so.4
libdata/pkgconfig/libtiff-4.pc
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TIFFTechNote2.html
%%PORTDOCS%%%%DOCSDIR%%/TODO
%%PORTDOCS%%%%DOCSDIR%%/addingtags.html
%%PORTDOCS%%%%DOCSDIR%%/bugs.html
%%PORTDOCS%%%%DOCSDIR%%/build.html
%%PORTDOCS%%%%DOCSDIR%%/contrib.html
%%PORTDOCS%%%%DOCSDIR%%/document.html
%%PORTDOCS%%%%DOCSDIR%%/images.html
%%PORTDOCS%%%%DOCSDIR%%/images/back.gif
%%PORTDOCS%%%%DOCSDIR%%/images/bali.jpg
%%PORTDOCS%%%%DOCSDIR%%/images/cat.gif

%%PORTDOCS%%%%DOCSDIR%%/images/smallliz.jpg
%%PORTDOCS%%%%DOCSDIR%%/images/strike.gif
%%PORTDOCS%%%%DOCSDIR%%/images/warning.gif
%%PORTDOCS%%%%DOCSDIR%%/images.html
%%PORTDOCS%%%%DOCSDIR%%/index.html
%%PORTDOCS%%%%DOCSDIR%%/internals.html
%%PORTDOCS%%%%DOCSDIR%%/intro.html

Return to bug 176919

Lines 3-8 Link Here

(-)./Makefile (-16 / +38 lines)
3		3
4	PORTNAME= tiff	4	PORTNAME= tiff
5	PORTVERSION= 4.0.3	5	PORTVERSION= 4.0.3
		6	PORTREVISION= 1
6	CATEGORIES= graphics	7	CATEGORIES= graphics
7	MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/ \	8	MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/ \
8	http://download.osgeo.org/libtiff/	9	http://download.osgeo.org/libtiff/
Lines 10-35 Link Here
10	MAINTAINER= dinoex@FreeBSD.org	11	MAINTAINER= dinoex@FreeBSD.org
11	COMMENT= Tools and library routines for working with TIFF images	12	COMMENT= Tools and library routines for working with TIFF images
12		13
13	LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
14	jbig:${PORTSDIR}/graphics/jbigkit
15
16	LICENSE= BSD	14	LICENSE= BSD
17	LICENSE_FILE= ${WRKSRC}/COPYRIGHT	15	LICENSE_FILE= ${WRKSRC}/COPYRIGHT
18		16
		17	LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
		18	jbig:${PORTSDIR}/graphics/jbigkit
		19
19	USE_LDCONFIG= yes	20	USE_LDCONFIG= yes
20	USE_AUTOTOOLS= libtool	21	USE_AUTOTOOLS= libtool
21	CONFIGURE_ARGS+= --with-jpeg-include-dir=${LOCALBASE}/include \	22	CONFIGURE_ARGS+= --with-jpeg-include-dir=${LOCALBASE}/include \
22	--with-jpeg-lib-dir=${LOCALBASE}/lib	23	--with-jpeg-lib-dir=${LOCALBASE}/lib
23		24
24	.if defined(WITH_X11) && !defined(WITHOUT_X11)
25	USE_XORG= sm ice xmu xi x11
26	USE_GL= glut glu gl
27	PLIST_SUB+= WITH_X11=""
28	.else
29	CONFIGURE_ARGS+= --without-x --without-libgl
30	PLIST_SUB+= WITH_X11="@comment "
31	.endif
32
33	MAN1= bmp2tiff.1 tiff2pdf.1 fax2ps.1 fax2tiff.1 gif2tiff.1 pal2rgb.1 \	25	MAN1= bmp2tiff.1 tiff2pdf.1 fax2ps.1 fax2tiff.1 gif2tiff.1 pal2rgb.1 \
34	ppm2tiff.1 ras2tiff.1 raw2tiff.1 rgb2ycbcr.1 sgi2tiff.1 \	26	ppm2tiff.1 ras2tiff.1 raw2tiff.1 rgb2ycbcr.1 sgi2tiff.1 \
35	thumbnail.1 tiff2bw.1 tiff2ps.1 tiff2rgba.1 tiffcmp.1 tiffcp.1 \	27	thumbnail.1 tiff2bw.1 tiff2ps.1 tiff2rgba.1 tiffcmp.1 tiffcp.1 \
Lines 109-124 Link Here
109	TIFFtile.3tiff TIFFTileRowSize.3tiff \	101	TIFFtile.3tiff TIFFTileRowSize.3tiff \
110	TIFFtile.3tiff TIFFVTileSize.3tiff	102	TIFFtile.3tiff TIFFVTileSize.3tiff
111		103
		104	PORTDOCS= ChangeLog README TODO
		105
		106	OPTIONS_DEFINE= DOCS X11
		107
		108	.include <bsd.port.options.mk>
		109
		110	.if ${PORT_OPTIONS:MX11}
		111	USE_XORG= sm ice xmu xi x11
		112	USE_GL= glut glu gl
		113	PLIST_SUB+= WITH_X11=""
		114	.else
		115	CONFIGURE_ARGS+= --without-x --without-libgl
		116	PLIST_SUB+= WITH_X11="@comment "
		117	.endif
		118
		119	.if ${PORT_OPTIONS:MDOCS}
		120	PLIST_SUB+= PORTDOCS=""
		121	.else
		122	PLIST_SUB+= PORTDOCS="@comment "
		123	.endif
		124
		125	post-patch:
		126	@${REINPLACE_CMD} -e 's\|pkgconfigdir = $$(libdir)/pkgconfig\|pkgconfigdir = $$(prefix)/libdata/pkgconfig\|' \
		127	${WRKSRC}/Makefile.in
		128	.if ! ${PORT_OPTIONS:MDOCS}
		129	${REINPLACE_CMD} -e 's\|^docfiles\|no-docfiles\|' \
		130	${WRKSRC}/Makefile.in
		131	.endif
		132
112	pre-configure:	133	pre-configure:
113	${REINPLACE_CMD} \	134	${REINPLACE_CMD} \
114	-e 's\|^LIBTIFF_VERSION_INFO =.*$$\|LIBTIFF_VERSION_INFO = 4:0:0\|' \	135	-e 's\|^LIBTIFF_VERSION_INFO =.*$$\|LIBTIFF_VERSION_INFO = 4:0:0\|' \
115	${WRKSRC}/libtiff/Makefile.in	136	${WRKSRC}/libtiff/Makefile.in
116	${REINPLACE_CMD} -e 's\|^docfiles\|no-docfiles\|' \	137	${REINPLACE_CMD} -e 's\|man html\|man\|' \
117	-e 's\|man html\|man\|' ${WRKSRC}/Makefile.in	138	${WRKSRC}/Makefile.in
118		139
119	.if !defined(NOPORTDOCS)	140	.if ${PORT_OPTIONS:MDOCS}
120	post-install:	141	post-install:
121	${MKDIR} ${DOCSDIR}/images ${DOCSDIR}/man	142	@${MKDIR} ${DOCSDIR}/images ${DOCSDIR}/man
		143	${INSTALL_DATA} ${PORTDOCS:S\|^\|${WRKSRC}/\|} ${DOCSDIR}
122	${INSTALL_DATA} ${WRKSRC}/html/*.html ${DOCSDIR}/	144	${INSTALL_DATA} ${WRKSRC}/html/*.html ${DOCSDIR}/
123	${INSTALL_DATA} ${WRKSRC}/html/images/*.jpg ${DOCSDIR}/images/	145	${INSTALL_DATA} ${WRKSRC}/html/images/*.jpg ${DOCSDIR}/images/
124	${INSTALL_DATA} ${WRKSRC}/html/images/*.gif ${DOCSDIR}/images/	146	${INSTALL_DATA} ${WRKSRC}/html/images/*.gif ${DOCSDIR}/images/

Lines 1-14 Link Here

(-)./files/patch-Makefile.in (-10 / +1 lines)
1	--- Makefile.in.orig 2012-09-22 18:08:18.000000000 +0200	1	--- Makefile.in.orig 2012-09-22 18:08:18.000000000 +0200
2	+++ Makefile.in 2012-10-13 19:35:28.000000000 +0200	2	+++ Makefile.in 2013-03-13 16:14:10.000000000 +0100
3	@@ -375,7 +375,7 @@
4
5	dist_doc_DATA = $(docfiles)
6	SUBDIRS = port libtiff tools build contrib test man html
7	-pkgconfigdir = $(libdir)/pkgconfig
8	+pkgconfigdir = $(prefix)/libdata/pkgconfig
9	pkgconfig_DATA = libtiff-4.pc
10	all: all-recursive
11
12	@@ -427,19 +427,6 @@	3	@@ -427,19 +427,6 @@
13	-rm -f libtool config.lt	4	-rm -f libtool config.lt
14	install-dist_docDATA: $(dist_doc_DATA)	5	install-dist_docDATA: $(dist_doc_DATA)

Lines 36-47 Link Here

(-)./pkg-plist (-1 / +4 lines)
36	lib/libtiffxx.so	36	lib/libtiffxx.so
37	lib/libtiffxx.so.4	37	lib/libtiffxx.so.4
38	libdata/pkgconfig/libtiff-4.pc	38	libdata/pkgconfig/libtiff-4.pc
		39	%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
		40	%%PORTDOCS%%%%DOCSDIR%%/README
39	%%PORTDOCS%%%%DOCSDIR%%/TIFFTechNote2.html	41	%%PORTDOCS%%%%DOCSDIR%%/TIFFTechNote2.html
		42	%%PORTDOCS%%%%DOCSDIR%%/TODO
40	%%PORTDOCS%%%%DOCSDIR%%/addingtags.html	43	%%PORTDOCS%%%%DOCSDIR%%/addingtags.html
41	%%PORTDOCS%%%%DOCSDIR%%/bugs.html	44	%%PORTDOCS%%%%DOCSDIR%%/bugs.html
42	%%PORTDOCS%%%%DOCSDIR%%/build.html	45	%%PORTDOCS%%%%DOCSDIR%%/build.html
43	%%PORTDOCS%%%%DOCSDIR%%/contrib.html	46	%%PORTDOCS%%%%DOCSDIR%%/contrib.html
44	%%PORTDOCS%%%%DOCSDIR%%/document.html	47	%%PORTDOCS%%%%DOCSDIR%%/document.html
		48	%%PORTDOCS%%%%DOCSDIR%%/images.html
45	%%PORTDOCS%%%%DOCSDIR%%/images/back.gif	49	%%PORTDOCS%%%%DOCSDIR%%/images/back.gif
46	%%PORTDOCS%%%%DOCSDIR%%/images/bali.jpg	50	%%PORTDOCS%%%%DOCSDIR%%/images/bali.jpg
47	%%PORTDOCS%%%%DOCSDIR%%/images/cat.gif	51	%%PORTDOCS%%%%DOCSDIR%%/images/cat.gif
Lines 58-64 Link Here
58	%%PORTDOCS%%%%DOCSDIR%%/images/smallliz.jpg	62	%%PORTDOCS%%%%DOCSDIR%%/images/smallliz.jpg
59	%%PORTDOCS%%%%DOCSDIR%%/images/strike.gif	63	%%PORTDOCS%%%%DOCSDIR%%/images/strike.gif
60	%%PORTDOCS%%%%DOCSDIR%%/images/warning.gif	64	%%PORTDOCS%%%%DOCSDIR%%/images/warning.gif
61	%%PORTDOCS%%%%DOCSDIR%%/images.html
62	%%PORTDOCS%%%%DOCSDIR%%/index.html	65	%%PORTDOCS%%%%DOCSDIR%%/index.html
63	%%PORTDOCS%%%%DOCSDIR%%/internals.html	66	%%PORTDOCS%%%%DOCSDIR%%/internals.html
64	%%PORTDOCS%%%%DOCSDIR%%/intro.html	67	%%PORTDOCS%%%%DOCSDIR%%/intro.html