Index: head/x11/xscreensaver/Makefile =================================================================== --- head/x11/xscreensaver/Makefile (revision 472801) +++ head/x11/xscreensaver/Makefile (revision 472802) @@ -1,103 +1,103 @@ # Created by: dom@myrddin.demon.co.uk # $FreeBSD$ PORTNAME= xscreensaver PORTVERSION= 5.39 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= http://www.jwz.org/xscreensaver/ MAINTAINER= zeising@FreeBSD.org COMMENT= Save your screen while you entertain your cat LICENSE= MIT RUN_DEPENDS= p5-libwww>0:www/p5-libwww \ giftopnm:graphics/netpbm LIB_DEPENDS= libgle.so:graphics/gle \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 CONFLICTS= xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]* USES= autoreconf gettext gmake jpeg localbase:ldflags perl5 pkgconfig USE_GL= gl glu USE_GNOME= cairo gdkpixbuf2 gtk20 intltool libglade2 libxml2 USE_PERL5= run USE_XORG= ice sm x11 xext xi xinerama xmu xrandr xrender xpm xt \ xxf86misc xxf86vm USE_CSTD= gnu99 GNU_CONFIGURE= yes CONFIGURE_ENV+= PERL="${PERL}" CONFIGURE_ARGS= --with-gtk --with-gl --with-gle --with-pixbuf --with-xpm \ --with-jpeg=${LOCALBASE} --with-xshm-ext --with-xdbe-ext \ --with-hackdir=${PREFIX}/bin/xscreensaver-hacks/ \ --with-configdir=${PREFIX}/share/xscreensaver/config/ \ --with-x-app-defaults=${PREFIX}/lib/X11/app-defaults/ \ --with-dpms-ext --with-xinerama-ext --with-xf86vmode-ext \ --with-xf86gamma-ext --with-randr-ext --without-kerberos \ --without-setuid-hacks --enable-locking MAKE_ARGS+= install_prefix=${STAGEDIR} OPTIONS_DEFINE= PAM SETUID_HACKS FIREF NLS NSFW XAOS1 XDALI XEARTH \ XFT XMOUN XPLANET XSNOW OPTIONS_DEFAULT=XFT OPTIONS_SUB= yes PAM_CONFIGURE_WITH= pam SETUID_HACKS_DESC= Install sonar hack suid so it can ping FIREF_DESC= Add extra port x11/fireflies FIREF_RUN_DEPENDS= ${LOCALBASE}/bin/xscreensaver-hacks/fireflies:x11/fireflies NLS_USES= gettext-runtime NLS_CONFIGURE_ENABLE= nls NSFW_DESC= Include material that is Not Safe For Work XAOS1_DESC= Add extra port graphics/xaos XAOS1_RUN_DEPENDS= xaos:graphics/xaos XDALI_DESC= Add extra port x11-clocks/xdaliclock XDALI_RUN_DEPENDS= xdaliclock:x11-clocks/xdaliclock XFT_CONFIGURE_WITH= xft XFT_USE= XORG=xft XEARTH_DESC= Add extra port astro/xearth XEARTH_RUN_DEPENDS= xearth:astro/xearth XMOUN_DESC= Add extra port graphics/xmountains XMOUN_RUN_DEPENDS= xmountains:graphics/xmountains XPLANET_DESC= Add extra port astro/xplanet XPLANET_RUN_DEPENDS= xplanet:astro/xplanet XSNOW_DESC= Add extra port x11/xsnow XSNOW_RUN_DEPENDS= xsnow:x11/xsnow SUB_FILES= xscreensaver-blank.desktop xscreensaver-lock.desktop \ xscreensaver-start.desktop xscreensaver-stop.desktop post-patch: ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e 's|pkg_config --list-all|pkg_config --help|' \ ${WRKSRC}/configure.in ${REINPLACE_CMD} -e "s|/etc/pam.d|${PREFIX}/etc/pam.d|g" \ ${WRKSRC}/driver/passwd-pam.c \ ${WRKSRC}/driver/xscreensaver.man ${CP} ${FILESDIR}/xscreensaver.pam \ ${WRKSRC}/driver/xscreensaver.pam.in post-patch-NSFW-off: ${REINPLACE_CMD} -e 's|Dick Pix|Stuff|' ${WRKSRC}/hacks/bsod.c ${REINPLACE_CMD} -e 's|dick pics|data, etc.|' ${WRKSRC}/hacks/bsod.c post-install: ${INSTALL_DATA} ${FILESDIR}/x*.xml ${STAGEDIR}${DATADIR}/config/ ${INSTALL_DATA} ${WRKDIR}/*.desktop ${STAGEDIR}${PREFIX}/share/applications/ ${RM} ${STAGEDIR}${PREFIX}/etc/pam.d/xscreensaver.pam .include Index: head/x11/xscreensaver/files/patch-utils_xft.c =================================================================== --- head/x11/xscreensaver/files/patch-utils_xft.c (nonexistent) +++ head/x11/xscreensaver/files/patch-utils_xft.c (revision 472802) @@ -0,0 +1,21 @@ +--- utils/xft.c.orig 2018-06-17 08:45:55 UTC ++++ utils/xft.c +@@ -198,12 +198,12 @@ XftColorAllocValue (Display *dpy, + int green_shift, green_len; + int blue_shift, blue_len; + +- red_shift = maskbase (visual->rgba_masks[0]); +- red_len = masklen (visual->rgba_masks[0]); +- green_shift = maskbase (visual->rgba_masks[1]); +- green_len = masklen (visual->rgba_masks[1]); +- blue_shift = maskbase (visual->rgba_masks[2]); +- blue_len = masklen (visual->rgba_masks[2]); ++ red_shift = maskbase (visual->red_mask); ++ red_len = masklen (visual->red_mask); ++ green_shift = maskbase (visual->green_mask); ++ green_len = masklen (visual->green_mask); ++ blue_shift = maskbase (visual->blue_mask); ++ blue_len = masklen (visual->blue_mask); + result->pixel = (((color->red >> (16 - red_len)) << red_shift) | + ((color->green >> (16 - green_len)) << green_shift) | + ((color->blue >> (16 - blue_len)) << blue_shift)); Property changes on: head/x11/xscreensaver/files/patch-utils_xft.c ___________________________________________________________________ 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