From owner-svn-ports-all@FreeBSD.ORG Mon Oct 13 10:14:58 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1618E77F; Mon, 13 Oct 2014 10:14:58 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id EAAC8D8D; Mon, 13 Oct 2014 10:14:57 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9DAEv4S054250; Mon, 13 Oct 2014 10:14:57 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9DAEt77054239; Mon, 13 Oct 2014 10:14:55 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201410131014.s9DAEt77054239@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Mon, 13 Oct 2014 10:14:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r370761 - in head/x11-clocks/asclock-gtk: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Oct 2014 10:14:58 -0000 Author: madpilot Date: Mon Oct 13 10:14:55 2014 New Revision: 370761 URL: https://svnweb.freebsd.org/changeset/ports/370761 QAT: https://qat.redports.org/buildarchive/r370761/ Log: - Convert theme selection menu to use OPTIONS framework - Fix build of non default themes with clang - Remove unecessary RM PR: 193868 Submitted by: me Approved by: maintainer timeout Added: head/x11-clocks/asclock-gtk/files/patch-themes__Freeamp__beats.xpm (contents, props changed) head/x11-clocks/asclock-gtk/files/patch-themes__Freeamp__hour.xpm (contents, props changed) head/x11-clocks/asclock-gtk/files/patch-themes__Freeamp__minute.xpm (contents, props changed) head/x11-clocks/asclock-gtk/files/patch-themes__Freeamp__second.xpm (contents, props changed) head/x11-clocks/asclock-gtk/files/patch-themes__analog__led.xpm (contents, props changed) head/x11-clocks/asclock-gtk/files/patch-themes__beats__led.xpm (contents, props changed) head/x11-clocks/asclock-gtk/files/patch-themes__shaped__led.xpm (contents, props changed) Modified: head/x11-clocks/asclock-gtk/Makefile Modified: head/x11-clocks/asclock-gtk/Makefile ============================================================================== --- head/x11-clocks/asclock-gtk/Makefile Mon Oct 13 09:33:07 2014 (r370760) +++ head/x11-clocks/asclock-gtk/Makefile Mon Oct 13 10:14:55 2014 (r370761) @@ -21,14 +21,25 @@ HAS_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes -post-patch: - ${FIND} ${WRKSRC} -name '*.orig' | ${XARGS} ${RM} +OPTIONS_SINGLE= DEFTHEME +OPTIONS_SINGLE_DEFTHEME=FREEAMP_THEME NEWSTONE_THEME ORB_THEME \ + STONE_THEME ANALOG_THEME BEATS_THEME CLASSIC_THEME \ + PENGUIN_THEME SHAPED_THEME +OPTIONS_DEFAULT= CLASSIC_THEME + +FREEAMP_THEME_DESC= Freeamp theme +NEWSTONE_THEME_DESC= Newstone theme +ORB_THEME_DESC= Orb theme +STONE_THEME_DESC= Stone theme +ANALOG_THEME_DESC= Analog theme +BEATS_THEME_DESC= Beats theme +CLASSIC_THEME_DESC= Classic theme +PENGUIN_THEME_DESC= Penguin theme +SHAPED_THEME_DESC= Shaped theme -.if defined(BATCH) do-configure: @(cd ${WRKSRC}; \ ${RM} -rf default_theme; \ - ${LN} -s themes/classic default_theme) -.endif + ${LN} -s themes/${PORT_OPTIONS:M*_THEME:S/_THEME//:tl} default_theme) .include Added: head/x11-clocks/asclock-gtk/files/patch-themes__Freeamp__beats.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/asclock-gtk/files/patch-themes__Freeamp__beats.xpm Mon Oct 13 10:14:55 2014 (r370761) @@ -0,0 +1,6 @@ +--- themes/Freeamp/beats.xpm.orig 1999-03-26 07:06:51 UTC ++++ themes/Freeamp/beats.xpm +@@ -1,2 +1,2 @@ +-static char *beats_xpm[] = { NULL }; ++char *beats_xpm[] = { NULL }; + Added: head/x11-clocks/asclock-gtk/files/patch-themes__Freeamp__hour.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/asclock-gtk/files/patch-themes__Freeamp__hour.xpm Mon Oct 13 10:14:55 2014 (r370761) @@ -0,0 +1,9 @@ +--- themes/Freeamp/hour.xpm.orig 1999-03-26 07:06:57 UTC ++++ themes/Freeamp/hour.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * hour_xpm[] = { ++char * hour_xpm[] = { + "5 11 3 1", + " c None ", + ". c #596b5e", Added: head/x11-clocks/asclock-gtk/files/patch-themes__Freeamp__minute.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/asclock-gtk/files/patch-themes__Freeamp__minute.xpm Mon Oct 13 10:14:55 2014 (r370761) @@ -0,0 +1,9 @@ +--- themes/Freeamp/minute.xpm.orig 1999-03-26 07:06:58 UTC ++++ themes/Freeamp/minute.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * minute_xpm[] = { ++char * minute_xpm[] = { + "5 15 3 1", + " c None ", + "+ c #596b5e", Added: head/x11-clocks/asclock-gtk/files/patch-themes__Freeamp__second.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/asclock-gtk/files/patch-themes__Freeamp__second.xpm Mon Oct 13 10:14:55 2014 (r370761) @@ -0,0 +1,9 @@ +--- themes/Freeamp/second.xpm.orig 1999-03-26 07:07:00 UTC ++++ themes/Freeamp/second.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-static char * second_xpm[] = { ++char * second_xpm[] = { + "5 20 2 1", + " c None ", + "+ c #0C110D", Added: head/x11-clocks/asclock-gtk/files/patch-themes__analog__led.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/asclock-gtk/files/patch-themes__analog__led.xpm Mon Oct 13 10:14:55 2014 (r370761) @@ -0,0 +1,5 @@ +--- themes/analog/led.xpm.orig 2014-09-22 20:38:11 UTC ++++ themes/analog/led.xpm +@@ -1 +1 @@ +-char *led_xpm[]; ++static char *led_xpm[]; Added: head/x11-clocks/asclock-gtk/files/patch-themes__beats__led.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/asclock-gtk/files/patch-themes__beats__led.xpm Mon Oct 13 10:14:55 2014 (r370761) @@ -0,0 +1,5 @@ +--- themes/beats/led.xpm.orig 1999-02-20 22:54:43 UTC ++++ themes/beats/led.xpm +@@ -1 +1 @@ +-char *led_xpm[]; ++static char *led_xpm[]; Added: head/x11-clocks/asclock-gtk/files/patch-themes__shaped__led.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-clocks/asclock-gtk/files/patch-themes__shaped__led.xpm Mon Oct 13 10:14:55 2014 (r370761) @@ -0,0 +1,9 @@ +--- themes/shaped/led.xpm.orig 1999-02-20 08:49:20 UTC ++++ themes/shaped/led.xpm +@@ -1,5 +1,5 @@ + /* XPM */ +-char * led_xpm[] = { ++static char * led_xpm[] = { + "135 11 3 1", + " c #282828", + "O c #00df00",