Attachment 147592 Details for Bug 193868 – asclock-gtk.diff

[patch] asclock-gtk.diff

asclock-gtk.diff (text/plain), 10.24 KB, created by Guido Falsi on 2014-09-23 11:00:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Guido Falsi

Created: 2014-09-23 11:00:31 UTC

Size: 10.24 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 369029)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	asclock-gtk
> PORTVERSION=	2.1.10
>-PORTREVISION=	8
>+PORTREVISION=	9
> CATEGORIES=	x11-clocks afterstep windowmaker
> MASTER_SITES=	${MASTER_SITE_LOCAL}
> MASTER_SITE_SUBDIR=	kuriyama
>@@ -13,7 +13,6 @@
> 
> WRKSRC=		${WRKDIR}/${PORTNAME}
> ALL_TARGET=	asclock
>-MAKE_ARGS=	PREFIX=${STAGEDIR}${PREFIX}
> 
> USE_XORG=	x11 xt
> USE_GNOME=	gtk12
>@@ -21,15 +20,26 @@
> 
> 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
> 
>-.if defined(BATCH)
>+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
>+
> 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)
> 
> post-install:
> 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/asclock
>Index: files/patch-Makefile
>===================================================================
>--- files/patch-Makefile	(revision 369029)
>+++ files/patch-Makefile	(working copy)
>@@ -1,5 +1,5 @@
>---- Makefile.orig	Fri Mar 26 16:08:33 1999
>-+++ Makefile	Sat Jul  1 17:43:08 2000
>+--- Makefile.orig	1999-03-26 07:08:33 UTC
>++++ Makefile
> @@ -1,19 +1,20 @@
>  CP=cp -f
>  MKDIR=mkdir -p
>@@ -48,24 +48,24 @@
> -	$(MKDIR) /usr/local/share/asclock/themes/shaped
> -	$(CP) themes/shaped/* /usr/local/share/asclock/themes/shaped
> -#	$(CP) -rf themes/* /usr/local/share/asclock/
>-+	${BSD_INSTALL_PROGRAM} asclock ${PREFIX}/bin
>-+	$(MKDIR) ${PREFIX}/share/asclock
>-+	$(MKDIR) ${PREFIX}/share/asclock/themes
>-+	$(MKDIR) ${PREFIX}/share/asclock/themes/Newstone
>-+	${BSD_INSTALL_DATA} themes/Newstone/* ${PREFIX}/share/asclock/themes/Newstone
>-+	$(MKDIR) ${PREFIX}/share/asclock/themes/Orb
>-+	${BSD_INSTALL_DATA} themes/Orb/* ${PREFIX}/share/asclock/themes/Orb
>-+	$(MKDIR) ${PREFIX}/share/asclock/themes/Stone
>-+	${BSD_INSTALL_DATA} themes/Stone/* ${PREFIX}/share/asclock/themes/Stone
>-+	$(MKDIR) ${PREFIX}/share/asclock/themes/analog
>-+	${BSD_INSTALL_DATA} themes/analog/* ${PREFIX}/share/asclock/themes/analog
>-+	$(MKDIR) ${PREFIX}/share/asclock/themes/beats
>-+	${BSD_INSTALL_DATA} themes/beats/* ${PREFIX}/share/asclock/themes/beats
>-+	$(MKDIR) ${PREFIX}/share/asclock/themes/classic
>-+	${BSD_INSTALL_DATA} themes/classic/* ${PREFIX}/share/asclock/themes/classic
>-+	$(MKDIR) ${PREFIX}/share/asclock/themes/shaped
>-+	${BSD_INSTALL_DATA} themes/shaped/* ${PREFIX}/share/asclock/themes/shaped
>-+#	${BSD_INSTALL_DATA} -rf themes/* ${PREFIX}/share/asclock/
>++	${BSD_INSTALL_PROGRAM} asclock ${DESTDIR}${PREFIX}/bin
>++	$(MKDIR) ${DESTDIR}${PREFIX}/share/asclock
>++	$(MKDIR) ${DESTDIR}${PREFIX}/share/asclock/themes
>++	$(MKDIR) ${DESTDIR}${PREFIX}/share/asclock/themes/Newstone
>++	${BSD_INSTALL_DATA} themes/Newstone/* ${DESTDIR}${PREFIX}/share/asclock/themes/Newstone
>++	$(MKDIR) ${DESTDIR}${PREFIX}/share/asclock/themes/Orb
>++	${BSD_INSTALL_DATA} themes/Orb/* ${DESTDIR}${PREFIX}/share/asclock/themes/Orb
>++	$(MKDIR) ${DESTDIR}${PREFIX}/share/asclock/themes/Stone
>++	${BSD_INSTALL_DATA} themes/Stone/* ${DESTDIR}${PREFIX}/share/asclock/themes/Stone
>++	$(MKDIR) ${DESTDIR}${PREFIX}/share/asclock/themes/analog
>++	${BSD_INSTALL_DATA} themes/analog/* ${DESTDIR}${PREFIX}/share/asclock/themes/analog
>++	$(MKDIR) ${DESTDIR}${PREFIX}/share/asclock/themes/beats
>++	${BSD_INSTALL_DATA} themes/beats/* ${DESTDIR}${PREFIX}/share/asclock/themes/beats
>++	$(MKDIR) ${DESTDIR}${PREFIX}/share/asclock/themes/classic
>++	${BSD_INSTALL_DATA} themes/classic/* ${DESTDIR}${PREFIX}/share/asclock/themes/classic
>++	$(MKDIR) ${DESTDIR}${PREFIX}/share/asclock/themes/shaped
>++	${BSD_INSTALL_DATA} themes/shaped/* ${DESTDIR}${PREFIX}/share/asclock/themes/shaped
>++#	${BSD_INSTALL_DATA} -rf themes/* ${DESTDIR}${PREFIX}/share/asclock/
>  
>  clean: 
>  	rm -rf core *.o *~ .gtk .gnome asclock asclock_applet
>Index: files/patch-themes__Freeamp__beats.xpm
>===================================================================
>--- files/patch-themes__Freeamp__beats.xpm	(revision 0)
>+++ files/patch-themes__Freeamp__beats.xpm	(working copy)
>@@ -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 };
>+ 
>
>Property changes on: files/patch-themes__Freeamp__beats.xpm
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>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
>Index: files/patch-themes__Freeamp__hour.xpm
>===================================================================
>--- files/patch-themes__Freeamp__hour.xpm	(revision 0)
>+++ files/patch-themes__Freeamp__hour.xpm	(working copy)
>@@ -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",
>
>Property changes on: files/patch-themes__Freeamp__hour.xpm
>___________________________________________________________________
>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: files/patch-themes__Freeamp__minute.xpm
>===================================================================
>--- files/patch-themes__Freeamp__minute.xpm	(revision 0)
>+++ files/patch-themes__Freeamp__minute.xpm	(working copy)
>@@ -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",
>
>Property changes on: files/patch-themes__Freeamp__minute.xpm
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>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
>Index: files/patch-themes__Freeamp__second.xpm
>===================================================================
>--- files/patch-themes__Freeamp__second.xpm	(revision 0)
>+++ files/patch-themes__Freeamp__second.xpm	(working copy)
>@@ -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",
>
>Property changes on: files/patch-themes__Freeamp__second.xpm
>___________________________________________________________________
>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: files/patch-themes__analog__led.xpm
>===================================================================
>--- files/patch-themes__analog__led.xpm	(revision 0)
>+++ files/patch-themes__analog__led.xpm	(working copy)
>@@ -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[];
>
>Property changes on: files/patch-themes__analog__led.xpm
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>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
>Index: files/patch-themes__beats__led.xpm
>===================================================================
>--- files/patch-themes__beats__led.xpm	(revision 0)
>+++ files/patch-themes__beats__led.xpm	(working copy)
>@@ -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[];
>
>Property changes on: files/patch-themes__beats__led.xpm
>___________________________________________________________________
>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: files/patch-themes__shaped__led.xpm
>===================================================================
>--- files/patch-themes__shaped__led.xpm	(revision 0)
>+++ files/patch-themes__shaped__led.xpm	(working copy)
>@@ -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",
>
>Property changes on: files/patch-themes__shaped__led.xpm
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>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
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 369029)
>+++ pkg-plist	(working copy)
>@@ -72,12 +72,3 @@
> share/asclock/themes/shaped/month.xpm
> share/asclock/themes/shaped/second.xpm
> share/asclock/themes/shaped/weekday.xpm
>-@dirrm share/asclock/themes/Newstone
>-@dirrm share/asclock/themes/Orb
>-@dirrm share/asclock/themes/Stone
>-@dirrm share/asclock/themes/analog
>-@dirrm share/asclock/themes/beats
>-@dirrm share/asclock/themes/classic
>-@dirrm share/asclock/themes/shaped
>-@dirrm share/asclock/themes
>-@dirrm share/asclock

Actions: View | Diff

Attachments on bug 193868: 147592