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

- switch to gtk+2

Browse Source 
- remove maintainer per his request

ok ajacoutot@ aaaaaages ago.
This commit is contained in:
jasper 2010-03-20 16:53:53 +00:00
parent fc2cd23f56
commit 25851e43cc
7 changed files with 85 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
security/otpcalc/Makefile
View File

@ -1,24 +1,27 @@
# $OpenBSD: Makefile,v 1.7 2009/08/10 06:34:29 kili Exp $
# $OpenBSD: Makefile,v 1.8 2010/03/20 16:53:53 jasper Exp $
COMMENT= OTP and S/Key calculator for X
DISTNAME= otpCalc-0.97
PKGNAME= ${DISTNAME}p1
PKGNAME= ${DISTNAME}p2
CATEGORIES= security
HOMEPAGE= http://original.killa.net/infosec/otpCalc/
MAINTAINER= Alexandre Anriot <aanriot@openbsd.org>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
WANTLIB= X11 Xext Xi c crypto m glib gmodule pthread-stubs xcb
MASTER_SITES= ${HOMEPAGE}
WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo crypto expat
WANTLIB += fontconfig freetype gio-2.0 glib-2.0 glitz gmodule-2.0
WANTLIB += gobject-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pixman-1 png pthread-stubs xcb z
CONFIGURE_STYLE=gnu dest
MODULES= devel/gettext
@ -26,7 +29,8 @@ MODULES= devel/gettext
USE_X11= Yes
USE_GMAKE= Yes
ALL_TARGET= otpCalc otpCalc.1
LIB_DEPENDS= gtk.>=2,gdk.>=2::x11/gtk+
LIB_DEPENDS= gdk_pixbuf-2.0,gdk-x11-2.0,gtk-x11-2.0::x11/gtk+2
NO_REGRESS= Yes

10
security/otpcalc/patches/patch-Makefile_in
View File

@ -1,4 +1,8 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2005/09/04 20:07:37 aanriot Exp $
$OpenBSD: patch-Makefile_in,v 1.2 2010/03/20 16:53:53 jasper Exp $
- Port to GTK+2. From Gentoo.
- set CFLAGS and LIBS correctly.
--- Makefile.in.orig Sun Aug 7 18:44:33 2005
+++ Makefile.in Sun Aug 7 18:46:01 2005
@@ -3,8 +3,8 @@ VER = 0.97
@ -7,8 +11,8 @@ $OpenBSD: patch-Makefile_in,v 1.1.1.1 2005/09/04 20:07:37 aanriot Exp $
DEFS = -DVERSION=\"$(VER)\" @DEFS@
-CFLAGS = -s -O3 -Wall -pipe `gtk-config --cflags`
-LIBS = `gtk-config --libs` @LIBS@
+CFLAGS += `gtk-config --cflags`
+LIBS += `gtk-config --libs` @LIBS@
+CFLAGS += `pkg-config --cflags gtk+-2.0`
+LIBS += `pkg-config --libs gtk+-2.0` @LIBS@
prefix = @prefix@
exec_prefix = @exec_prefix@

30
security/otpcalc/patches/patch-callbacks_c Normal file
View File

@ -0,0 +1,30 @@
$OpenBSD: patch-callbacks_c,v 1.1 2010/03/20 16:53:53 jasper Exp $
Port to GTK+2. From Gentoo.
--- callbacks.c.orig Fri Jan 29 15:42:32 2010
+++ callbacks.c Fri Jan 29 15:43:03 2010
@@ -236,7 +236,7 @@ void sethash(unsigned short new)
}
-void focus(GtkWidget *widget, gpointer data)
+gboolean focus(GtkWidget *widget, GdkEvent *event, gpointer data)
{
static GdkAtom targets;
@@ -244,12 +244,12 @@ void focus(GtkWidget *widget, gpointer data)
if (!autopaste)
- return;
+ return FALSE;
targets = gdk_atom_intern("STRING", FALSE);
gtk_selection_convert(widget, GDK_SELECTION_PRIMARY, targets,
GDK_CURRENT_TIME);
-
+ return FALSE;
}

12
security/otpcalc/patches/patch-crypto_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-crypto_c,v 1.1 2005/09/08 05:05:16 pvalchev Exp $
--- crypto.c.orig Wed Sep 7 18:22:23 2005
+++ crypto.c Wed Sep 7 18:22:58 2005
$OpenBSD: patch-crypto_c,v 1.2 2010/03/20 16:53:53 jasper Exp $
--- crypto.c.orig Tue Jun 26 10:22:52 2001
+++ crypto.c Fri Jan 29 15:42:06 2010
@@ -60,7 +60,7 @@
* bits.
*/
@ -10,7 +10,7 @@ $OpenBSD: patch-crypto_c,v 1.1 2005/09/08 05:05:16 pvalchev Exp $
{
#ifndef HAVE_MD4
@@ -92,7 +92,7 @@ void md4lite(char *message, unsigned int
@@ -92,7 +92,7 @@ void md4lite(char *message, unsigned int len)
* bits.
*/
@ -19,7 +19,7 @@ $OpenBSD: patch-crypto_c,v 1.1 2005/09/08 05:05:16 pvalchev Exp $
{
#ifndef HAVE_MD5
@@ -124,7 +124,7 @@ void md5lite(char *message, unsigned int
@@ -124,7 +124,7 @@ void md5lite(char *message, unsigned int len)
* into 64 bits.
*/
@ -28,7 +28,7 @@ $OpenBSD: patch-crypto_c,v 1.1 2005/09/08 05:05:16 pvalchev Exp $
{
#ifndef HAVE_RMD160
@@ -175,7 +175,7 @@ void rmd160lite(char *message, unsigned
@@ -175,7 +175,7 @@ void rmd160lite(char *message, unsigned int len)
* into 64 bits.
*/

15
security/otpcalc/patches/patch-gui_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-gui_c,v 1.1 2010/03/20 16:53:53 jasper Exp $
Port to GTK+2. From Gentoo.
--- gui.c.orig Fri Jan 29 15:43:23 2010
+++ gui.c Fri Jan 29 15:43:40 2010
@@ -147,7 +147,7 @@ int main(int argc, char *argv[])
/* Setup the menu bar... */
mb_top = gtk_menu_bar_new();
- gtk_menu_bar_set_shadow_type(GTK_MENU_BAR(mb_top), GTK_SHADOW_NONE);
+ /*gtk_menu_bar_set_shadow_type(GTK_MENU_BAR(mb_top), GTK_SHADOW_NONE);*/
gtk_table_attach(GTK_TABLE(ta_top), mb_top, 0, 3, 0, 1,
(GtkAttachOptions)(GTK_FILL),
(GtkAttachOptions)(0), 0, 0);

15
security/otpcalc/patches/patch-utility_c Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-utility_c,v 1.1 2010/03/20 16:53:53 jasper Exp $
Port to GTK+2. From Gentoo.
--- utility.c.orig Fri Jan 29 15:43:48 2010
+++ utility.c Fri Jan 29 15:44:00 2010
@@ -422,7 +422,7 @@ unsigned char *sixwords(unsigned char *message, char *
words[extract(message, 33, 11)],
words[extract(message, 44, 11)],
words[extract(message, 55, 11)],
- (newline == 1) ? "\n" : NULL);
+ (newline == 1) ? "\n" : "");
return response;

4
security/otpcalc/pkg/PLIST
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2005/09/04 20:07:37 aanriot Exp $
bin/otpCalc
@comment $OpenBSD: PLIST,v 1.2 2010/03/20 16:53:53 jasper Exp $
@bin bin/otpCalc
@man man/man1/otpCalc.1