View | Details | Raw Unified | Return to bug 176919 | Differences between
and this patch

Collapse All | Expand All

(-)./Makefile (-15 / +33 lines)
Lines 3-8 Link Here
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-34 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
PORTDOCS=	*
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
26
33
MAN1=	bmp2tiff.1 tiff2pdf.1 fax2ps.1 fax2tiff.1 gif2tiff.1 pal2rgb.1 \
27
MAN1=	bmp2tiff.1 tiff2pdf.1 fax2ps.1 fax2tiff.1 gif2tiff.1 pal2rgb.1 \
34
	ppm2tiff.1 ras2tiff.1 raw2tiff.1 rgb2ycbcr.1 sgi2tiff.1 \
28
	ppm2tiff.1 ras2tiff.1 raw2tiff.1 rgb2ycbcr.1 sgi2tiff.1 \
Lines 109-124 Link Here
109
	TIFFtile.3tiff           TIFFTileRowSize.3tiff \
103
	TIFFtile.3tiff           TIFFTileRowSize.3tiff \
110
	TIFFtile.3tiff           TIFFVTileSize.3tiff
104
	TIFFtile.3tiff           TIFFVTileSize.3tiff
111
105
106
OPTIONS_DEFINE=	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
post-patch:
120
	@${REINPLACE_CMD} -e 's|pkgconfigdir = $$(libdir)/pkgconfig|pkgconfigdir = $$(prefix)/libdata/pkgconfig|' \
121
		${WRKSRC}/Makefile.in
122
.if ! ${PORT_OPTIONS:MDOCS}
123
	${REINPLACE_CMD} -e 's|^docfiles|no-docfiles|' \
124
		${WRKSRC}/Makefile.in
125
.endif
126
112
pre-configure:
127
pre-configure:
113
	${REINPLACE_CMD} \
128
	${REINPLACE_CMD} \
114
		-e 's|^LIBTIFF_VERSION_INFO =.*$$|LIBTIFF_VERSION_INFO = 4:0:0|' \
129
		-e 's|^LIBTIFF_VERSION_INFO =.*$$|LIBTIFF_VERSION_INFO = 4:0:0|' \
115
		${WRKSRC}/libtiff/Makefile.in
130
		${WRKSRC}/libtiff/Makefile.in
116
	${REINPLACE_CMD} -e 's|^docfiles|no-docfiles|' \
131
	${REINPLACE_CMD} -e 's|man html|man|' \
117
		-e 's|man html|man|' ${WRKSRC}/Makefile.in
132
		${WRKSRC}/Makefile.in
118
133
119
.if !defined(NOPORTDOCS)
134
.if ${PORT_OPTIONS:MDOCS}
120
post-install:
135
post-install:
121
	${MKDIR} ${DOCSDIR}/images ${DOCSDIR}/man
136
	@${MKDIR} ${DOCSDIR}/images ${DOCSDIR}/man
137
.for f in ChangeLog README TODO
138
	 @(cd ${WRKSRC} && ${INSTALL_DATA} ${f} ${DOCSDIR})
139
.endfor
122
	${INSTALL_DATA} ${WRKSRC}/html/*.html ${DOCSDIR}/
140
	${INSTALL_DATA} ${WRKSRC}/html/*.html ${DOCSDIR}/
123
	${INSTALL_DATA} ${WRKSRC}/html/images/*.jpg ${DOCSDIR}/images/
141
	${INSTALL_DATA} ${WRKSRC}/html/images/*.jpg ${DOCSDIR}/images/
124
	${INSTALL_DATA} ${WRKSRC}/html/images/*.gif ${DOCSDIR}/images/
142
	${INSTALL_DATA} ${WRKSRC}/html/images/*.gif ${DOCSDIR}/images/
(-)./files/patch-Makefile.in (-10 / +1 lines)
Lines 1-14 Link Here
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)
(-)./pkg-descr (-5 lines)
Lines 11-19 Link Here
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/
(-)./pkg-plist (-142 lines)
Lines 36-180 Link Here
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%%/TIFFTechNote2.html
40
%%PORTDOCS%%%%DOCSDIR%%/addingtags.html
41
%%PORTDOCS%%%%DOCSDIR%%/bugs.html
42
%%PORTDOCS%%%%DOCSDIR%%/build.html
43
%%PORTDOCS%%%%DOCSDIR%%/contrib.html
44
%%PORTDOCS%%%%DOCSDIR%%/document.html
45
%%PORTDOCS%%%%DOCSDIR%%/images/back.gif
46
%%PORTDOCS%%%%DOCSDIR%%/images/bali.jpg
47
%%PORTDOCS%%%%DOCSDIR%%/images/cat.gif
48
%%PORTDOCS%%%%DOCSDIR%%/images/cover.jpg
49
%%PORTDOCS%%%%DOCSDIR%%/images/cramps.gif
50
%%PORTDOCS%%%%DOCSDIR%%/images/dave.gif
51
%%PORTDOCS%%%%DOCSDIR%%/images/info.gif
52
%%PORTDOCS%%%%DOCSDIR%%/images/jello.jpg
53
%%PORTDOCS%%%%DOCSDIR%%/images/jim.gif
54
%%PORTDOCS%%%%DOCSDIR%%/images/note.gif
55
%%PORTDOCS%%%%DOCSDIR%%/images/oxford.gif
56
%%PORTDOCS%%%%DOCSDIR%%/images/quad.jpg
57
%%PORTDOCS%%%%DOCSDIR%%/images/ring.gif
58
%%PORTDOCS%%%%DOCSDIR%%/images/smallliz.jpg
59
%%PORTDOCS%%%%DOCSDIR%%/images/strike.gif
60
%%PORTDOCS%%%%DOCSDIR%%/images/warning.gif
61
%%PORTDOCS%%%%DOCSDIR%%/images.html
62
%%PORTDOCS%%%%DOCSDIR%%/index.html
63
%%PORTDOCS%%%%DOCSDIR%%/internals.html
64
%%PORTDOCS%%%%DOCSDIR%%/intro.html
65
%%PORTDOCS%%%%DOCSDIR%%/libtiff.html
66
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFClose.3tiff.html
67
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFDataWidth.3tiff.html
68
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFError.3tiff.html
69
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFFieldDataType.3tiff.html
70
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFFieldName.3tiff.html
71
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFFieldPassCount.3tiff.html
72
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFFieldReadCount.3tiff.html
73
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFFieldTag.3tiff.html
74
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFFieldWriteCount.3tiff.html
75
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFFlush.3tiff.html
76
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFGetField.3tiff.html
77
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFOpen.3tiff.html
78
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFPrintDirectory.3tiff.html
79
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFRGBAImage.3tiff.html
80
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadDirectory.3tiff.html
81
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadEncodedStrip.3tiff.html
82
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadEncodedTile.3tiff.html
83
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadRGBAImage.3tiff.html
84
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadRGBAStrip.3tiff.html
85
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadRGBATile.3tiff.html
86
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadRawStrip.3tiff.html
87
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadRawTile.3tiff.html
88
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadScanline.3tiff.html
89
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFReadTile.3tiff.html
90
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFSetDirectory.3tiff.html
91
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFSetField.3tiff.html
92
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWarning.3tiff.html
93
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWriteDirectory.3tiff.html
94
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWriteEncodedStrip.3tiff.html
95
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWriteEncodedTile.3tiff.html
96
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWriteRawStrip.3tiff.html
97
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWriteRawTile.3tiff.html
98
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWriteScanline.3tiff.html
99
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFWriteTile.3tiff.html
100
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFbuffer.3tiff.html
101
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFcodec.3tiff.html
102
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFcolor.3tiff.html
103
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFmemory.3tiff.html
104
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFquery.3tiff.html
105
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFsize.3tiff.html
106
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFstrip.3tiff.html
107
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFswab.3tiff.html
108
%%PORTDOCS%%%%DOCSDIR%%/man/TIFFtile.3tiff.html
109
%%PORTDOCS%%%%DOCSDIR%%/man/bmp2tiff.1.html
110
%%PORTDOCS%%%%DOCSDIR%%/man/fax2ps.1.html
111
%%PORTDOCS%%%%DOCSDIR%%/man/fax2tiff.1.html
112
%%PORTDOCS%%%%DOCSDIR%%/man/gif2tiff.1.html
113
%%PORTDOCS%%%%DOCSDIR%%/man/index.html
114
%%PORTDOCS%%%%DOCSDIR%%/man/libtiff.3tiff.html
115
%%PORTDOCS%%%%DOCSDIR%%/man/pal2rgb.1.html
116
%%PORTDOCS%%%%DOCSDIR%%/man/ppm2tiff.1.html
117
%%PORTDOCS%%%%DOCSDIR%%/man/ras2tiff.1.html
118
%%PORTDOCS%%%%DOCSDIR%%/man/raw2tiff.1.html
119
%%PORTDOCS%%%%DOCSDIR%%/man/rgb2ycbcr.1.html
120
%%PORTDOCS%%%%DOCSDIR%%/man/sgi2tiff.1.html
121
%%PORTDOCS%%%%DOCSDIR%%/man/thumbnail.1.html
122
%%PORTDOCS%%%%DOCSDIR%%/man/tiff2bw.1.html
123
%%PORTDOCS%%%%DOCSDIR%%/man/tiff2pdf.1.html
124
%%PORTDOCS%%%%DOCSDIR%%/man/tiff2ps.1.html
125
%%PORTDOCS%%%%DOCSDIR%%/man/tiff2rgba.1.html
126
%%PORTDOCS%%%%DOCSDIR%%/man/tiffcmp.1.html
127
%%PORTDOCS%%%%DOCSDIR%%/man/tiffcp.1.html
128
%%PORTDOCS%%%%DOCSDIR%%/man/tiffcrop.1.html
129
%%PORTDOCS%%%%DOCSDIR%%/man/tiffdither.1.html
130
%%PORTDOCS%%%%DOCSDIR%%/man/tiffdump.1.html
131
%%PORTDOCS%%%%DOCSDIR%%/man/tiffgt.1.html
132
%%PORTDOCS%%%%DOCSDIR%%/man/tiffinfo.1.html
133
%%PORTDOCS%%%%DOCSDIR%%/man/tiffmedian.1.html
134
%%PORTDOCS%%%%DOCSDIR%%/man/tiffset.1.html
135
%%PORTDOCS%%%%DOCSDIR%%/man/tiffsplit.1.html
136
%%PORTDOCS%%%%DOCSDIR%%/man/tiffsv.1.html
137
%%PORTDOCS%%%%DOCSDIR%%/misc.html
138
%%PORTDOCS%%%%DOCSDIR%%/support.html
139
%%PORTDOCS%%%%DOCSDIR%%/tools.html
140
%%PORTDOCS%%%%DOCSDIR%%/v3.4beta007.html
141
%%PORTDOCS%%%%DOCSDIR%%/v3.4beta016.html
142
%%PORTDOCS%%%%DOCSDIR%%/v3.4beta018.html
143
%%PORTDOCS%%%%DOCSDIR%%/v3.4beta024.html
144
%%PORTDOCS%%%%DOCSDIR%%/v3.4beta028.html
145
%%PORTDOCS%%%%DOCSDIR%%/v3.4beta029.html
146
%%PORTDOCS%%%%DOCSDIR%%/v3.4beta031.html
147
%%PORTDOCS%%%%DOCSDIR%%/v3.4beta032.html
148
%%PORTDOCS%%%%DOCSDIR%%/v3.4beta033.html
149
%%PORTDOCS%%%%DOCSDIR%%/v3.4beta034.html
150
%%PORTDOCS%%%%DOCSDIR%%/v3.4beta035.html
151
%%PORTDOCS%%%%DOCSDIR%%/v3.4beta036.html
152
%%PORTDOCS%%%%DOCSDIR%%/v3.5.1.html
153
%%PORTDOCS%%%%DOCSDIR%%/v3.5.2.html
154
%%PORTDOCS%%%%DOCSDIR%%/v3.5.3.html
155
%%PORTDOCS%%%%DOCSDIR%%/v3.5.4.html
156
%%PORTDOCS%%%%DOCSDIR%%/v3.5.5.html
157
%%PORTDOCS%%%%DOCSDIR%%/v3.5.6-beta.html
158
%%PORTDOCS%%%%DOCSDIR%%/v3.5.7.html
159
%%PORTDOCS%%%%DOCSDIR%%/v3.6.0.html
160
%%PORTDOCS%%%%DOCSDIR%%/v3.6.1.html
161
%%PORTDOCS%%%%DOCSDIR%%/v3.7.0.html
162
%%PORTDOCS%%%%DOCSDIR%%/v3.7.0alpha.html
163
%%PORTDOCS%%%%DOCSDIR%%/v3.7.0beta.html
164
%%PORTDOCS%%%%DOCSDIR%%/v3.7.0beta2.html
165
%%PORTDOCS%%%%DOCSDIR%%/v3.7.1.html
166
%%PORTDOCS%%%%DOCSDIR%%/v3.7.2.html
167
%%PORTDOCS%%%%DOCSDIR%%/v3.7.3.html
168
%%PORTDOCS%%%%DOCSDIR%%/v3.7.4.html
169
%%PORTDOCS%%%%DOCSDIR%%/v3.8.0.html
170
%%PORTDOCS%%%%DOCSDIR%%/v3.8.1.html
171
%%PORTDOCS%%%%DOCSDIR%%/v3.8.2.html
172
%%PORTDOCS%%%%DOCSDIR%%/v3.9.0beta.html
173
%%PORTDOCS%%%%DOCSDIR%%/v3.9.1.html
174
%%PORTDOCS%%%%DOCSDIR%%/v3.9.2.html
175
%%PORTDOCS%%%%DOCSDIR%%/v4.0.0.html
176
%%PORTDOCS%%%%DOCSDIR%%/v4.0.1.html
177
%%PORTDOCS%%%%DOCSDIR%%/v4.0.2.html
178
%%PORTDOCS%%@dirrm %%DOCSDIR%%/man
179
%%PORTDOCS%%@dirrm %%DOCSDIR%%/images
180
%%PORTDOCS%%@dirrm %%DOCSDIR%%

Return to bug 176919