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

(-)graphics/libgphoto2/Makefile (-9 / +9 lines)
Lines 6-13 Link Here
6
#
6
#
7
7
8
PORTNAME=	libgphoto2
8
PORTNAME=	libgphoto2
9
PORTVERSION=	2.1.2
9
PORTVERSION=	2.1.3
10
PORTREVISION=	2
11
CATEGORIES=	graphics
10
CATEGORIES=	graphics
12
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
11
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
13
MASTER_SITE_SUBDIR=	gphoto
12
MASTER_SITE_SUBDIR=	gphoto
Lines 20-47 Link Here
20
		exif.10:${PORTSDIR}/graphics/libexif
19
		exif.10:${PORTSDIR}/graphics/libexif
21
20
22
USE_BZIP2=	yes
21
USE_BZIP2=	yes
23
USE_REINPLACE=	yes
24
USE_GNOME=	gnometarget pkgconfig
22
USE_GNOME=	gnometarget pkgconfig
23
USE_GETOPT_LONG=	yes
24
USE_REINPLACE=	yes
25
USE_GMAKE=	yes
25
USE_GMAKE=	yes
26
GNU_CONFIGURE=	yes
26
GNU_CONFIGURE=	yes
27
CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
27
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
28
		LDFLAGS="-L${LOCALBASE}/lib"
29
INSTALLS_SHLIB=	yes
28
INSTALLS_SHLIB=	yes
30
PLIST_SUB=	PORTVERSION=${PORTVERSION}
29
PLIST_SUB=	VERSION=${PORTVERSION}
31
30
32
MAN3=		libgphoto2.3 libgphoto2_port.3
31
MAN3=		libgphoto2.3 libgphoto2_port.3
33
32
33
CPPFLAGS=	-I${LOCALBASE}/include
34
LDFLAGS=	-L${LOCALBASE}/lib
35
34
post-patch:
36
post-patch:
35
.for file in configure libgphoto2_port/configure
37
.for file in configure libgphoto2_port/configure
36
	@${REINPLACE_CMD} -e \
38
	@${REINPLACE_CMD} -e \
37
		's|[{]libdir[}]/pkgconfig|{prefix}/libdata/pkgconfig|g ; \
39
		's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g ; \
38
		 s|-g ||g' ${WRKSRC}/${file}
40
		 s|-g ||g' ${WRKSRC}/${file}
39
.endfor
41
.endfor
40
	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
42
	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
41
		's|po packaging doc|po doc|g ; \
43
		's|po packaging doc|po doc|g ; \
42
		 s|: install-docDATA|:|g'
44
		 s|: install-docDATA|:|g'
43
	@${FIND} ${WRKSRC} -name "*.[ch]" | ${XARGS} ${REINPLACE_CMD} -e \
44
		's|<malloc\.h>|<stdlib.h>|g'
45
45
46
post-install:
46
post-install:
47
.if !defined(NOPORTDOCS)
47
.if !defined(NOPORTDOCS)
(-)graphics/libgphoto2/distinfo (-1 / +1 lines)
Line 1 Link Here
1
MD5 (libgphoto2-2.1.2.tar.bz2) = ded0d8262d02e4c215ffc0d73d5acbbb
1
MD5 (libgphoto2-2.1.3.tar.bz2) = af200308629fcbe0b88d3802bba04779
(-)graphics/libgphoto2/files/patch-camlibs:canon:canon.c (-10 / +10 lines)
Lines 1-17 Link Here
1
--- camlibs/canon/canon.c.orig	Sun Aug 10 20:51:13 2003
1
--- camlibs/canon/canon.c.orig	Mon Oct 20 01:53:12 2003
2
+++ camlibs/canon/canon.c	Mon Oct 20 10:17:48 2003
2
+++ camlibs/canon/canon.c	Sun Oct 26 22:55:34 2003
3
@@ -138,6 +138,8 @@
3
@@ -147,6 +147,8 @@
4
         /* 0x306D is S45 in PTP mode */
4
         /* 0x306D is S45 in PTP mode */
5
 	{"Canon:PowerShot G3 (normal mode)",	CANON_PS_G3,	0x04A9, 0x306E, CAP_SUP, S99M, S32K, NULL},
5
 	{"Canon:PowerShot G3 (normal mode)",	CANON_PS_G3,	0x04A9, 0x306E, CAP_SUP, S99M, S32K, S2M, NULL},
6
         /* 0x306F is G3 in PTP mode */
6
         /* 0x306F is G3 in PTP mode */
7
+	{"Canon:PowerShot G5 (normal mode)",	CANON_PS_G5,	0x04A9, 0x3085, CAP_SUP, S99M, S32K, NULL},
7
+	{"Canon:PowerShot G5 (normal mode)",	CANON_PS_G5,	0x04A9, 0x3085, CAP_SUP, S99M, S32K, S2M, NULL},
8
+        /* XXX 0x???? is G5 in PTP mode */
8
+        /* XXX 0x???? is G5 in PTP mode */
9
 	{"Canon:PowerShot S230 (normal mode)",	CANON_PS_S230,	0x04A9, 0x3070, CAP_SUP, S99M, S32K, NULL},
9
 	{"Canon:PowerShot S230 (normal mode)",	CANON_PS_S230,	0x04A9, 0x3070, CAP_SUP, S99M, S32K, S2M, NULL},
10
         /* 0x3071 is S230 in PTP mode */
10
 	{"Canon:Digital IXUS v3 (normal mode)",	CANON_PS_S230,	0x04A9, 0x3070, CAP_SUP, S99M, S32K, S2M, NULL},
11
 	{"Canon:Digital IXUS v3 (normal mode)",	CANON_PS_S230,	0x04A9, 0x3070, CAP_SUP, S99M, S32K, NULL},
11
         /* 0x3071 is S230/IXUS v3 in PTP mode */
12
@@ -250,6 +252,7 @@
12
@@ -312,6 +314,7 @@
13
 	case CANON_PS_S40:
14
 	case CANON_PS_S45:
13
 	case CANON_PS_S45:
14
 	case CANON_PS_S400:
15
 	case CANON_PS_G3:
15
 	case CANON_PS_G3:
16
+	case CANON_PS_G5:
16
+	case CANON_PS_G5:
17
 		break;
17
 		break;
(-)graphics/libgphoto2/files/patch-camlibs:canon:canon.h (-8 / +8 lines)
Lines 1-18 Link Here
1
--- camlibs/canon/canon.h.orig	Sun Aug 10 20:51:13 2003
1
--- camlibs/canon/canon.h.orig	Mon Oct 20 01:53:12 2003
2
+++ camlibs/canon/canon.h	Mon Oct 20 10:17:51 2003
2
+++ camlibs/canon/canon.h	Sun Oct 26 22:57:54 2003
3
@@ -86,6 +86,7 @@
3
@@ -87,6 +87,7 @@
4
  * @CANON_PS_S330: Digital IXUS 330
4
  * @CANON_PS_S330: Digital IXUS 330
5
  * @CANON_PS_S45: PowerShot S45
5
  * @CANON_PS_S45: PowerShot S45
6
  * @CANON_PS_G3: PowerShot G3
6
  * @CANON_PS_G3: PowerShot G3
7
+ * @CANON_PS_G5: PowerShot G5
7
+ * @CANON_PS_G3: PowerShot G5
8
  * @CANON_PS_S230: PowerShot S230, Digital IXUS v3
8
  * @CANON_PS_S230: PowerShot S230, Digital IXUS v3
9
  * @CANON_PS_A60: PowerShot A60
9
  * @CANON_PS_A60: PowerShot A60
10
  * @CANON_EOS_10D: EOS 10D
10
  * @CANON_MV630I: MV630i camcorder
11
@@ -123,6 +124,7 @@
11
@@ -133,6 +134,7 @@
12
 	CANON_PS_A300,
12
 	CANON_PS_S50,
13
 	CANON_PS_S45,
13
 	CANON_PS_S45,
14
 	CANON_PS_G3,
14
 	CANON_PS_G3,
15
+	CANON_PS_G5,
15
+	CANON_PS_G5,
16
 	CANON_PS_S50,
17
 	CANON_PS_S230,
16
 	CANON_PS_S230,
17
 	CANON_MV630I,
18
 	CANON_EOS_10D,
18
 	CANON_EOS_10D,
(-)graphics/libgphoto2/pkg-plist (-60 / +64 lines)
Lines 18-90 Link Here
18
include/gphoto2/gphoto2-version.h
18
include/gphoto2/gphoto2-version.h
19
include/gphoto2/gphoto2-widget.h
19
include/gphoto2/gphoto2-widget.h
20
include/gphoto2/gphoto2.h
20
include/gphoto2/gphoto2.h
21
lib/gphoto2/%%PORTVERSION%%/libgphoto2_agfa_cl20.so
21
lib/gphoto2/%%VERSION%%/libgphoto2_agfa_cl20.so
22
lib/gphoto2/%%PORTVERSION%%/libgphoto2_barbie.so
22
lib/gphoto2/%%VERSION%%/libgphoto2_barbie.so
23
lib/gphoto2/%%PORTVERSION%%/libgphoto2_canon.so
23
lib/gphoto2/%%VERSION%%/libgphoto2_canon.so
24
lib/gphoto2/%%PORTVERSION%%/libgphoto2_casio_qv.so
24
lib/gphoto2/%%VERSION%%/libgphoto2_casio_qv.so
25
lib/gphoto2/%%PORTVERSION%%/libgphoto2_digita.so
25
lib/gphoto2/%%VERSION%%/libgphoto2_digita.so
26
lib/gphoto2/%%PORTVERSION%%/libgphoto2_dimera3500.so
26
lib/gphoto2/%%VERSION%%/libgphoto2_dimagev.so
27
lib/gphoto2/%%PORTVERSION%%/libgphoto2_directory.so
27
lib/gphoto2/%%VERSION%%/libgphoto2_dimera3500.so
28
lib/gphoto2/%%PORTVERSION%%/libgphoto2_fuji.so
28
lib/gphoto2/%%VERSION%%/libgphoto2_directory.so
29
lib/gphoto2/%%PORTVERSION%%/libgphoto2_gsmart300.so
29
lib/gphoto2/%%VERSION%%/libgphoto2_fuji.so
30
lib/gphoto2/%%PORTVERSION%%/libgphoto2_jamcam.so
30
lib/gphoto2/%%VERSION%%/libgphoto2_gsmart300.so
31
lib/gphoto2/%%PORTVERSION%%/libgphoto2_jd11.so
31
lib/gphoto2/%%VERSION%%/libgphoto2_jamcam.so
32
lib/gphoto2/%%PORTVERSION%%/libgphoto2_kodak_dc120.so
32
lib/gphoto2/%%VERSION%%/libgphoto2_jd11.so
33
lib/gphoto2/%%PORTVERSION%%/libgphoto2_kodak_dc210.so
33
lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc120.so
34
lib/gphoto2/%%PORTVERSION%%/libgphoto2_kodak_dc240.so
34
lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc210.so
35
lib/gphoto2/%%PORTVERSION%%/libgphoto2_kodak_dc3200.so
35
lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc240.so
36
lib/gphoto2/%%PORTVERSION%%/libgphoto2_konica.so
36
lib/gphoto2/%%VERSION%%/libgphoto2_kodak_dc3200.so
37
lib/gphoto2/%%PORTVERSION%%/libgphoto2_konica_qm150.so
37
lib/gphoto2/%%VERSION%%/libgphoto2_konica.so
38
lib/gphoto2/%%PORTVERSION%%/libgphoto2_largan.so
38
lib/gphoto2/%%VERSION%%/libgphoto2_konica_qm150.so
39
lib/gphoto2/%%PORTVERSION%%/libgphoto2_dimagev.so
39
lib/gphoto2/%%VERSION%%/libgphoto2_largan.so
40
lib/gphoto2/%%PORTVERSION%%/libgphoto2_mustek.so
40
lib/gphoto2/%%VERSION%%/libgphoto2_mustek.so
41
lib/gphoto2/%%PORTVERSION%%/libgphoto2_panasonic_coolshot.so
41
lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_coolshot.so
42
lib/gphoto2/%%PORTVERSION%%/libgphoto2_panasonic_l859.so
42
lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_dc1000.so
43
lib/gphoto2/%%PORTVERSION%%/libgphoto2_panasonic_dc1000.so
43
lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_dc1580.so
44
lib/gphoto2/%%PORTVERSION%%/libgphoto2_panasonic_dc1580.so
44
lib/gphoto2/%%VERSION%%/libgphoto2_panasonic_l859.so
45
lib/gphoto2/%%PORTVERSION%%/libgphoto2_pccam300.so
45
lib/gphoto2/%%VERSION%%/libgphoto2_pccam300.so
46
lib/gphoto2/%%PORTVERSION%%/libgphoto2_pccam600.so
46
lib/gphoto2/%%VERSION%%/libgphoto2_pccam600.so
47
lib/gphoto2/%%PORTVERSION%%/libgphoto2_polaroid_pdc320.so
47
lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc320.so
48
lib/gphoto2/%%PORTVERSION%%/libgphoto2_polaroid_pdc640.so
48
lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc640.so
49
lib/gphoto2/%%PORTVERSION%%/libgphoto2_polaroid_pdc700.so
49
lib/gphoto2/%%VERSION%%/libgphoto2_polaroid_pdc700.so
50
lib/gphoto2/%%PORTVERSION%%/libgphoto2_ptp2.so
50
lib/gphoto2/%%VERSION%%/libgphoto2_ptp2.so
51
lib/gphoto2/%%PORTVERSION%%/libgphoto2_ricoh.so
51
lib/gphoto2/%%VERSION%%/libgphoto2_ricoh.so
52
lib/gphoto2/%%PORTVERSION%%/libgphoto2_samsung.so
52
lib/gphoto2/%%VERSION%%/libgphoto2_ricoh_g3.so
53
lib/gphoto2/%%PORTVERSION%%/libgphoto2_sierra.so
53
lib/gphoto2/%%VERSION%%/libgphoto2_samsung.so
54
lib/gphoto2/%%PORTVERSION%%/libgphoto2_sipix_blink.so
54
lib/gphoto2/%%VERSION%%/libgphoto2_sierra.so
55
lib/gphoto2/%%PORTVERSION%%/libgphoto2_sipix_blink2.so
55
lib/gphoto2/%%VERSION%%/libgphoto2_sipix_blink.so
56
lib/gphoto2/%%PORTVERSION%%/libgphoto2_sipix_web2.so
56
lib/gphoto2/%%VERSION%%/libgphoto2_sipix_blink2.so
57
lib/gphoto2/%%PORTVERSION%%/libgphoto2_smal.so
57
lib/gphoto2/%%VERSION%%/libgphoto2_sipix_web2.so
58
lib/gphoto2/%%PORTVERSION%%/libgphoto2_sony_dscf1.so
58
lib/gphoto2/%%VERSION%%/libgphoto2_smal.so
59
lib/gphoto2/%%PORTVERSION%%/libgphoto2_sony_dscf55.so
59
lib/gphoto2/%%VERSION%%/libgphoto2_sony_dscf1.so
60
lib/gphoto2/%%PORTVERSION%%/libgphoto2_soundvision.so
60
lib/gphoto2/%%VERSION%%/libgphoto2_sony_dscf55.so
61
lib/gphoto2/%%PORTVERSION%%/libgphoto2_spca50x.so
61
lib/gphoto2/%%VERSION%%/libgphoto2_soundvision.so
62
lib/gphoto2/%%PORTVERSION%%/libgphoto2_sq905.so
62
lib/gphoto2/%%VERSION%%/libgphoto2_spca50x.so
63
lib/gphoto2/%%PORTVERSION%%/libgphoto2_stv0674.so
63
lib/gphoto2/%%VERSION%%/libgphoto2_sq905.so
64
lib/gphoto2/%%PORTVERSION%%/libgphoto2_stv0680.so
64
lib/gphoto2/%%VERSION%%/libgphoto2_stv0674.so
65
lib/gphoto2/%%PORTVERSION%%/libgphoto2_sx330z.so
65
lib/gphoto2/%%VERSION%%/libgphoto2_stv0680.so
66
lib/gphoto2/%%PORTVERSION%%/libgphoto2_toshiba.so
66
lib/gphoto2/%%VERSION%%/libgphoto2_sx330z.so
67
lib/gphoto2/%%VERSION%%/libgphoto2_toshiba.so
67
lib/gphoto2_port/0.5.1/libgphoto2_port_serial.so
68
lib/gphoto2_port/0.5.1/libgphoto2_port_serial.so
68
lib/gphoto2_port/0.5.1/libgphoto2_port_usb.so
69
lib/gphoto2_port/0.5.1/libgphoto2_port_usb.so
69
libdata/pkgconfig/libgphoto2.pc
70
lib/libgphoto2.a
70
lib/libgphoto2.a
71
lib/libgphoto2.so
71
lib/libgphoto2.so
72
lib/libgphoto2.so.2
72
lib/libgphoto2.so.2
73
lib/libgphoto2_port.a
73
lib/libgphoto2_port.a
74
lib/libgphoto2_port.so
74
lib/libgphoto2_port.so
75
lib/libgphoto2_port.so.5
75
lib/libgphoto2_port.so.5
76
%%PORTDOCS%%share/doc/libgphoto2/AUTHORS
76
libdata/pkgconfig/libgphoto2.pc
77
%%PORTDOCS%%share/doc/libgphoto2/NEWS
77
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
78
%%PORTDOCS%%share/doc/libgphoto2/README
78
%%PORTDOCS%%%%DOCSDIR%%/NEWS
79
%%PORTDOCS%%%%DOCSDIR%%/README
79
%%PORTDOCS%%share/doc/libgphoto2_port/AUTHORS
80
%%PORTDOCS%%share/doc/libgphoto2_port/AUTHORS
80
%%PORTDOCS%%share/doc/libgphoto2_port/NEWS
81
%%PORTDOCS%%share/doc/libgphoto2_port/NEWS
81
%%PORTDOCS%%share/doc/libgphoto2_port/README
82
%%PORTDOCS%%share/doc/libgphoto2_port/README
82
share/libgphoto2/%%PORTVERSION%%/konica/english
83
share/libgphoto2/%%VERSION%%/konica/english
83
share/libgphoto2/%%PORTVERSION%%/konica/french
84
share/libgphoto2/%%VERSION%%/konica/french
84
share/libgphoto2/%%PORTVERSION%%/konica/german
85
share/libgphoto2/%%VERSION%%/konica/german
85
share/libgphoto2/%%PORTVERSION%%/konica/japanese
86
share/libgphoto2/%%VERSION%%/konica/japanese
86
share/libgphoto2/%%PORTVERSION%%/konica/korean
87
share/libgphoto2/%%VERSION%%/konica/korean
87
share/libgphoto2/%%PORTVERSION%%/konica/spanish
88
share/libgphoto2/%%VERSION%%/konica/spanish
89
share/locale/cs/LC_MESSAGES/libgphoto2_port-0.mo
88
share/locale/da/LC_MESSAGES/libgphoto2-2.mo
90
share/locale/da/LC_MESSAGES/libgphoto2-2.mo
89
share/locale/da/LC_MESSAGES/libgphoto2_port-0.mo
91
share/locale/da/LC_MESSAGES/libgphoto2_port-0.mo
90
share/locale/de/LC_MESSAGES/libgphoto2-2.mo
92
share/locale/de/LC_MESSAGES/libgphoto2-2.mo
Lines 93-104 Link Here
93
share/locale/es/LC_MESSAGES/libgphoto2_port-0.mo
95
share/locale/es/LC_MESSAGES/libgphoto2_port-0.mo
94
share/locale/fr/LC_MESSAGES/libgphoto2-2.mo
96
share/locale/fr/LC_MESSAGES/libgphoto2-2.mo
95
share/locale/fr/LC_MESSAGES/libgphoto2_port-0.mo
97
share/locale/fr/LC_MESSAGES/libgphoto2_port-0.mo
98
share/locale/hu/LC_MESSAGES/libgphoto2-2.mo
96
share/locale/it/LC_MESSAGES/libgphoto2-2.mo
99
share/locale/it/LC_MESSAGES/libgphoto2-2.mo
97
share/locale/it/LC_MESSAGES/libgphoto2_port-0.mo
100
share/locale/it/LC_MESSAGES/libgphoto2_port-0.mo
98
share/locale/ja/LC_MESSAGES/libgphoto2-2.mo
101
share/locale/ja/LC_MESSAGES/libgphoto2-2.mo
99
share/locale/ja/LC_MESSAGES/libgphoto2_port-0.mo
102
share/locale/ja/LC_MESSAGES/libgphoto2_port-0.mo
100
share/locale/no/LC_MESSAGES/libgphoto2-2.mo
103
share/locale/no/LC_MESSAGES/libgphoto2-2.mo
101
share/locale/no/LC_MESSAGES/libgphoto2_port-0.mo
104
share/locale/no/LC_MESSAGES/libgphoto2_port-0.mo
105
share/locale/pt_BR/LC_MESSAGES/libgphoto2_port-0.mo
102
share/locale/ru/LC_MESSAGES/libgphoto2-2.mo
106
share/locale/ru/LC_MESSAGES/libgphoto2-2.mo
103
share/locale/ru/LC_MESSAGES/libgphoto2_port-0.mo
107
share/locale/ru/LC_MESSAGES/libgphoto2_port-0.mo
104
share/locale/sl/LC_MESSAGES/libgphoto2-2.mo
108
share/locale/sl/LC_MESSAGES/libgphoto2-2.mo
Lines 109-121 Link Here
109
share/locale/uk/LC_MESSAGES/libgphoto2_port-0.mo
113
share/locale/uk/LC_MESSAGES/libgphoto2_port-0.mo
110
share/locale/zh_CN/LC_MESSAGES/libgphoto2-2.mo
114
share/locale/zh_CN/LC_MESSAGES/libgphoto2-2.mo
111
share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-0.mo
115
share/locale/zh_CN/LC_MESSAGES/libgphoto2_port-0.mo
112
@dirrm share/libgphoto2/%%PORTVERSION%%/konica
116
@dirrm share/libgphoto2/%%VERSION%%/konica
113
@dirrm share/libgphoto2/%%PORTVERSION%%
117
@dirrm share/libgphoto2/%%VERSION%%
114
@dirrm share/libgphoto2
118
@dirrm share/libgphoto2
115
%%PORTDOCS%%@dirrm share/doc/libgphoto2_port
119
%%PORTDOCS%%@dirrm share/doc/libgphoto2_port
116
%%PORTDOCS%%@dirrm share/doc/libgphoto2
120
%%PORTDOCS%%@dirrm %%DOCSDIR%%
117
@dirrm lib/gphoto2_port/0.5.1
121
@dirrm lib/gphoto2_port/0.5.1
118
@dirrm lib/gphoto2_port
122
@dirrm lib/gphoto2_port
119
@dirrm lib/gphoto2/%%PORTVERSION%%
123
@dirrm lib/gphoto2/%%VERSION%%
120
@dirrm lib/gphoto2
124
@dirrm lib/gphoto2
121
@dirrm include/gphoto2
125
@dirrm include/gphoto2

Return to bug 58627