Index: head/security/gringotts/Makefile =================================================================== --- head/security/gringotts/Makefile (revision 566735) +++ head/security/gringotts/Makefile (revision 566736) @@ -1,45 +1,44 @@ # Created by: Anders Nordby # $FreeBSD$ PORTNAME= gringotts PORTVERSION= 1.2.10 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= security MASTER_SITES= BERLIOS MAINTAINER= ports@FreeBSD.org COMMENT= GTK application to securely store sensitive data LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_13= ld: error: duplicate symbol: clip_xpm -BROKEN_FreeBSD_14= ld: error: duplicate symbol: clip_xpm - LIB_DEPENDS= libpopt.so:devel/popt \ - libgringotts.so:security/libgringotts + libgringotts.so:security/libgringotts \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 USES= gettext gnome localbase pkgconfig -USE_GNOME= gtk20 +USE_GNOME= cairo gdkpixbuf2 gtk20 GNU_CONFIGURE= yes OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e \ '/^install-data-am:/s|install-DsktpDATA|| ; \ /^install-data-am:/s|install-docDATA|| ; \ s|@md5sum|@md5|' ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e \ '/^install-exec-am:/s|install-exec-local||' ${WRKSRC}/src/Makefile.in post-install: ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for file in AUTHORS BUGS ChangeLog FAQ NEWS README TODO ${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR} .endfor .include Index: head/security/gringotts/files/patch-src_grg__attachs.h =================================================================== --- head/security/gringotts/files/patch-src_grg__attachs.h (nonexistent) +++ head/security/gringotts/files/patch-src_grg__attachs.h (revision 566736) @@ -0,0 +1,11 @@ +--- src/grg_attachs.h.orig 2008-01-04 13:08:44 UTC ++++ src/grg_attachs.h +@@ -24,7 +24,7 @@ + + #include + +-gint current_attach_ID; ++extern gint current_attach_ID; + + gint grg_attach_file (gchar * path, GtkWidget * parent); + void grg_remove_attachment (void); Property changes on: head/security/gringotts/files/patch-src_grg__attachs.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/gringotts/files/patch-src_grg__entries.h =================================================================== --- head/security/gringotts/files/patch-src_grg__entries.h (nonexistent) +++ head/security/gringotts/files/patch-src_grg__entries.h (revision 566736) @@ -0,0 +1,11 @@ +--- src/grg_entries.h.orig 2008-01-04 13:08:43 UTC ++++ src/grg_entries.h +@@ -24,7 +24,7 @@ + + /* current element. */ + /* MUST BE USED ONLY BY grg_attachs.h !!!! */ +-GList *current; ++extern GList *current; + + /* Appends a new entry to the list */ + void grg_entries_append (void); Property changes on: head/security/gringotts/files/patch-src_grg__entries.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/gringotts/files/patch-src_grg__menus.c =================================================================== --- head/security/gringotts/files/patch-src_grg__menus.c (nonexistent) +++ head/security/gringotts/files/patch-src_grg__menus.c (revision 566736) @@ -0,0 +1,15 @@ +--- src/grg_menus.c.orig 2008-01-04 13:08:44 UTC ++++ src/grg_menus.c +@@ -31,6 +31,12 @@ + + #include + ++GtkWidget *bnew, *bopen, *bsave, *bsas, *brev, *bclose, *bquit; ++GtkWidget *badd, *brem, *bcut, *bcop, *bpaste, *bfind, *bfinda, *bpwd, *bpref; ++GtkWidget *bmfirst, *bmback, *bmfor, *bmlast, *bmind; ++GtkWidget *bwipe; ++GtkWidget *babo; ++ + #define NEW_MENU_ITEM(var, text, cb, data, parent, img, key, mod) \ + var = gtk_image_menu_item_new_with_mnemonic(text); \ + gtk_menu_shell_append (GTK_MENU_SHELL (parent), var); \ Property changes on: head/security/gringotts/files/patch-src_grg__menus.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/gringotts/files/patch-src_grg__menus.h =================================================================== --- head/security/gringotts/files/patch-src_grg__menus.h (nonexistent) +++ head/security/gringotts/files/patch-src_grg__menus.h (revision 566736) @@ -0,0 +1,27 @@ +--- src/grg_menus.h.orig 2008-01-04 13:08:44 UTC ++++ src/grg_menus.h +@@ -25,19 +25,19 @@ + #include + + /* menu File */ +-GtkWidget *bnew, *bopen, *bsave, *bsas, *brev, *bclose, *bquit; ++extern GtkWidget *bnew, *bopen, *bsave, *bsas, *brev, *bclose, *bquit; + + /* menu Edit */ +-GtkWidget *badd, *brem, *bcut, *bcop, *bpaste, *bfind, *bfinda, *bpwd, *bpref; ++extern GtkWidget *badd, *brem, *bcut, *bcop, *bpaste, *bfind, *bfinda, *bpwd, *bpref; + + /* menu Navigation */ +-GtkWidget *bmfirst, *bmback, *bmfor, *bmlast, *bmind; ++extern GtkWidget *bmfirst, *bmback, *bmfor, *bmlast, *bmind; + + /* menu Tools */ +-GtkWidget *bwipe; ++extern GtkWidget *bwipe; + + /* menu Help */ +-GtkWidget *babo; ++extern GtkWidget *babo; + + /*Makes a menubar, within a handlebox, and returns the GtkWidget */ + GtkWidget *grg_menu_create (GtkWidget * window); Property changes on: head/security/gringotts/files/patch-src_grg__menus.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/gringotts/files/patch-src_grg__pix.h =================================================================== --- head/security/gringotts/files/patch-src_grg__pix.h (nonexistent) +++ head/security/gringotts/files/patch-src_grg__pix.h (revision 566736) @@ -0,0 +1,23 @@ +--- src/grg_pix.h.orig 2008-01-04 13:08:43 UTC ++++ src/grg_pix.h +@@ -22,13 +22,13 @@ + #ifndef GRG_PIX_H + #define GRG_PIX_H + +-const char *red_xpm[58]; +-const char *yellow_xpm[58]; +-const char *green_xpm[58]; +-const char *optimal_xpm[94]; ++extern const char *red_xpm[58]; ++extern const char *yellow_xpm[58]; ++extern const char *green_xpm[58]; ++extern const char *optimal_xpm[94]; + +-const char *splash_xpm[180]; ++extern const char *splash_xpm[180]; + +-const char *wait_xpm[82]; +-const char *clip_xpm[17]; ++extern const char *wait_xpm[82]; ++extern const char *clip_xpm[17]; + #endif Property changes on: head/security/gringotts/files/patch-src_grg__pix.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/gringotts/files/patch-src_grg__prefs.h =================================================================== --- head/security/gringotts/files/patch-src_grg__prefs.h (nonexistent) +++ head/security/gringotts/files/patch-src_grg__prefs.h (revision 566736) @@ -0,0 +1,27 @@ +--- src/grg_prefs.h.orig 2008-09-01 16:06:36 UTC ++++ src/grg_prefs.h +@@ -24,15 +24,15 @@ + + #include + +-gboolean grg_prefs_warn4overwrite; +-gboolean grg_prefs_bak_files; +-gboolean grg_prefs_splash; +-gboolean grg_prefs_tray; +-gboolean grg_prefs_clip_clear_on_close; +-gboolean grg_prefs_clip_clear_on_quit; +-gint grg_prefs_xpire; +-gint grg_prefs_wipe_passes; +-gint grg_prefs_mainwin_width, grg_prefs_mainwin_height; ++extern gboolean grg_prefs_warn4overwrite; ++extern gboolean grg_prefs_bak_files; ++extern gboolean grg_prefs_splash; ++extern gboolean grg_prefs_tray; ++extern gboolean grg_prefs_clip_clear_on_close; ++extern gboolean grg_prefs_clip_clear_on_quit; ++extern gint grg_prefs_xpire; ++extern gint grg_prefs_wipe_passes; ++extern gint grg_prefs_mainwin_width, grg_prefs_mainwin_height; + + gchar *get_pref_file (void); + void set_pref_file (const gchar * newval); Property changes on: head/security/gringotts/files/patch-src_grg__prefs.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/gringotts/files/patch-src_grg__recent__dox.h =================================================================== --- head/security/gringotts/files/patch-src_grg__recent__dox.h (nonexistent) +++ head/security/gringotts/files/patch-src_grg__recent__dox.h (revision 566736) @@ -0,0 +1,11 @@ +--- src/grg_recent_dox.h.orig 2008-01-04 13:08:43 UTC ++++ src/grg_recent_dox.h +@@ -24,7 +24,7 @@ + + #define GRG_RECENT_LIMIT 6 + +-GSList *grg_recent_dox; ++extern GSList *grg_recent_dox; + + void grg_recent_dox_init (void); + void grg_recent_dox_deinit (void); Property changes on: head/security/gringotts/files/patch-src_grg__recent__dox.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/gringotts/files/patch-src_grg__widgets.h =================================================================== --- head/security/gringotts/files/patch-src_grg__widgets.h (nonexistent) +++ head/security/gringotts/files/patch-src_grg__widgets.h (revision 566736) @@ -0,0 +1,11 @@ +--- src/grg_widgets.h.orig 2008-01-04 13:08:43 UTC ++++ src/grg_widgets.h +@@ -25,7 +25,7 @@ + #include "grg_defs.h" + #include + +-gboolean mapIsUTF; ++extern gboolean mapIsUTF; + + /* Shows and manages a dialog that asks for a string. */ + gchar *grg_input_dialog (gchar * title, gchar * qtext, gchar * preset, Property changes on: head/security/gringotts/files/patch-src_grg__widgets.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/security/gringotts/files/patch-src_gringotts.h =================================================================== --- head/security/gringotts/files/patch-src_gringotts.h (nonexistent) +++ head/security/gringotts/files/patch-src_gringotts.h (revision 566736) @@ -0,0 +1,16 @@ +--- src/gringotts.h.orig 2008-09-01 16:20:06 UTC ++++ src/gringotts.h +@@ -24,10 +24,10 @@ + + #include "grg_defs.h" + +-GList *garbage; ++extern GList *garbage; + +-GRG_CTX gctx; +-glong pwdbirth; ++extern GRG_CTX gctx; ++extern glong pwdbirth; + + /*callbacks for menu items */ + Property changes on: head/security/gringotts/files/patch-src_gringotts.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property