cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix some implicit declarations (strcpy, memcpy...)

Browse Source 
- add license marker and regen PLIST while here

requested by and ok jasper@
This commit is contained in:
ajacoutot 2008-12-14 19:18:02 +00:00
parent 8b138261d3
commit cdb5525552
20 changed files with 195 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
graphics/gphoto/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.23 2007/11/13 17:10:25 steven Exp $
# $OpenBSD: Makefile,v 1.24 2008/12/14 19:18:02 ajacoutot Exp $
COMMENT= universal digital camera picture control tool
DISTNAME= gphoto-0.4.3
PKGNAME= ${DISTNAME}p3
PKGNAME= ${DISTNAME}p4
SHARED_LIBS= gphoto_canon 0.0 \
gphoto_casio_qv 0.0 \
gphoto_coolpix600 0.0 \
@ -29,6 +29,7 @@ HOMEPAGE= http://www.gphoto.org/
LIB_DEPENDS= gdk_imlib::graphics/imlib
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes

11
graphics/gphoto/patches/patch-canon_serial_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-canon_serial_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- canon/serial.c.orig Sat Dec 13 13:22:26 2008
+++ canon/serial.c Sat Dec 13 13:23:06 2008
@@ -19,6 +19,7 @@
#include <sys/time.h>
#include <errno.h>
#include <sys/ioctl.h>
+#include <string.h>
#include "util.h"

16
graphics/gphoto/patches/patch-kodak_kodak_dc210_c
View File

@ -1,7 +1,15 @@
$OpenBSD: patch-kodak_kodak_dc210_c,v 1.1 2004/05/15 18:37:53 naddy Exp $
--- kodak/kodak_dc210.c.orig 2004-05-15 19:24:09.000000000 +0200
+++ kodak/kodak_dc210.c 2004-05-15 19:24:35.000000000 +0200
@@ -789,11 +789,11 @@ char *kodak_dc210_summary()
$OpenBSD: patch-kodak_kodak_dc210_c,v 1.2 2008/12/14 19:18:02 ajacoutot Exp $
--- kodak/kodak_dc210.c.orig Thu Jan 20 22:42:17 2000
+++ kodak/kodak_dc210.c Sat Dec 13 15:42:49 2008
@@ -10,6 +10,7 @@
#include <stdarg.h>
#include <termios.h>
#include <fcntl.h>
+#include <string.h>
/* glib is used for byte swapping and endian checking */
@@ -789,11 +790,11 @@ char *kodak_dc210_summary()
char *kodak_dc210_description()
{

8
graphics/gphoto/patches/patch-kodak_kodak_dc2x_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-kodak_kodak_dc2x_c,v 1.1 2004/05/15 18:37:53 naddy Exp $
--- kodak/kodak_dc2x.c.orig 2004-05-15 19:25:03.000000000 +0200
+++ kodak/kodak_dc2x.c 2004-05-15 19:25:18.000000000 +0200
@@ -357,15 +357,15 @@ dc20_info->model, dc20_info->pic_taken,
$OpenBSD: patch-kodak_kodak_dc2x_c,v 1.2 2008/12/14 19:18:02 ajacoutot Exp $
--- kodak/kodak_dc2x.c.orig Sun Dec 5 19:48:53 1999
+++ kodak/kodak_dc2x.c Sat Dec 13 13:22:12 2008
@@ -357,15 +357,15 @@ dc20_info->model, dc20_info->pic_taken, dc20_info->pic
char *kodak_dc2x_description() {
return(

11
graphics/gphoto/patches/patch-konica_qmxxx_qm_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-konica_qmxxx_qm_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- konica_qmxxx/qm.c.orig Sat Dec 13 15:43:02 2008
+++ konica_qmxxx/qm.c Sat Dec 13 15:43:12 2008
@@ -25,6 +25,7 @@
#include <sys/stat.h>
#include <sys/uio.h>
#include <unistd.h>
+#include <string.h>
#include "../src/gphoto.h"
#include "../src/util.h"

11
graphics/gphoto/patches/patch-mustek_core_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-mustek_core_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- mustek/core.c.orig Sat Dec 13 13:24:52 2008
+++ mustek/core.c Sat Dec 13 13:25:02 2008
@@ -27,6 +27,7 @@
#include <termios.h>
#include <sys/time.h>
#include <stdlib.h>
+#include <string.h>
#include "print.h"
#include "device.h"

12
graphics/gphoto/patches/patch-mustek_image_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-mustek_image_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- mustek/image.c.orig Sat Dec 13 13:24:16 2008
+++ mustek/image.c Sat Dec 13 13:24:39 2008
@@ -22,6 +22,8 @@
* is used.
*/
+#include <string.h>
+
#include "image.h"
#include "print.h"

11
graphics/gphoto/patches/patch-mustek_print_h Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-mustek_print_h,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- mustek/print.h.orig Sat Dec 13 14:58:47 2008
+++ mustek/print.h Sat Dec 13 14:58:57 2008
@@ -5,6 +5,7 @@
#ifndef DEFINE_PRINT_H
#define DEFINE_PRINT_H
#include <stdio.h>
+#include <string.h>
/* Message or Errors from the gphoto API */
#define printAPINote if (1) printf

11
graphics/gphoto/patches/patch-nikon_coolpix600_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-nikon_coolpix600_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- nikon/coolpix600.c.orig Sat Dec 13 15:43:26 2008
+++ nikon/coolpix600.c Sat Dec 13 15:43:40 2008
@@ -61,6 +61,7 @@
#include<setjmp.h>
#include<sys/time.h>
#include<signal.h>
+#include <string.h>
#include "../src/gphoto.h"
#include "../src/util.h"

11
graphics/gphoto/patches/patch-photopc_eph_cmd_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-photopc_eph_cmd_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- photopc/eph_cmd.c.orig Sat Dec 13 15:43:55 2008
+++ photopc/eph_cmd.c Sat Dec 13 15:44:05 2008
@@ -65,6 +65,7 @@
#include "../src/gphoto.h"
#include "../src/util.h"
#include <stdio.h>
+#include <string.h>
#define TMPBUF_SIZE (2048)

11
graphics/gphoto/patches/patch-photopc_eph_open_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-photopc_eph_open_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- photopc/eph_open.c.orig Sat Dec 13 15:25:31 2008
+++ photopc/eph_open.c Sat Dec 13 15:25:45 2008
@@ -102,6 +102,7 @@
#include <stdlib.h>
#include <fcntl.h>
#include <errno.h>
+#include <string.h>
#ifdef MSWINDOWS
#define ERRNO GetLastError()

11
graphics/gphoto/patches/patch-ricoh_ricoh_300_io_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-ricoh_ricoh_300_io_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- ricoh/ricoh_300_io.c.orig Sat Dec 13 15:26:54 2008
+++ ricoh/ricoh_300_io.c Sat Dec 13 15:27:06 2008
@@ -25,6 +25,7 @@
#include <time.h>
#include <sys/time.h>
#include <sys/stat.h>
+#include <string.h>
/* debuging macros */
#define dprintf(x) \

16
graphics/gphoto/patches/patch-ricoh_ricoh_300z_c
View File

@ -1,7 +1,15 @@
$OpenBSD: patch-ricoh_ricoh_300z_c,v 1.1 2004/05/15 18:37:53 naddy Exp $
--- ricoh/ricoh_300z.c.orig 2004-05-15 19:28:40.000000000 +0200
+++ ricoh/ricoh_300z.c 2004-05-15 19:29:10.000000000 +0200
@@ -914,12 +914,12 @@ char *ricoh_300z_summary() {
$OpenBSD: patch-ricoh_ricoh_300z_c,v 1.2 2008/12/14 19:18:02 ajacoutot Exp $
--- ricoh/ricoh_300z.c.orig Sun Oct 3 01:41:37 1999
+++ ricoh/ricoh_300z.c Sat Dec 13 15:44:23 2008
@@ -4,6 +4,7 @@
#include <jpeglib.h>
#include <setjmp.h>
#include <time.h>
+#include <string.h>
#include "../src/gphoto.h"
#include "../src/util.h"
@@ -914,12 +915,12 @@ char *ricoh_300z_summary() {
char *ricoh_300z_description() {
return(

12
graphics/gphoto/patches/patch-samsung_samsung_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-samsung_samsung_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- samsung/samsung.c.orig Thu Jan 27 00:12:42 2000
+++ samsung/samsung.c Sat Dec 13 15:44:40 2008
@@ -42,6 +42,8 @@
#include<setjmp.h>
#include<sys/time.h>
#include<signal.h>
+#include <stdlib.h>
+#include <string.h>
#include "../src/gphoto.h"
#include "../src/util.h"

16
graphics/gphoto/patches/patch-sony_command_c
View File

@ -1,7 +1,15 @@
$OpenBSD: patch-sony_command_c,v 1.1 2004/05/15 18:37:53 naddy Exp $
--- sony/command.c.orig 2004-05-15 19:42:32.000000000 +0200
+++ sony/command.c 2004-05-15 19:42:54.000000000 +0200
@@ -288,11 +288,11 @@ char* return_buf;
$OpenBSD: patch-sony_command_c,v 1.2 2008/12/14 19:18:02 ajacoutot Exp $
--- sony/command.c.orig Sat Dec 13 15:25:10 2008
+++ sony/command.c Sat Dec 13 15:28:27 2008
@@ -23,6 +23,7 @@
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
+#include <string.h>
#if 0
# define dprintf(x) fprintf x
@@ -288,11 +289,11 @@ char* return_buf;
break;
}
sprintf(tmp_buf, "Total Pictures: %02d\n", pic_num);

12
graphics/gphoto/patches/patch-src_callbacks_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-src_callbacks_c,v 1.1 2004/05/15 18:37:53 naddy Exp $
--- src/callbacks.c.orig 2004-05-15 19:48:19.000000000 +0200
+++ src/callbacks.c 2004-05-15 19:50:54.000000000 +0200
$OpenBSD: patch-src_callbacks_c,v 1.2 2008/12/14 19:18:02 ajacoutot Exp $
--- src/callbacks.c.orig Mon Mar 6 22:23:06 2000
+++ src/callbacks.c Sat Dec 13 13:22:12 2008
@@ -790,18 +790,18 @@ void save_config() {
void version_dialog() {
char msg[1024];
@ -76,7 +76,7 @@ $OpenBSD: patch-src_callbacks_c,v 1.1 2004/05/15 18:37:53 naddy Exp $
See http://www.gnu.org for more details on the GNU project.");
}
@@ -1238,9 +1238,9 @@ void save_opened_image (int i, char *fil
@@ -1238,9 +1238,9 @@ void save_opened_image (int i, char *filename) {
if (gdk_imlib_save_image(node->imlibimage,filename, NULL) == 0) {
error_dialog(
@ -106,7 +106,7 @@ $OpenBSD: patch-src_callbacks_c,v 1.1 2004/05/15 18:37:53 naddy Exp $
directory.");
gtk_widget_show(label);
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
@@ -1814,9 +1814,9 @@ void post_process_change (GtkWidget *wid
@@ -1814,9 +1814,9 @@ void post_process_change (GtkWidget *widget, GtkWidget
FALSE, FALSE, 0);
label = gtk_label_new(
@ -119,7 +119,7 @@ $OpenBSD: patch-src_callbacks_c,v 1.1 2004/05/15 18:37:53 naddy Exp $
in the Help menu for more information. ");
gtk_widget_show(label);
gtk_label_set_justify(GTK_LABEL(label), GTK_JUSTIFY_LEFT);
@@ -1832,8 +1832,8 @@ in the Help menu for more information. "
@@ -1832,8 +1832,8 @@ in the Help menu for more information. ");
if ((strstr(gtk_entry_get_text(GTK_ENTRY(script)), "%s") == NULL)
&& GTK_TOGGLE_BUTTON(pp)->active) {
error_dialog(

11
graphics/gphoto/patches/patch-src_commandline_c Normal file
View File

@ -0,0 +1,11 @@
$OpenBSD: patch-src_commandline_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- src/commandline.c.orig Sat Dec 13 13:25:23 2008
+++ src/commandline.c Sat Dec 13 13:25:34 2008
@@ -1,6 +1,7 @@
#include <stdlib.h>
#include <stdio.h>
+#include <string.h>
#include "config.h"
#include "main.h"

12
graphics/gphoto/patches/patch-src_menu_c Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_menu_c,v 1.1 2008/12/14 19:18:02 ajacoutot Exp $
--- src/menu.c.orig Sat Dec 13 13:25:46 2008
+++ src/menu.c Sat Dec 13 13:26:01 2008
@@ -17,6 +17,8 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
+#include <string.h>
+
#include "main.h"
#include "gphoto.h"
#include "menu.h"

8
graphics/gphoto/patches/patch-src_util_c
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_util_c,v 1.1 2004/05/15 18:37:53 naddy Exp $
--- src/util.c.orig 2004-05-15 19:51:40.000000000 +0200
+++ src/util.c 2004-05-15 19:51:53.000000000 +0200
@@ -257,7 +257,7 @@ void save_image (char *filename, struct
$OpenBSD: patch-src_util_c,v 1.2 2008/12/14 19:18:02 ajacoutot Exp $
--- src/util.c.orig Mon Mar 6 22:23:06 2000
+++ src/util.c Sat Dec 13 13:22:12 2008
@@ -257,7 +257,7 @@ void save_image (char *filename, struct Image *im) {
else
{
snprintf(errormsg,1024,

14
graphics/gphoto/pkg/PLIST
View File

@ -1,10 +1,10 @@
@comment $OpenBSD: PLIST,v 1.3 2004/09/15 00:50:09 espie Exp $
bin/dc21x_cam
bin/gphoto
bin/gphoto-exifdump
bin/qm100
bin/qmxxx
bin/rsony
@comment $OpenBSD: PLIST,v 1.4 2008/12/14 19:18:02 ajacoutot Exp $
@bin bin/dc21x_cam
@bin bin/gphoto
@bin bin/gphoto-exifdump
@bin bin/qm100
@bin bin/qmxxx
@bin bin/rsony
lib/libgphoto_canon.a
lib/libgphoto_canon.la
lib/libgphoto_casio_qv.a