Date: Sat, 4 Feb 2017 09:01:28 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r433288 - in head/net-p2p/gnunet-gtk: . files Message-ID: <201702040901.v1491Sf8082856@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Sat Feb 4 09:01:28 2017 New Revision: 433288 URL: https://svnweb.freebsd.org/changeset/ports/433288 Log: - Fix LICENSE - Add LICENSE_FILE - Switch to options helpers - Regenerate patches Added: head/net-p2p/gnunet-gtk/files/patch-src_main_gnunet-gtk.c - copied, changed from r433287, head/net-p2p/gnunet-gtk/files/patch-src__main__gnunet-gtp.c Deleted: head/net-p2p/gnunet-gtk/files/patch-src__main__gnunet-gtp.c Modified: head/net-p2p/gnunet-gtk/Makefile head/net-p2p/gnunet-gtk/files/patch-configure head/net-p2p/gnunet-gtk/files/patch-pixmaps__icon-theme-installer head/net-p2p/gnunet-gtk/files/patch-src__lib__eventloop.c head/net-p2p/gnunet-gtk/files/patch-src__setup__gnunet-setup-transport.c Modified: head/net-p2p/gnunet-gtk/Makefile ============================================================================== --- head/net-p2p/gnunet-gtk/Makefile Sat Feb 4 07:57:42 2017 (r433287) +++ head/net-p2p/gnunet-gtk/Makefile Sat Feb 4 09:01:28 2017 (r433288) @@ -10,7 +10,8 @@ MASTER_SITES= GNU/gnunet MAINTAINER= ports@FreeBSD.org COMMENT= GTK interface to GNUnet -LICENSE= GPLv3 +LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgladeui-1.so:devel/glade3 \ libltdl.so:devel/libltdl \ @@ -30,7 +31,7 @@ INSTALL_TARGET= install-strip USE_LDCONFIG= yes INSTALLS_ICONS= yes -OPTIONS_DEFINE= DOCS +OPTIONS_DEFINE= DOCS post-patch: @${REINPLACE_CMD} -e \ @@ -40,11 +41,10 @@ post-patch: 's|"$${mkinstalldirs}"|"$${MKDIR_P}"|' \ ${WRKSRC}/pixmaps/Makefile.in -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for i in AUTHORS ChangeLog NEWS README - (cd ${WRKSRC} && ${INSTALL_DATA} ${i} \ - ${STAGEDIR}${DOCSDIR}) + ${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR} .endfor .include <bsd.port.mk> Modified: head/net-p2p/gnunet-gtk/files/patch-configure ============================================================================== --- head/net-p2p/gnunet-gtk/files/patch-configure Sat Feb 4 07:57:42 2017 (r433287) +++ head/net-p2p/gnunet-gtk/files/patch-configure Sat Feb 4 09:01:28 2017 (r433288) @@ -1,6 +1,6 @@ ---- configure.orig +--- configure.orig 2014-04-08 09:07:45 UTC +++ configure -@@ -14716,17 +14716,14 @@ +@@ -14716,17 +14716,14 @@ if test "${with_gtk_version+set}" = set; withval=$with_gtk_version; { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_gtk_version" >&5 $as_echo "$with_gtk_version" >&6; } case $with_gtk_version in Modified: head/net-p2p/gnunet-gtk/files/patch-pixmaps__icon-theme-installer ============================================================================== --- head/net-p2p/gnunet-gtk/files/patch-pixmaps__icon-theme-installer Sat Feb 4 07:57:42 2017 (r433287) +++ head/net-p2p/gnunet-gtk/files/patch-pixmaps__icon-theme-installer Sat Feb 4 09:01:28 2017 (r433288) @@ -1,12 +1,12 @@ ---- pixmaps/icon-theme-installer.orig 2010-06-17 03:36:53.000000000 -0400 -+++ pixmaps/icon-theme-installer 2012-05-31 17:42:11.000000000 -0400 +--- pixmaps/icon-theme-installer.orig 2014-01-07 10:40:01 UTC ++++ pixmaps/icon-theme-installer @@ -1,4 +1,4 @@ --#!/bin/bash +-#!/usr/bin/env bash +#!/bin/sh # icon-theme-installer # Copyright (C) 2006 Novell, Inc. -@@ -112,7 +112,7 @@ +@@ -112,7 +112,7 @@ pass -m \$(mkinstalldirs)" exit 1 fi @@ -15,7 +15,7 @@ echo "Cannot find '$INSTALL_DATA_EXEC'; You probably want to pass -x \$(INSTALL_DATA)" exit 1 -@@ -173,7 +173,7 @@ +@@ -173,7 +173,7 @@ $THEME_NAME icon theme" done if test "x$INSTALL" = "xyes"; then Modified: head/net-p2p/gnunet-gtk/files/patch-src__lib__eventloop.c ============================================================================== --- head/net-p2p/gnunet-gtk/files/patch-src__lib__eventloop.c Sat Feb 4 07:57:42 2017 (r433287) +++ head/net-p2p/gnunet-gtk/files/patch-src__lib__eventloop.c Sat Feb 4 09:01:28 2017 (r433288) @@ -1,6 +1,6 @@ ---- src/lib/eventloop.c.orig +--- src/lib/eventloop.c.orig 2014-02-13 15:26:55 UTC +++ src/lib/eventloop.c -@@ -181,7 +181,7 @@ +@@ -181,7 +181,7 @@ GtkWidget * GNUNET_GTK_plug_me (const char *env_name, GtkWidget *main_window) { Modified: head/net-p2p/gnunet-gtk/files/patch-src__setup__gnunet-setup-transport.c ============================================================================== --- head/net-p2p/gnunet-gtk/files/patch-src__setup__gnunet-setup-transport.c Sat Feb 4 07:57:42 2017 (r433287) +++ head/net-p2p/gnunet-gtk/files/patch-src__setup__gnunet-setup-transport.c Sat Feb 4 09:01:28 2017 (r433288) @@ -1,6 +1,6 @@ ---- src/setup/gnunet-setup-transport.c.orig +--- src/setup/gnunet-setup-transport.c.orig 2014-01-07 10:40:01 UTC +++ src/setup/gnunet-setup-transport.c -@@ -349,8 +349,7 @@ +@@ -349,8 +349,7 @@ nipo (void *cls, const char *name, int i if ( (sizeof (struct sockaddr_in6) == addrlen) && (0 != memcmp (&in6addr_loopback, &((struct sockaddr_in6 *)addr)->sin6_addr, Copied and modified: head/net-p2p/gnunet-gtk/files/patch-src_main_gnunet-gtk.c (from r433287, head/net-p2p/gnunet-gtk/files/patch-src__main__gnunet-gtp.c) ============================================================================== --- head/net-p2p/gnunet-gtk/files/patch-src__main__gnunet-gtp.c Sat Feb 4 07:57:42 2017 (r433287, copy source) +++ head/net-p2p/gnunet-gtk/files/patch-src_main_gnunet-gtk.c Sat Feb 4 09:01:28 2017 (r433288) @@ -1,6 +1,6 @@ ---- src/main/gnunet-gtk.c.orig +--- src/main/gnunet-gtk.c.orig 2014-04-08 07:44:56 UTC +++ src/main/gnunet-gtk.c -@@ -177,7 +177,7 @@ +@@ -177,7 +177,7 @@ gnunet_gtk_quit_cb (GObject * object, } @@ -9,7 +9,7 @@ /** * Start the child process for the plug. * -@@ -308,7 +308,7 @@ +@@ -308,7 +308,7 @@ run (void *cls, main_window = GTK_WIDGET (get_object ("gnunet_gtk_window")); GNUNET_SCHEDULER_add_delayed (GNUNET_TIME_UNIT_FOREVER_REL, &cleanup_task, NULL);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702040901.v1491Sf8082856>