[Midnightbsd-cvs] mports [24930] trunk/x11-drivers/xorgxrdp/distinfo: update
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Feb 9 11:56:24 EST 2019
Revision: 24930
http://svnweb.midnightbsd.org/mports/?rev=24930
Author: laffer1
Date: 2019-02-09 11:56:23 -0500 (Sat, 09 Feb 2019)
Log Message:
-----------
update
Modified Paths:
--------------
trunk/x11-clocks/aclock/Makefile
trunk/x11-clocks/asclock/Makefile
trunk/x11-clocks/asclock/pkg-descr
trunk/x11-clocks/glclock/Makefile
trunk/x11-clocks/oclock/Makefile
trunk/x11-clocks/oclock/distinfo
trunk/x11-drivers/xorgxrdp/Makefile
trunk/x11-drivers/xorgxrdp/distinfo
Added Paths:
-----------
trunk/x11-clocks/asclock/files/
trunk/x11-clocks/asclock/files/patch-asclock.c
Removed Paths:
-------------
trunk/x11-clocks/asclock/pkg-plist
Property Changed:
----------------
trunk/x11-clocks/aclock/pkg-descr
trunk/x11-clocks/asclock/pkg-descr
trunk/x11-clocks/oclock/pkg-descr
trunk/x11-clocks/wmcalclock/pkg-descr
trunk/x11-clocks/xclock/pkg-descr
Modified: trunk/x11-clocks/aclock/Makefile
===================================================================
--- trunk/x11-clocks/aclock/Makefile 2019-02-09 16:44:42 UTC (rev 24929)
+++ trunk/x11-clocks/aclock/Makefile 2019-02-09 16:56:23 UTC (rev 24930)
@@ -2,7 +2,7 @@
PORTNAME= aclock
PORTVERSION= 0.4.0
-PORTREVISION= 3
+PORTREVISION= 7
CATEGORIES= x11-clocks gnustep
MASTER_SITES= SAVANNAH/gap
DISTNAME= AClock-${PORTVERSION}
Index: trunk/x11-clocks/aclock/pkg-descr
===================================================================
--- trunk/x11-clocks/aclock/pkg-descr 2019-02-09 16:44:42 UTC (rev 24929)
+++ trunk/x11-clocks/aclock/pkg-descr 2019-02-09 16:56:23 UTC (rev 24930)
Property changes on: trunk/x11-clocks/aclock/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Modified: trunk/x11-clocks/asclock/Makefile
===================================================================
--- trunk/x11-clocks/asclock/Makefile 2019-02-09 16:44:42 UTC (rev 24929)
+++ trunk/x11-clocks/asclock/Makefile 2019-02-09 16:56:23 UTC (rev 24930)
@@ -2,10 +2,9 @@
PORTNAME= asclock
PORTVERSION= 1.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-clocks afterstep
-MASTER_SITES= ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= applications
+MASTER_SITES= XCONTRIB/applications
DISTNAME= ${PORTNAME}
EXTRACT_SUFX= .tgz
@@ -12,7 +11,7 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= Afterstep clock with some language extensions
-LICENSE= unknown
+LICENSE= bsd2
CONFLICTS= asclock-gtk-[0-9]* asclock-xlib-[0-9]*
@@ -20,33 +19,66 @@
USE_XORG= xpm xext x11
PLIST_FILES= bin/asclock man/man1/asclock.1.gz
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE=
+OPTIONS_SINGLE= LANG
+OPTIONS_SINGLE_LANG= EN DE PT NL NO IT SE ES HU BRE FR CZ
+OPTIONS_DEFAULT= EN
+NO_OPTIONS_SORT=yes
+EN_DESC= english
+DE_DESC= german
+PT_DESC= portuguese
+NL_DESC= dutch
+NO_DESC= norwegian
+IT_DESC= italian
+SE_DESC= swedish
+ES_DESC= spanish
+HU_DESC= hungarian
+BRE_DESC= breton
+FR_DESC= french
+CZ_DESC= czech
-.if ${OSVERSION} < 9000
-USE_GCC= any
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MDE}
+ASCLOCK_LANG= german
.endif
+.if ${PORT_OPTIONS:MPT}
+ASCLOCK_LANG= portuguese
+.endif
+.if ${PORT_OPTIONS:MNL}
+ASCLOCK_LANG= dutch
+.endif
+.if ${PORT_OPTIONS:MNO}
+ASCLOCK_LANG= norwegian
+.endif
+.if ${PORT_OPTIONS:MIT}
+ASCLOCK_LANG= italian
+.endif
+.if ${PORT_OPTIONS:MSE}
+ASCLOCK_LANG= swedish
+.endif
+.if ${PORT_OPTIONS:MES}
+ASCLOCK_LANG= spanish
+.endif
+.if ${PORT_OPTIONS:MHU}
+ASCLOCK_LANG= hungarian
+.endif
+.if ${PORT_OPTIONS:MBRE}
+ASCLOCK_LANG= breton
+.endif
+.if ${PORT_OPTIONS:MFR}
+ASCLOCK_LANG= french
+.endif
+.if ${PORT_OPTIONS:MCZ}
+ASCLOCK_LANG= czech
+.endif
+# default
+ASCLOCK_LANG?= english
+
pre-configure:
- (cd ${WRKSRC}; \
- ${ECHO_CMD} ${ASCLOCK_LANG} | ${WRKSRC}/configure > /dev/null)
- @${ECHO_MSG} "***************** NOTE *****************"
- @${ECHO_MSG} "* *"
- @${ECHO_MSG} "* You can choose languages for asclock. *"
- @${ECHO_MSG} "* 1) english [DEFAULT] *"
- @${ECHO_MSG} "* 2) german *"
- @${ECHO_MSG} "* 3) portuguese *"
- @${ECHO_MSG} "* 4) dutch *"
- @${ECHO_MSG} "* 5) norwegian *"
- @${ECHO_MSG} "* 6) italian *"
- @${ECHO_MSG} "* 7) swedish *"
- @${ECHO_MSG} "* 8) spanish *"
- @${ECHO_MSG} "* 9) hungarian *"
- @${ECHO_MSG} "* 0) breton *"
- @${ECHO_MSG} "* a) french *"
- @${ECHO_MSG} "* b) czech *"
- @${ECHO_MSG} "* *"
- @${ECHO_MSG} "* Specify the number you want when make. *"
- @${ECHO_MSG} "* Example: \" make ASCLOCK_LANG=1 \" *"
- @${ECHO_MSG} "******************************************"
+ ${RM} ${WRKSRC}/month.xpm ${WRKSRC}/weekday.xpm
+ (cd ${WRKSRC} && ${LN} -s ./${ASCLOCK_LANG}/month.xpm ./month.xpm)
+ (cd ${WRKSRC} && ${LN} -s ./${ASCLOCK_LANG}/weekday.xpm ./weekday.xpm)
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Added: trunk/x11-clocks/asclock/files/patch-asclock.c
===================================================================
--- trunk/x11-clocks/asclock/files/patch-asclock.c (rev 0)
+++ trunk/x11-clocks/asclock/files/patch-asclock.c 2019-02-09 16:56:23 UTC (rev 24930)
@@ -0,0 +1,100 @@
+--- asclock.c.orig 1996-08-25 22:35:49 UTC
++++ asclock.c
+@@ -1,4 +1,7 @@
+ #include <stdio.h>
++#include <stdlib.h>
++#include <string.h>
++#include <unistd.h>
+ #include <X11/Xlib.h>
+ #include <X11/xpm.h>
+ #include <X11/extensions/shape.h>
+@@ -245,6 +248,7 @@ int main(int argc,char *argv[])
+ InsertTime();
+ }
+ if (ITBLINKS)
++ {
+ if (actualtime % 2)
+ /* Sekunden Doppelpunkt ein */
+ XCopyArea(dpy, led.pixmap, visible.pixmap, NormalGC,
+@@ -253,6 +257,7 @@ int main(int argc,char *argv[])
+ /* Sekunden Doppelpunkt aus */
+ XCopyArea(dpy, asclock.pixmap, visible.pixmap, NormalGC,
+ 27,6,3,11,posx[2], posy[0]);
++ }
+
+ RedrawWindow(&visible);
+
+@@ -302,8 +307,8 @@ void GetXPM(void)
+ static char **clock_xpm;
+ XColor col;
+ XWindowAttributes attributes;
+- char led1[22];
+- char led2[22];
++ char led1[64];
++ char led2[64];
+ int ret;
+
+ clock_xpm =ONLYSHAPE ? mask_xpm : clk_xpm;
+@@ -317,51 +322,49 @@ void GetXPM(void)
+ nocolor("parse",LedColor);
+ }
+
+- sprintf(&led1[0], ". c #%4X%4X%4X", col.red, col.green, col.blue);
+- for(ret=10;ret<22;ret++)
+- if(led1[ret]==' ') led1[ret]='0';
+- led_xpm[2] = &led1[0];
++ sprintf(led1, ". c #%04X%04X%04X", col.red, col.green, col.blue);
++ led_xpm[2] = led1;
+
+ col.red = (col.red /10) *3;
+ col.green = (col.green/10) *3;
+ col.blue = (col.blue /10) *3;
+- sprintf(&led2[0], "X c #%4X%4X%4X", col.red, col.green, col.blue);
+- for(ret=10;ret<22;ret++)
+- if(led2[ret]==' ') led2[ret]='0';
+- led_xpm[3] = &led2[0];
++ sprintf(led2, "X c #%04X%04X%04X", col.red, col.green, col.blue);
++ led_xpm[3] = led2;
+
+ asclock.attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions);
+ ret = XpmCreatePixmapFromData(dpy, Root, clock_xpm, &asclock.pixmap,
+ &asclock.mask, &asclock.attributes);
+ if(ret != XpmSuccess)
+- {fprintf(stderr, ERR_colorcells);exit(1);}
++ {fprintf(stderr, "1: %s\n", XpmGetErrorString(ret));exit(1);}
+ visible.attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions);
+ ret = XpmCreatePixmapFromData(dpy, Root, clk_xpm, &visible.pixmap,
+ &visible.mask, &visible.attributes);
++ if(ret != XpmSuccess)
++ {fprintf(stderr, "2: %s\n", XpmGetErrorString(ret));exit(1);}
+
+ led.attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions);
+ ret = XpmCreatePixmapFromData(dpy, Root, led_xpm, &led.pixmap,
+ &led.mask, &led.attributes);
+ if(ret != XpmSuccess)
+- {fprintf(stderr, ERR_colorcells);exit(1);}
++ {fprintf(stderr, "3: %s\n", XpmGetErrorString(ret));exit(1);}
+
+ month.attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions);
+ ret = XpmCreatePixmapFromData(dpy, Root, month_xpm, &month.pixmap,
+ &month.mask, &month.attributes);
+ if(ret != XpmSuccess)
+- {fprintf(stderr, ERR_colorcells);exit(1);}
++ {fprintf(stderr, "4: %s\n", XpmGetErrorString(ret));exit(1);}
+
+ date.attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions);
+ ret = XpmCreatePixmapFromData(dpy, Root, date_xpm, &date.pixmap,
+ &date.mask, &date.attributes);
+ if(ret != XpmSuccess)
+- {fprintf(stderr, ERR_colorcells);exit(1);}
++ {fprintf(stderr, "5: %s\n", XpmGetErrorString(ret));exit(1);}
+
+ weekday.attributes.valuemask |= (XpmReturnPixels | XpmReturnExtensions);
+ ret = XpmCreatePixmapFromData(dpy, Root, weekday_xpm, &weekday.pixmap,
+ &weekday.mask, &weekday.attributes);
+ if(ret != XpmSuccess)
+- {fprintf(stderr, ERR_colorcells);exit(1);}
++ {fprintf(stderr, "6: %s\n", XpmGetErrorString(ret));exit(1);}
+ }
+ /****************************************************************************/
+ /* Removes expose events for a specific window from the queue */
Property changes on: trunk/x11-clocks/asclock/files/patch-asclock.c
___________________________________________________________________
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
Modified: trunk/x11-clocks/asclock/pkg-descr
===================================================================
--- trunk/x11-clocks/asclock/pkg-descr 2019-02-09 16:44:42 UTC (rev 24929)
+++ trunk/x11-clocks/asclock/pkg-descr 2019-02-09 16:56:23 UTC (rev 24930)
@@ -1 +1,3 @@
afterstep clock with some language extensions
+
+LICENSE: permission to use this program for any purpose
Property changes on: trunk/x11-clocks/asclock/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: trunk/x11-clocks/asclock/pkg-plist
===================================================================
--- trunk/x11-clocks/asclock/pkg-plist 2019-02-09 16:44:42 UTC (rev 24929)
+++ trunk/x11-clocks/asclock/pkg-plist 2019-02-09 16:56:23 UTC (rev 24930)
@@ -1,2 +0,0 @@
- at comment $MidnightBSD$
-bin/asclock
Modified: trunk/x11-clocks/glclock/Makefile
===================================================================
--- trunk/x11-clocks/glclock/Makefile 2019-02-09 16:44:42 UTC (rev 24929)
+++ trunk/x11-clocks/glclock/Makefile 2019-02-09 16:56:23 UTC (rev 24930)
@@ -2,7 +2,7 @@
PORTNAME= glclock
DISTVERSION= 6.0b6.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= x11-clocks
MASTER_SITES= http://www.daionet.gr.jp/~masa/archives/
Modified: trunk/x11-clocks/oclock/Makefile
===================================================================
--- trunk/x11-clocks/oclock/Makefile 2019-02-09 16:44:42 UTC (rev 24929)
+++ trunk/x11-clocks/oclock/Makefile 2019-02-09 16:56:23 UTC (rev 24930)
@@ -2,12 +2,12 @@
# $MidnightBSD$
PORTNAME= oclock
-PORTVERSION= 1.0.3
-PORTREVISION= 1
+PORTVERSION= 1.0.4
CATEGORIES= x11-clocks
MAINTAINER= ports at MidnightBSD.org
COMMENT= Round clock application for X
+
LICENSE= mit
XORG_CAT= app
Modified: trunk/x11-clocks/oclock/distinfo
===================================================================
--- trunk/x11-clocks/oclock/distinfo 2019-02-09 16:44:42 UTC (rev 24929)
+++ trunk/x11-clocks/oclock/distinfo 2019-02-09 16:56:23 UTC (rev 24930)
@@ -1,2 +1,3 @@
-SHA256 (xorg/app/oclock-1.0.3.tar.bz2) = 54f5fb85f5828705683f457e559fb18753332db15ae82da561b0ae5a63915091
-SIZE (xorg/app/oclock-1.0.3.tar.bz2) = 122758
+TIMESTAMP = 1525893915
+SHA256 (xorg/app/oclock-1.0.4.tar.bz2) = cc20cfc1c0d5128d89e1eecd9ba52e58f111075be163e0aeda5690dbaafbaefe
+SIZE (xorg/app/oclock-1.0.4.tar.bz2) = 132835
Index: trunk/x11-clocks/oclock/pkg-descr
===================================================================
--- trunk/x11-clocks/oclock/pkg-descr 2019-02-09 16:44:42 UTC (rev 24929)
+++ trunk/x11-clocks/oclock/pkg-descr 2019-02-09 16:56:23 UTC (rev 24930)
Property changes on: trunk/x11-clocks/oclock/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/x11-clocks/wmcalclock/pkg-descr
===================================================================
--- trunk/x11-clocks/wmcalclock/pkg-descr 2019-02-09 16:44:42 UTC (rev 24929)
+++ trunk/x11-clocks/wmcalclock/pkg-descr 2019-02-09 16:56:23 UTC (rev 24930)
Property changes on: trunk/x11-clocks/wmcalclock/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/x11-clocks/xclock/pkg-descr
===================================================================
--- trunk/x11-clocks/xclock/pkg-descr 2019-02-09 16:44:42 UTC (rev 24929)
+++ trunk/x11-clocks/xclock/pkg-descr 2019-02-09 16:56:23 UTC (rev 24930)
Property changes on: trunk/x11-clocks/xclock/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Modified: trunk/x11-drivers/xorgxrdp/Makefile
===================================================================
--- trunk/x11-drivers/xorgxrdp/Makefile 2019-02-09 16:44:42 UTC (rev 24929)
+++ trunk/x11-drivers/xorgxrdp/Makefile 2019-02-09 16:56:23 UTC (rev 24930)
@@ -2,11 +2,16 @@
# $FreeBSD: head/x11-drivers/xorgxrdp/Makefile 465777 2018-03-28 03:38:52Z meta $
PORTNAME= xorgxrdp
-PORTVERSION= 0.2.6
+PORTVERSION= 0.2.7
+PORTREVISION= 1
+CATEGORIES= x11-drivers
DISTVERSIONPREFIX= v
CATEGORIES= x11-drivers
DIST_SUBDIR= xrdp
+PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES= cad9094.patch:-p1 fa3e738.patch:-p1
+
MAINTAINER= ports at MidnightBSD.org
COMMENT= X.Org driver enabling use through an RDP session with xrdp
@@ -16,14 +21,12 @@
BUILD_DEPENDS= nasm:devel/nasm
USES= autoreconf libtool:build pkgconfig
-USE_XORG= dri2proto dri3proto glproto inputproto presentproto randrproto \
- renderproto resourceproto scrnsaverproto xf86driproto xineramaproto \
- xorg-server
+USE_XORG= xorgproto xorg-server
USE_LDCONFIG= yes
USE_GITHUB= yes
GH_ACCOUNT= neutrinolabs
GH_PROJECT= xrdp:xrdp
-GH_TAGNAME= v0.9.6:xrdp
+GH_TAGNAME= v0.9.7:xrdp
GNU_CONFIGURE= yes
INSTALL_TARGET= install-strip
Modified: trunk/x11-drivers/xorgxrdp/distinfo
===================================================================
--- trunk/x11-drivers/xorgxrdp/distinfo 2019-02-09 16:44:42 UTC (rev 24929)
+++ trunk/x11-drivers/xorgxrdp/distinfo 2019-02-09 16:56:23 UTC (rev 24930)
@@ -1,3 +1,7 @@
-TIMESTAMP = 1535318877
-SHA256 (xrdp/neutrinolabs-xrdp-v0.9.6_GH0.tar.gz) = 68361f4e75fd70a85e258af78af244754dc7190092abfdb9c709e20905de260d
-SIZE (xrdp/neutrinolabs-xrdp-v0.9.6_GH0.tar.gz) = 1878049
+TIMESTAMP = 1549215316
+SHA256 (xrdp/neutrinolabs-xrdp-v0.9.7_GH0.tar.gz) = 3396479a7b692a0f93bd7951dcfca2c8f033b73bbf55612fb0164ce8a6cef7c2
+SIZE (xrdp/neutrinolabs-xrdp-v0.9.7_GH0.tar.gz) = 665858
+SHA256 (xrdp/cad9094.patch) = 3fe1a54f76e313c4e7fa410257d2c71d7ea34cb920c49cce8858f120f114f891
+SIZE (xrdp/cad9094.patch) = 2282
+SHA256 (xrdp/fa3e738.patch) = 3e6e362aeb7f85181933d988de1b6fb7a60dd65044c154303ae113259105d36d
+SIZE (xrdp/fa3e738.patch) = 11584
More information about the Midnightbsd-cvs
mailing list