Index: branches/2018Q3/x11/xlockmore/Makefile =================================================================== --- branches/2018Q3/x11/xlockmore/Makefile (revision 474900) +++ branches/2018Q3/x11/xlockmore/Makefile (revision 474901) @@ -1,171 +1,172 @@ # Created by: Scott Mace # $FreeBSD$ PORTNAME= xlockmore -PORTVERSION= 5.54 -PORTREVISION= 2 +PORTVERSION= 5.55 CATEGORIES?= x11 MASTER_SITES= http://www.sillycycle.com/xlock/ \ LOCAL/jgh/x11/${PORTNAME}/ MAINTAINER= jgh@FreeBSD.org COMMENT= Like XLock session locker/screen saver, but just more LICENSE= BSD2CLAUSE USES= tar:xz GNU_CONFIGURE= yes CONFIGURE_ARGS= --without-motif --without-ttf --without-editres \ --without-dtsaver --without-rplay --without-nas \ --without-gtk --without-esound --disable-setuid USE_GNOME= # USE_XORG= x11 xaw ice sm xpm xext xinerama LIB_DEPENDS+= libfreetype.so:print/freetype2 OPTIONS_DEFINE= MESAGL MB SYSLOG DISABLE_ALLOW_ROOT NICE_ONLY BLANK_ONLY \ KERBEROS4 BAD_PAM GTK2 TIME_BOMB CUSTOMIZATION MAGICK JP \ XINERAMA OPTIONS_DEFAULT= XINERAMA OPTIONS_SUB= yes MESAGL_DESC= Mesa 3D (for GL modes) MB_DESC= Xmb function series SYSLOG_DESC= Syslog logging DISABLE_ALLOW_ROOT_DESC= Allows users to turn off allowroot NICE_ONLY_DESC= Only low cpu modes BLANK_ONLY_DESC= Blank mode only (boring) BAD_PAM_DESC= Xlock will ask PAM with root rights GTK2_DESC= Build Gtk2 graphical shell XLOCK_GROUP_DESC= Allow xlock group to logout TIME_BOMB_DESC= Allow autologout CUSTOMIZATION_DESC= Allow tune through resource file JP_DESC= Japanese Language Support OPTIONS_RADIO= ONE OPTIONS_RADIO_ONE= PAM XLOCK_GROUP NO_OPTIONS_SORT=yes MAKE_ARGS+= bindir=${PREFIX}/bin \ mandir=${PREFIX}/man/man1 \ datarootdir=${PREFIX}/share \ xapploaddir=${PREFIX}/lib/X11/app-defaults .include .if ${PORT_OPTIONS:MKERBEROS4} CONFIGURE_ARGS+=--enable-kerberos4 KRB4LIB= -lcom_err -lcrypto .endif .if defined(KRB5_HOME) && exists(${KRB5_HOME}) CONFIGURE_ARGS+=--enable-kerberos5 CFLAGS+= -I${KRB5_HOME}/include KRB5LIB= -L${KRB5_HOME}/lib .endif .if ${PORT_OPTIONS:MMESAGL} CONFIGURE_ARGS+= --with-mesa MESALIB= -lpthread USE_GL= yes LIB_DEPENDS+= libftgl.so:graphics/ftgl CFLAGS+= -I${LOCALBASE}/include/FTGL -I${LOCALBASE}/include/freetype2 .else CONFIGURE_ARGS+= --without-mesa --without-opengl --without-ftgl .endif .if ${PORT_OPTIONS:MNICE_ONLY} CONFIGURE_ARGS+= --enable-nice-only .endif .if ${PORT_OPTIONS:MBAD_PAM} CONFIGURE_ARGS+= --enable-bad-pam .endif .if ${PORT_OPTIONS:MPAM} CONFIGURE_ARGS+= --enable-pam .endif .if ${PORT_OPTIONS:MNICE_ONLY} CONFIGURE_ARGS+= --enable-nice-only .endif .if ${PORT_OPTIONS:MBLANK_ONLY} CONFIGURE_ARGS+= --enable-blank-only .endif .if ${PORT_OPTIONS:MMB} CONFIGURE_ARGS+= --enable-use-mb .endif .if ${PORT_OPTIONS:MJP} XLOCKMORE_LANG= ja CATEGORIES+= japanese PORT_OPTIONS+= MB .endif .if defined(XLOCKMORE_LANG) CONFIGURE_ARGS+= --with-lang=${XLOCKMORE_LANG} .endif .if ${PORT_OPTIONS:MSYSLOG} CONFIGURE_ARGS+= --enable-syslog .endif .if ${PORT_OPTIONS:MGTK2} CONFIGURE_ARGS+= --with-gtk2 USE_GNOME+= gtk20 .else CONFIGURE_ARGS+= --without-gtk2 .endif .if ${PORT_OPTIONS:MXLOCK_GROUP} CONFIGURE_ARGS+= --enable-xlock-group .endif .if ${PORT_OPTIONS:MTIME_BOMB} CONFIGURE_ARGS+= --enable-bomb .else CONFIGURE_ARGS+= --disable-bomb .endif .if ${PORT_OPTIONS:MCUSTOMIZATION} CONFIGURE_ARGS+= --enable-customization .endif .if ${PORT_OPTIONS:MMAGICK} LIB_DEPENDS+= libMagickCore-6.so:graphics/ImageMagick .else CONFIGURE_ARGS+= --without-magick .endif CONFIGURE_ENV+= XLOCKLIBS="${KRB5LIB} ${KRB4LIB} ${MESALIB}" .if ${PORT_OPTIONS:MDISABLE_ALLOW_ROOT} CONFIGURE_ARGS+= --disable-allow-root .endif .if ${PORT_OPTIONS:MXINERAMA} CONFIGURE_ARGS+= --with-xinerama .endif .if ${PORT_OPTIONS:MPAM} && empty(PORT_OPTIONS:MBAD_PAM) pre-extract: @${ECHO} @${ECHO} "You have enabled PAM support. If you want to authenticate against" @${ECHO} "root only accessible PAM modules then define WITH_BAD_PAM=yes also." @${ECHO} "For example, pam_unix requires root rights to access shadow passwords." @${ECHO} .endif post-patch: @${REINPLACE_CMD} -e '/xglockrc/ s|PROGRAM|DATA|' ${WRKSRC}/xglock/Makefile.in + @${REINPLACE_CMD} -e 's|$$(SOUNDPATH)|$$(DESTDIR)$$(SOUNDPATH)|g' ${WRKSRC}/modes/Makefile.in + @${REINPLACE_CMD} -e '/$$(ETCDIR)play.sh/ s|$$(INSTALL_PROGRAM)|$$(INSTALL_PROGRAM:N-s)|' ${WRKSRC}/modes/Makefile.in .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1100000 @${REINPLACE_CMD} -e 's|/usr/games/fortune|/usr/bin/fortune|' ${WRKSRC}/modes/Makefile.in .endif post-configure: @${REINPLACE_CMD} -e 's/-lXdpms//g' ${WRKSRC}/modes/Makefile .include Index: branches/2018Q3/x11/xlockmore/distinfo =================================================================== --- branches/2018Q3/x11/xlockmore/distinfo (revision 474900) +++ branches/2018Q3/x11/xlockmore/distinfo (revision 474901) @@ -1,3 +1,3 @@ -TIMESTAMP = 1501006779 -SHA256 (xlockmore-5.54.tar.xz) = 9f4facb9721cc01450db0c11ffecd26a739b046e425e02628831a66080a0af55 -SIZE (xlockmore-5.54.tar.xz) = 1647652 +TIMESTAMP = 1531500962 +SHA256 (xlockmore-5.55.tar.xz) = d4f1fa5b19efc20262d77207636aa54fc66ba40aa867119f03a15981b3396ef8 +SIZE (xlockmore-5.55.tar.xz) = 1650116 Index: branches/2018Q3/x11/xlockmore/files/patch-xglock_xglock.c =================================================================== --- branches/2018Q3/x11/xlockmore/files/patch-xglock_xglock.c (nonexistent) +++ branches/2018Q3/x11/xlockmore/files/patch-xglock_xglock.c (revision 474901) @@ -0,0 +1,30 @@ +--- xglock/xglock.c.orig 2017-01-06 05:18:57 UTC ++++ xglock/xglock.c +@@ -1,3 +1,27 @@ ++Assertion failed: (SE.DT.dominates(Ret, &*BIP)), function ReuseOrCreateCast, file /usr/src/contrib/llvm/lib/Analysis/ScalarEvolutionExpander.cpp, line 83. ++cc: error: unable to execute command: Abort trap (core dumped) ++cc: error: clang frontend command failed due to signal (use -v to see invocation) ++ ++--- xglock/xglock.c.orig 2018-07-08 11:29:53 UTC +++++ xglock/xglock.c ++@@ -1489,7 +1489,7 @@ static void ++ create_boolOptions_buttons(GtkScrolledWindow *parent) ++ { ++ gint i; ++- gpointer iptr = 0; +++ guint iptr = 0; ++ GtkWidget *box0; ++ GtkWidget *box1; ++ GtkWidget *box2; ++@@ -1514,7 +1514,7 @@ create_boolOptions_buttons(GtkScrolledWindow *parent) ++ gtk_box_pack_start(GTK_BOX(i%2 ? box1 : box2), button, TRUE, TRUE, 0); ++ gtk_signal_connect(GTK_OBJECT(button), "clicked", ++ (GtkSignalFunc) bool_option_clicked_cb, ++- iptr++); +++ GUINT_TO_POINTER(iptr++)); ++ gtk_widget_show(button); ++ } ++ } + /*- + * xglock.c - main file for xglock, the GTK+ gui interface to xlock. + * Property changes on: branches/2018Q3/x11/xlockmore/files/patch-xglock_xglock.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 Index: branches/2018Q3/x11/xlockmore/pkg-plist =================================================================== --- branches/2018Q3/x11/xlockmore/pkg-plist (revision 474900) +++ branches/2018Q3/x11/xlockmore/pkg-plist (revision 474901) @@ -1,9 +1,14 @@ %%GTK2%%bin/xglock @mode 4111 @owner root bin/xlock +bin/play.sh @mode @owner lib/X11/app-defaults/XLock man/man1/xlock.1.gz +share/xlock/sounds/complete.au +share/xlock/sounds/identify-please.au +share/xlock/sounds/not-programmed.au +share/xlock/sounds/thank-you.au %%GTK2%%share/xlock/xglockrc Index: branches/2018Q3 =================================================================== --- branches/2018Q3 (revision 474900) +++ branches/2018Q3 (revision 474901) Property changes on: branches/2018Q3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r474899