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

Collapse All | Expand All

(-)Makefile (-55 / +24 lines)
Lines 2-8 Link Here
2
# $FreeBSD$
2
# $FreeBSD$
3
3
4
PORTNAME=	imlib2
4
PORTNAME=	imlib2
5
PORTVERSION=	1.4.7
5
PORTVERSION=	1.4.9
6
PORTEPOCH=	2
6
PORTEPOCH=	2
7
CATEGORIES=	graphics enlightenment
7
CATEGORIES=	graphics enlightenment
8
MASTER_SITES=	SF/enlightenment/imlib2-src/${PORTVERSION}
8
MASTER_SITES=	SF/enlightenment/imlib2-src/${PORTVERSION}
Lines 21-35 Link Here
21
USE_LDCONFIG=	yes
21
USE_LDCONFIG=	yes
22
USES=		libtool pathfix pkgconfig tar:bzip2
22
USES=		libtool pathfix pkgconfig tar:bzip2
23
23
24
CONFIGURE_ARGS+=	--enable-visibility-hiding --disable-static
24
CONFIGURE_ARGS=	--enable-visibility-hiding --disable-static
25
CONFIGURE_ENV+=	ac_cv_lib_dl_dlopen=no
25
CONFIGURE_ENV=	ac_cv_lib_dl_dlopen=no
26
CPPFLAGS+=	-I${LOCALBASE}/include
26
CPPFLAGS+=	-I${LOCALBASE}/include
27
LDFLAGS+=	-L${LOCALBASE}/lib
27
LDFLAGS+=	-L${LOCALBASE}/lib
28
MAKE_ENV+=	INSTALL_STRIP_FLAG="${STRIP}"
28
MAKE_ENV=	INSTALL_STRIP_FLAG="${STRIP}"
29
29
30
OPTIONS_DEFINE=	JPEG PNG TIFF GIF ID3 X11
30
OPTIONS_DEFINE=	JPEG PNG TIFF GIF ID3 X11
31
OPTIONS_DEFAULT=	JPEG PNG TIFF GIF ID3 X11
31
OPTIONS_DEFAULT=	JPEG PNG TIFF GIF ID3 X11
32
OPTIONS_SUB=	yes
32
33
34
X11_USE=		XORG=x11,sm,xext
35
X11_CONFIGURE_OFF=	--without-x
36
37
JPEG_USES=		jpeg
38
JPEG_CONFIGURE_OFF=	--without-jpeg
39
40
PNG_LIB_DEPENDS=	libpng.so:graphics/png
41
PNG_CONFIGURE_OFF=	--without-png
42
43
TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
44
TIFF_CONFIGURE_OFF=	--without-tiff
45
46
GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
47
GIF_CONFIGURE_ARGS=	--without-gif
48
49
ID3_LIB_DEPENDS=	libid3tag.so:audio/libid3tag
50
ID3_CONFIGURE_OFF=	--without-id3
51
33
.include <bsd.port.options.mk>
52
.include <bsd.port.options.mk>
34
53
35
.if ${ARCH} == "i386" && !empty(MACHINE_CPU:Mmmx)
54
.if ${ARCH} == "i386" && !empty(MACHINE_CPU:Mmmx)
Lines 44-103 Link Here
44
CONFIGURE_ARGS+=	--disable-amd64
63
CONFIGURE_ARGS+=	--disable-amd64
45
.endif
64
.endif
46
65
47
.if ! ${PORT_OPTIONS:MX11}
66
post-patch-X11-on:
48
CONFIGURE_ARGS+=	--without-x
49
PLIST_SUB=	X11="@comment "
50
.else
51
USE_XORG=	x11 sm xext
52
PLIST_SUB=	X11=""
53
.endif
54
55
.if ${PORT_OPTIONS:MJPEG}
56
USES+=		jpeg
57
PLIST_SUB+=	JPEG=""
58
.else
59
CONFIGURE_ARGS+=	--without-jpeg
60
PLIST_SUB+=	JPEG="@comment "
61
.endif
62
63
.if ${PORT_OPTIONS:MPNG}
64
LIB_DEPENDS+=	libpng.so:graphics/png
65
PLIST_SUB+=	PNG=""
66
.else
67
CONFIGURE_ARGS+=	--without-png
68
PLIST_SUB+=	PNG="@comment "
69
.endif
70
71
.if ${PORT_OPTIONS:MTIFF}
72
LIB_DEPENDS+=	libtiff.so:graphics/tiff
73
PLIST_SUB+=	TIFF=""
74
.else
75
CONFIGURE_ARGS+=	--without-tiff
76
PLIST_SUB+=	TIFF="@comment "
77
.endif
78
79
.if ${PORT_OPTIONS:MGIF}
80
LIB_DEPENDS+=	libgif.so:graphics/giflib
81
PLIST_SUB+=	GIF=""
82
.else
83
CONFIGURE_ARGS+=	--without-gif
84
PLIST_SUB+=	GIF="@comment "
85
.endif
86
87
.if ${PORT_OPTIONS:MID3}
88
LIB_DEPENDS+=	libid3tag.so:audio/libid3tag
89
PLIST_SUB+=	ID3=""
90
.else
91
CONFIGURE_ARGS+=	--without-id3
92
PLIST_SUB+=	ID3="@comment "
93
.endif
94
95
.if ! ${PORT_OPTIONS:MX11}
96
post-patch:
97
	@${REINPLACE_CMD} -e '/MY_LIBS =/s/-lXext -lX11//' \
67
	@${REINPLACE_CMD} -e '/MY_LIBS =/s/-lXext -lX11//' \
98
		${WRKSRC}/src/lib/Makefile.in
68
		${WRKSRC}/src/lib/Makefile.in
99
	@${REINPLACE_CMD} -e '/# ifndef X_DISPLAY_MISSING/,/# endif/ d' \
69
	@${REINPLACE_CMD} -e '/# ifndef X_DISPLAY_MISSING/,/# endif/ d' \
100
		${WRKSRC}/src/lib/Imlib2.h
70
		${WRKSRC}/src/lib/Imlib2.h
101
.endif
102
71
103
.include <bsd.port.mk>
72
.include <bsd.port.mk>
(-)distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (imlib2-1.4.7.tar.bz2) = 35d733ce23ad7d338cff009095d37e656cb8a7a53717d53793a38320f9924701
1
TIMESTAMP = 1467129398
2
SIZE (imlib2-1.4.7.tar.bz2) = 889510
2
SHA256 (imlib2-1.4.9.tar.bz2) = 7d2864972801823ce44ca8d5584a67a88f0e54e2bf47fa8cf4a514317b4f0021
3
SIZE (imlib2-1.4.9.tar.bz2) = 892290
(-)pkg-plist (-1 / +2 lines)
Lines 17-22 Link Here
17
%%GIF%%lib/imlib2/loaders/gif.so
17
%%GIF%%lib/imlib2/loaders/gif.so
18
%%ID3%%lib/imlib2/loaders/id3.so
18
%%ID3%%lib/imlib2/loaders/id3.so
19
%%JPEG%%lib/imlib2/loaders/jpeg.so
19
%%JPEG%%lib/imlib2/loaders/jpeg.so
20
lib/imlib2/loaders/ff.so
20
lib/imlib2/loaders/lbm.so
21
lib/imlib2/loaders/lbm.so
21
%%PNG%%lib/imlib2/loaders/png.so
22
%%PNG%%lib/imlib2/loaders/png.so
22
lib/imlib2/loaders/pnm.so
23
lib/imlib2/loaders/pnm.so
Lines 26-32 Link Here
26
lib/imlib2/loaders/zlib.so
27
lib/imlib2/loaders/zlib.so
27
lib/libImlib2.so
28
lib/libImlib2.so
28
lib/libImlib2.so.1
29
lib/libImlib2.so.1
29
lib/libImlib2.so.1.4.7
30
lib/libImlib2.so.1.4.9
30
libdata/pkgconfig/imlib2.pc
31
libdata/pkgconfig/imlib2.pc
31
%%DATADIR%%/data/fonts/cinema.ttf
32
%%DATADIR%%/data/fonts/cinema.ttf
32
%%DATADIR%%/data/fonts/grunge.ttf
33
%%DATADIR%%/data/fonts/grunge.ttf

Return to bug 210609