diff --git a/x11-clocks/dclock/Makefile b/x11-clocks/dclock/Makefile index 10f26ce073d0..66603ff0c7f9 100644 --- a/x11-clocks/dclock/Makefile +++ b/x11-clocks/dclock/Makefile @@ -6,25 +6,53 @@ # PORTNAME= dclock -PORTVERSION= pl6 +PORTVERSION= 2.1.2.7 CATEGORIES= x11-clocks -MASTER_SITES= # disappeared -DISTNAME= Dclock +MASTER_SITES= ${MASTER_SITE_DEBIAN} +MASTER_SITE_SUBDIR= pool/main/d/dclock +DISTNAME= dclock_2.1.2.orig -PATCH_SITES= ${MASTER_SITE_XCONTRIB} -PATCH_SITE_SUBDIR= R6contrib-fixes -PATCHFILES= Dclock-pl6.patch.gz +PATCH_SITES= ${MASTER_SITE_DEBIAN:S,%SUBDIR%,pool/main/d/dclock,} +PATCHFILES= dclock_2.1.2-7.diff.gz PATCH_DIST_STRIP= -p1 -MAINTAINER= ports@FreeBSD.org -COMMENT= A 7-segment digital clock with optional military time and alarm +MAINTAINER= yasu@utahime.org +COMMENT= A 7-segment digital clock with some optional features -DEPRECATED= mastersites disappeared -EXPIRATION_DATE= 2006-01-26 - -IGNOREFILES= ${DISTFILES} USE_IMAKE= yes -MAN1= dclock.1 -PLIST_FILES= bin/dclock +USE_REINPLACE= yes -.include +WRKSRC= ${WRKDIR}/dclock +MAN1= dclock.1 + +OPTIONS= SOX "Install SoX to play audio" On + +.include + +.if !defined(WITHOUT_SOX) +RUN_DEPENDS+= play:${PORTSDIR}/audio/sox +.endif + +post-patch: + @${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|' \ + -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/Dclock.c \ + ${WRKSRC}/Dclock.ad \ + ${WRKSRC}/dclock.1 + @${MV} ${WRKSRC}/dclock.1 ${WRKSRC}/dclock.man + +post-install: + ${INSTALL_DATA} ${WRKSRC}/Dclock.ad ${PREFIX}/lib/X11/app-defaults/DClock + ${MKDIR} ${DATADIR}/sounds +.for f in bell.wav digital.wav + ${INSTALL_DATA} ${WRKSRC}/sounds/${f} ${DATADIR}/sounds +.endfor +.if !defined(NOPORTDOCS) + ${MKDIR} ${DOCSDIR} +.for f in README TODO + ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR} +.endfor + ${INSTALL_DATA} ${WRKSRC}/debian/changelog ${DOCSDIR}/changelog.Debian +.endif + +.include diff --git a/x11-clocks/dclock/distinfo b/x11-clocks/dclock/distinfo index 6bd145403449..4dbac9860c82 100644 --- a/x11-clocks/dclock/distinfo +++ b/x11-clocks/dclock/distinfo @@ -1,5 +1,6 @@ -MD5 (Dclock-pl6.patch.gz) = 539204f67d1662c5ed738f8b8e9d9bf2 -SHA256 (Dclock-pl6.patch.gz) = 98ac37a7893844947a581c9b730907d652b388f81e88913d9b1a556573974ac3 -SIZE (Dclock-pl6.patch.gz) = 2133 -MD5 (Dclock.tar.gz) = IGNORE -SHA256 (Dclock.tar.gz) = IGNORE +MD5 (dclock_2.1.2.orig.tar.gz) = e5cd7c843809d94a78ad62fd39fb8b58 +SHA256 (dclock_2.1.2.orig.tar.gz) = e613b2ea01e7bc41c1ae76b2ae7a5ad81805e2aba29c0e843fa2f9b28518136e +SIZE (dclock_2.1.2.orig.tar.gz) = 51418 +MD5 (dclock_2.1.2-7.diff.gz) = a9e5012d4c0d86660da4e3f7d8f50592 +SHA256 (dclock_2.1.2-7.diff.gz) = 999b8da2868393d38853427da866161b109bc62577c0e99964c519339b95a8da +SIZE (dclock_2.1.2-7.diff.gz) = 4794 diff --git a/x11-clocks/dclock/files/patch-Dclock.ad b/x11-clocks/dclock/files/patch-Dclock.ad new file mode 100644 index 000000000000..c04f47343b36 --- /dev/null +++ b/x11-clocks/dclock/files/patch-Dclock.ad @@ -0,0 +1,30 @@ +--- Dclock.ad.orig Sun Dec 18 00:18:10 2005 ++++ Dclock.ad Sun Dec 18 00:20:00 2005 +@@ -1,14 +1,14 @@ + ! sample dclock defaults +-dclock*geometry: 240x87+271+5 +-dclock*foreground: chartreuse +-dclock*background: DarkSlateGray +-dclock*led_off: DarkGreen +-dclock*borderColor: white +-dclock*borderWidth: 2 +-dclock*widthFactor: 0.143 +-dclock*spaceFactor: 0.062 +-dclock*bellFile: /usr/share/sounds/bell.wav +-dclock*alarmFile: /usr/share/sounds/digital.wav +-dclock*font: *helvetica-medium-r-normal--14* +-dclock*audioPlay: /usr/bin/play +-dclock.input: true ++*geometry: 240x87+271+5 ++*foreground: chartreuse ++*background: DarkSlateGray ++*led_off: DarkGreen ++*borderColor: white ++*borderWidth: 2 ++*widthFactor: 0.143 ++*spaceFactor: 0.062 ++*bellFile: %%DATADIR%%/sounds/bell.wav ++*alarmFile: %%DATADIR%%/sounds/digital.wav ++*font: *helvetica-medium-r-normal--14* ++*audioPlay: %%LOCALBASE%%/bin/play ++.input: true diff --git a/x11-clocks/dclock/files/patch-Dclock.c b/x11-clocks/dclock/files/patch-Dclock.c new file mode 100644 index 000000000000..2f63600bcc93 --- /dev/null +++ b/x11-clocks/dclock/files/patch-Dclock.c @@ -0,0 +1,23 @@ +--- Dclock.c.orig Sat Dec 17 23:46:28 2005 ++++ Dclock.c Sat Dec 17 23:47:28 2005 +@@ -9,9 +9,9 @@ + #include + #include + #include +-#include ++#include + #include +-#include ++#include + #include + #include + #include +@@ -171,7 +171,7 @@ + { XtNbellFile, "bellFile", XtRString, sizeof(String), + XtOffset(DclockWidget,dclock.bellfile), XtRString, (String)NULL}, + { XtNaudioPlay, "audioPlay", XtRString, sizeof(String), +- XtOffset(DclockWidget,dclock.audioplay), XtRString, "/usr/bin/play"}, ++ XtOffset(DclockWidget,dclock.audioplay), XtRString, "%%LOCALBASE%%/bin/play"}, + }; + + /* Define the Dclock widget */ diff --git a/x11-clocks/dclock/files/patch-ab b/x11-clocks/dclock/files/patch-ab deleted file mode 100644 index 8aa7c7fbb465..000000000000 --- a/x11-clocks/dclock/files/patch-ab +++ /dev/null @@ -1,11 +0,0 @@ ---- Dclock.h.orig Mon Jun 6 08:00:00 1994 -+++ Dclock.h Sun Dec 19 15:59:17 1999 -@@ -58,7 +58,7 @@ - #define XtNfadeRate "fadeRate" - #define XtNtails "tails" - #define XtNdate "date" --#define XtNmilitaryTime "militaryTime" -+#define XtNmilitaryTime "miltime" - #define XtNlanguage "language" - #define XtNhours_snd "hours_snd" - #define XtNhalf_hours_snd "half_hours_snd" diff --git a/x11-clocks/dclock/files/patch-ac b/x11-clocks/dclock/files/patch-ac deleted file mode 100644 index caa7dae4961e..000000000000 --- a/x11-clocks/dclock/files/patch-ac +++ /dev/null @@ -1,11 +0,0 @@ ---- d_clock.c.orig Fri Jun 3 08:00:00 1994 -+++ d_clock.c Sun Dec 19 16:01:36 1999 -@@ -131,7 +131,7 @@ - else - name = argv[0]; - -- toplevel = XtInitialize(name, "DClock", options, XtNumber(options), -+ toplevel = XtInitialize(name, "Dclock", options, XtNumber(options), - &argc, argv); - XtAddActions(actionsList, 1); - diff --git a/x11-clocks/dclock/files/patch-ad b/x11-clocks/dclock/files/patch-ad deleted file mode 100644 index 2ff8cbfb2954..000000000000 --- a/x11-clocks/dclock/files/patch-ad +++ /dev/null @@ -1,27 +0,0 @@ ---- Dclock.c.orig Tue Jan 4 14:01:53 2000 -+++ Dclock.c Tue Jan 4 14:01:55 2000 -@@ -967,7 +967,7 @@ - { - char datestr[128]; - register char *datep = datestr, *p; -- int x; -+ int x, year = now->tm_year + 1900; - - if (!w->dclock.display_time) - datep += strlen(strcpy(datep, "Push HERE to Set/Unset Alarm")); -@@ -1000,11 +1000,12 @@ - *datep++ = (now->tm_mday / 10 + '0'); - *datep++ = now->tm_mday % 10 + '0'; - when 'Y': -- *datep++ = '1', *datep++ = '9'; -+ *datep++ = (year / 1000) % 10 + '0'; -+ *datep++ = (year / 100) % 10 + '0'; - /* fall thru */ - case 'y': -- *datep++ = now->tm_year / 10 + '0'; -- *datep++ = now->tm_year % 10 + '0'; -+ *datep++ = (year / 10) % 10 + '0'; -+ *datep++ = year % 10 + '0'; - when '%': - *datep++ = *p; - otherwise: ; /* nothing */ diff --git a/x11-clocks/dclock/files/patch-dclock.1 b/x11-clocks/dclock/files/patch-dclock.1 new file mode 100644 index 000000000000..80240b11a1fd --- /dev/null +++ b/x11-clocks/dclock/files/patch-dclock.1 @@ -0,0 +1,11 @@ +--- dclock.1.orig Sat Dec 17 23:23:39 2005 ++++ dclock.1 Sat Dec 17 23:24:21 2005 +@@ -304,7 +304,7 @@ + .B audioPlay (\fPclass\fB String) + Specifies an executable to use to play the bell and alarm audio files, if + they are specified. Otherwise, the system bell is used (default is +-"/usr/bin/play"). ++"%%LOCALBASE%%/bin/play"). + .SH ENVIRONMENT + .PP + .TP 8 diff --git a/x11-clocks/dclock/pkg-descr b/x11-clocks/dclock/pkg-descr index 6f73ed7eb3e7..c36786428c5e 100644 --- a/x11-clocks/dclock/pkg-descr +++ b/x11-clocks/dclock/pkg-descr @@ -1,5 +1,8 @@ -This is a classic, simple, 7-segment X11 clock, which seems to work -reall well. It was on the suns at uni, and when I moved, I missed it -so much, I ported it! --- -leonard@dstc.edu.au +Dclock is a classic, simple, 7-segment X11 clock with some optional +features such as military time and alarm. The original version is +written by Dan Heller. Tim Edwards heavily modified it and released as +version 2.0. This port uses Debian porting as upstream, which is based +on Tim's version and also includes some additional features and fixes. + +WWW: http://opencircuitdesign.com/~tim/ +WWW: http://packages.qa.debian.org/d/dclock.html diff --git a/x11-clocks/dclock/pkg-plist b/x11-clocks/dclock/pkg-plist new file mode 100644 index 000000000000..85e895dc8018 --- /dev/null +++ b/x11-clocks/dclock/pkg-plist @@ -0,0 +1,11 @@ +@comment $FreeBSD$ +bin/dclock +lib/X11/app-defaults/DClock +%%DATADIR%%/sounds/bell.wav +%%DATADIR%%/sounds/digital.wav +@dirrm %%DATADIR%%/sounds +@dirrm %%DATADIR%% +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/TODO +%%PORTDOCS%%%%DOCSDIR%%/changelog.Debian +%%PORTDOCS%%@dirrm %%DOCSDIR%%