Attachment 169219 Details for Bug 208724 – x11-clocks_eyeclock.diff

[patch] x11-clocks_eyeclock.diff

x11-clocks_eyeclock.diff (text/plain), 7.18 KB, created by tkato432 on 2016-04-11 18:39:36 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2016-04-11 18:39:36 UTC

Size: 7.18 KB

patch

obsolete

>diff -urN /usr/ports/x11-clocks/eyeclock/Makefile x11-clocks/eyeclock/Makefile
>--- /usr/ports/x11-clocks/eyeclock/Makefile	2015-11-09 22:26:03.015086000 +0900
>+++ x11-clocks/eyeclock/Makefile	2016-04-12 00:00:00.000000000 +0900
>@@ -3,37 +3,43 @@
> 
> PORTNAME=	eyeclock
> PORTVERSION=	2.0
>-PORTREVISION=	3
>+PORTREVISION=	4
> CATEGORIES=	x11-clocks
>-MASTER_SITES=	http://ftp.vector.co.jp/pack/unix/personal/tokei/
>+MASTER_SITES=	http://ftp.vector.co.jp/12/89/1347/
> DISTNAME=	eyeclk20
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Clock with eyes following the mouse pointer
> 
>-BROKEN=		unfetchable
>-
> WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
>-MAKE_ENV=	X11BASE=${LOCALBASE}
>-USE_XORG=	x11 xau xdmcp xpm xt ice
>+
> USES=		tar:tgz
>+USE_XORG=	x11 xau xdmcp xpm xt ice
>+MAKE_ENV=	X11BASE=${LOCALBASE}
>+
>+DESKTOP_ENTRIES="EyeClock" "" "" "eyeclock" "" ""
> 
> post-patch:
> 	@${REINPLACE_CMD} -e "s#gcc#${CC}#" ${WRKSRC}/Makefile
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/eyeclock ${STAGEDIR}${PREFIX}/bin/eyeclock
>-.for link in boyclock daemonclock girlclock henohenoclock margueriteclock \
>+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} eyeclock \
>+		${STAGEDIR}${PREFIX}/bin/eyeclock)
>+.for i in boyclock daemonclock girlclock henohenoclock margueriteclock \
> 	octopusclock punpunclock silicagelclock taroclock umeharaclock
>-	${LN} -sf eyeclock ${STAGEDIR}${PREFIX}/bin/${link}
>+	${LN} -sf eyeclock ${STAGEDIR}${PREFIX}/bin/${i}
> .endfor
>-	${INSTALL_MAN} ${WRKSRC}/eyeclock.man ${STAGEDIR}${MANPREFIX}/man/man1/eyeclock.1
>-	${INSTALL_DATA} ${WRKSRC}/EyeClock.daemon \
>-		${STAGEDIR}${PREFIX}/lib/X11/app-defaults/EyeClock
>+	(cd ${WRKSRC} && ${INSTALL_MAN} eyeclock.man \
>+		${STAGEDIR}${MANPREFIX}/man/man1/eyeclock.1)
>+	(cd ${WRKSRC} && ${INSTALL_DATA} EyeClock.daemon \
>+		${STAGEDIR}${PREFIX}/lib/X11/app-defaults/EyeClock)
> 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/EyeClock
>-.for file in CHANGE COPYRIGHT EyeClock.daemon EyeClock.normal EyeClock.penguin \
>-	Makefile OMAKE.jpn README.jpn xpm/*.xpm
>-	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${PREFIX}/lib/X11/EyeClock
>+.for i in CHANGE COPYRIGHT EyeClock.daemon EyeClock.normal \
>+	EyeClock.penguin Makefile OMAKE.jpn README.jpn
>+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
>+		${STAGEDIR}${PREFIX}/lib/X11/EyeClock)
> .endfor
>+	(cd ${WRKSRC}/xpm && ${INSTALL_DATA} *.xpm \
>+		${STAGEDIR}${PREFIX}/lib/X11/EyeClock)
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/x11-clocks/eyeclock/files/patch-Makefile x11-clocks/eyeclock/files/patch-Makefile
>--- /usr/ports/x11-clocks/eyeclock/files/patch-Makefile	2015-08-24 04:05:13.530769000 +0900
>+++ x11-clocks/eyeclock/files/patch-Makefile	2016-04-12 00:00:00.000000000 +0900
>@@ -1,5 +1,5 @@
>---- Makefile.orig	Sat Dec 25 03:18:57 1999
>-+++ Makefile	Sun Dec 26 16:33:49 1999
>+--- Makefile.orig	1999-12-25 09:18:57 UTC
>++++ Makefile
> @@ -15,8 +15,8 @@
>  ###############################################################################
>  
>@@ -11,7 +11,7 @@
>  BINDIR  = ${PREFIX}/bin
>  LIBDIR  = ${PREFIX}/lib/X11/EyeClock
>  RESDIR  = ${PREFIX}/lib/X11/app-defaults
>-@@ -26,15 +26,15 @@
>+@@ -26,15 +26,15 @@ VERSION = EyeClock-2.0
>  
>  # Choose a default face from below lines.
>  
>@@ -31,7 +31,58 @@
>  
>  # Choose icon pixmap from below lines.
>  
>-@@ -93,14 +93,15 @@
>+@@ -44,33 +44,33 @@ DEFAULT_ICON = DEFAULT_ICON_IS_NORMAL
>+ all :		eyeclock eyeclock.1.gz makeclock
>+ 
>+ eyeclock :	main.o Clock.o Hand.o Number.o Eye.o converter.o etc.o
>+-		gcc main.o Clock.o Hand.o Number.o Eye.o converter.o etc.o \
>++		cc main.o Clock.o Hand.o Number.o Eye.o converter.o etc.o \
>+ 			-o eyeclock \
>+ 			-L${X11BASE}/lib \
>+ 			-lm -lX11 -lXt -lXpm
>+ 
>+ main.o :	main.c Clock.h Hand.h Number.h Eye.h converter.h etc.h fallback_resources.h
>+-		gcc -c main.c -O -I${X11BASE}/include \
>++		cc -c main.c -O -I${X11BASE}/include \
>+ 		-DVERSION=\"${VERSION}\"
>+ 
>+ Clock.o : Clock.h ClockP.h Clock.c Hand.h Number.h Eye.h converter.h etc.h
>+-		gcc -c Clock.c -O -I${X11BASE}/include
>++		cc -c Clock.c -O -I${X11BASE}/include
>+ 
>+ Hand.o :	Hand.h HandP.h Hand.c converter.h etc.h
>+-		gcc -c Hand.c -O -I${X11BASE}/include
>++		cc -c Hand.c -O -I${X11BASE}/include
>+ 
>+ Number.o :	Number.h NumberP.h Number.c converter.h etc.h
>+-		gcc -c Number.c -O -I${X11BASE}/include
>++		cc -c Number.c -O -I${X11BASE}/include
>+ 
>+ Eye.o :		Eye.h EyeP.h Eye.c converter.h etc.h
>+-		gcc -c Eye.c -O -I${X11BASE}/include
>++		cc -c Eye.c -O -I${X11BASE}/include
>+ 
>+ converter.o :	converter.h converter.c etc.h
>+-		gcc -c converter.c -O -I${X11BASE}/include \
>++		cc -c converter.c -O -I${X11BASE}/include \
>+ 		-D${DEFAULT_FACE} -D${DEFAULT_ICON}
>+ 
>+ etc.o :		etc.h etc.c
>+-		gcc -c etc.c -O -I${X11BASE}/include \
>++		cc -c etc.c -O -I${X11BASE}/include \
>+ 		-DEYECLOCK_LIB=\"${PREFIX}/lib/X11/EyeClock\"
>+ 
>+ EyeClock :	${DEFAULT_RESOURCE}
>+@@ -80,7 +80,7 @@ fallback_resources.h :		EyeClock mkfbres
>+ 		cat EyeClock | ./mkfbres > fallback_resources.h
>+ 
>+ mkfbres :	mkfbres.c
>+-		gcc mkfbres.c -o mkfbres
>++		cc mkfbres.c -o mkfbres
>+ 
>+ eyeclock.1.gz :	eyeclock.man
>+ 		cp eyeclock.man eyeclock.1
>+@@ -93,14 +93,15 @@ clean :
>  backup :
>  		cp COPYRIGHT* *.jpn CHANGE EyeClock* Makefile *.h *.c *.man bak
>  
>@@ -51,7 +102,7 @@
>  umeharaclock :
>  		ln -s eyeclock umeharaclock
>  
>-@@ -131,7 +132,7 @@
>+@@ -131,7 +132,7 @@ octopusclock :
>  clearclock :
>  		rm -f ${BINDIR}/eyeclock
>  		rm -f ${BINDIR}/daemonclock
>diff -urN /usr/ports/x11-clocks/eyeclock/files/patch-main.c x11-clocks/eyeclock/files/patch-main.c
>--- /usr/ports/x11-clocks/eyeclock/files/patch-main.c	2015-08-24 04:05:13.538144000 +0900
>+++ x11-clocks/eyeclock/files/patch-main.c	2016-04-12 00:00:00.000000000 +0900
>@@ -1,5 +1,5 @@
>---- main.c.orig	Sun Dec 26 16:34:55 1999
>-+++ main.c	Sun Dec 26 16:37:01 1999
>+--- main.c.orig	1999-12-25 09:18:56 UTC
>++++ main.c
> @@ -76,7 +76,7 @@
>  /*===========================================================================*/
>  
>@@ -9,7 +9,7 @@
>  
>  /*===========================================================================*/
>  /* Number ¥ô¥£¥¸¥§¥Ã¥È¤Î¥ô¥£¥¸¥§¥Ã¥È¤´¤È¤ÎÌ¾Á°                               */
>-@@ -616,9 +616,9 @@
>+@@ -616,9 +616,9 @@ static void die(Widget w)
>    Display * display;
>    int i;
>  
>@@ -22,7 +22,7 @@
>  
>    if (toplevel)
>      if (XtIsRealized(toplevel)) {
>-@@ -650,8 +650,8 @@
>+@@ -650,8 +650,8 @@ static void restore(Widget w, XEvent * e
>    unsigned int width;
>    unsigned int height;
>  
>@@ -33,7 +33,7 @@
>  
>    if (width && height)
>      XtVaSetValues(toplevel, XtNwidth, width, XtNheight, height, NULL);
>-@@ -730,23 +730,23 @@
>+@@ -730,23 +730,23 @@ int main(int argc, char * argv[])
>    }
>  
>    /* Clock ¥ô¥£¥¸¥§¥Ã¥È¤ÎºîÀ® */
>@@ -61,7 +61,7 @@
>  
>    /* ¥Ý¥¤¥ó¥¿¤Î¥Õ¥©¡¼¥«¥¹¤òÍ¸ú¤Ë¤¹¤ë */
>    XtVaSetValues(toplevel, XtNinput, True, NULL);
>-@@ -788,7 +788,7 @@
>+@@ -788,7 +788,7 @@ int main(int argc, char * argv[])
>    XSetWMProtocols(display, XtWindow(toplevel), &wm_delete_window, 1);
>  
>    /* »þ·×¤ò¥¹¥¿¡¼¥È¤µ¤»¤ë */
>diff -urN /usr/ports/x11-clocks/eyeclock/pkg-descr x11-clocks/eyeclock/pkg-descr
>--- /usr/ports/x11-clocks/eyeclock/pkg-descr	2015-08-24 04:05:13.522462000 +0900
>+++ x11-clocks/eyeclock/pkg-descr	2016-04-12 00:00:00.000000000 +0900
>@@ -7,3 +7,5 @@
> boyclock, daemonclock, eyeclock, girlclock, henohenoclock,
> margueriteclock, octopusclock, punpunclock, silicagelclock,
> taroclock, umeharaclock.
>+
>+WWW: http://kozos.jp/myfreesoft/

Actions: View | Diff

Attachments on bug 208724: 169219