- fix potential 64-bit issue
- regen WANTLIB, PLIST and patch-src_xscanimage_c 'ok as in ok' ajacoutot@ (MAINTAINER)
This commit is contained in:
parent
e68e51c9b0
commit
9e30e38a7a
@ -1,9 +1,9 @@
|
||||
# $OpenBSD: Makefile,v 1.17 2008/09/18 13:37:41 ajacoutot Exp $
|
||||
# $OpenBSD: Makefile,v 1.18 2009/02/14 10:05:21 jasper Exp $
|
||||
|
||||
COMMENT= API for accessing scanners, frontends
|
||||
|
||||
DISTNAME= sane-frontends-1.0.14
|
||||
PKGNAME= ${DISTNAME}p10
|
||||
PKGNAME= ${DISTNAME}p11
|
||||
CATEGORIES= graphics
|
||||
|
||||
HOMEPAGE= http://www.sane-project.org/
|
||||
@ -21,12 +21,11 @@ MASTER_SITES= ftp://ftp.sane-project.org/pub/sane/${DISTNAME}/ \
|
||||
ftp://gd.tuwien.ac.at/hci/sane/${DISTNAME}/ \
|
||||
ftp://ftp.sane-project.org/pub/sane/old-versions/${DISTNAME}/
|
||||
|
||||
WANTLIB= X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr \
|
||||
Xcomposite Xdamage exif \
|
||||
Xrender atk-1.0 c cairo expat fontconfig freetype \
|
||||
glib-2.0 glitz gmodule-2.0 gobject-2.0 gphoto2 \
|
||||
gphoto2_port jpeg m pango-1.0 pangocairo-1.0 \
|
||||
pangoft2-1.0 pixman-1 png pthread tiff usb z
|
||||
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
|
||||
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo exif expat
|
||||
WANTLIB += fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0
|
||||
WANTLIB += gobject-2.0 gphoto2 gphoto2_port jpeg m pango-1.0 pangocairo-1.0
|
||||
WANTLIB += pangoft2-1.0 pixman-1 png pthread tiff usb z
|
||||
|
||||
MODULES= devel/gettext
|
||||
LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
|
||||
|
25
graphics/sane-frontends/patches/patch-lib_getopt_c
Normal file
25
graphics/sane-frontends/patches/patch-lib_getopt_c
Normal file
@ -0,0 +1,25 @@
|
||||
$OpenBSD: patch-lib_getopt_c,v 1.1 2009/02/14 10:05:21 jasper Exp $
|
||||
|
||||
Fix potential 64-bit issues.
|
||||
|
||||
--- lib/getopt.c.orig Sat Feb 14 10:56:04 2009
|
||||
+++ lib/getopt.c Sat Feb 14 10:59:32 2009
|
||||
@@ -86,6 +86,18 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
+#ifdef HAVE_STRING_H
|
||||
+# include <string.h>
|
||||
+#endif
|
||||
+
|
||||
+#ifdef HAVE_SYS_TYPES_H
|
||||
+# include <sys/types.h>
|
||||
+#endif
|
||||
+
|
||||
+#ifdef HAVE_UNISTD_H
|
||||
+# include <unistd.h>
|
||||
+#endif
|
||||
+
|
||||
/* This version of `getopt' appears to the caller like standard Unix `getopt'
|
||||
but it behaves differently for the user, since it allows the user
|
||||
to intersperse the options with the other arguments.
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-src_xscanimage_c,v 1.1.1.1 2005/11/03 15:30:12 alek Exp $
|
||||
--- src/xscanimage.c.orig Tue Oct 11 12:22:56 2005
|
||||
+++ src/xscanimage.c Tue Oct 11 12:23:30 2005
|
||||
@@ -1284,7 +1284,7 @@ scan_dialog (GtkWidget * widget, gpointe
|
||||
$OpenBSD: patch-src_xscanimage_c,v 1.2 2009/02/14 10:05:21 jasper Exp $
|
||||
--- src/xscanimage.c.orig Sat Apr 16 15:12:07 2005
|
||||
+++ src/xscanimage.c Sat Feb 14 10:48:06 2009
|
||||
@@ -1284,7 +1284,7 @@ scan_dialog (GtkWidget * widget, gpointer call_data)
|
||||
{ /* We are running in standalone mode */
|
||||
/* test for pnm formats */
|
||||
strncpy (testfilename, preferences.filename, sizeof (testfilename));
|
||||
|
@ -1,7 +1,7 @@
|
||||
@comment $OpenBSD: PLIST,v 1.1.1.1 2005/11/03 15:30:12 alek Exp $
|
||||
bin/scanadf
|
||||
bin/xcam
|
||||
bin/xscanimage
|
||||
@comment $OpenBSD: PLIST,v 1.2 2009/02/14 10:05:21 jasper Exp $
|
||||
@bin bin/scanadf
|
||||
@bin bin/xcam
|
||||
@bin bin/xscanimage
|
||||
@man man/man1/scanadf.1
|
||||
@man man/man1/xcam.1
|
||||
@man man/man1/xscanimage.1
|
||||
|
Loading…
Reference in New Issue
Block a user