svn commit: r474899 - in head/x11/xlockmore: . files
Jason Helfman
jgh at FreeBSD.org
Wed Jul 18 20:35:46 UTC 2018
Author: jgh
Date: Wed Jul 18 20:35:44 2018
New Revision: 474899
URL: https://svnweb.freebsd.org/changeset/ports/474899
Log:
- update to 5.55
- fix CLANG 6.0.0 compile issue [1]
- address DESTDIR and INSTALL_PROGRAM issues
PR: 225827
Submitted by: tobik@ [1 (patch)]
Reported by: ohartmann at walstatt.org [1]
Added:
head/x11/xlockmore/files/
head/x11/xlockmore/files/patch-xglock_xglock.c (contents, props changed)
Modified:
head/x11/xlockmore/Makefile
head/x11/xlockmore/distinfo
head/x11/xlockmore/pkg-plist
Modified: head/x11/xlockmore/Makefile
==============================================================================
--- head/x11/xlockmore/Makefile Wed Jul 18 20:26:04 2018 (r474898)
+++ head/x11/xlockmore/Makefile Wed Jul 18 20:35:44 2018 (r474899)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= xlockmore
-PORTVERSION= 5.54
-PORTREVISION= 2
+PORTVERSION= 5.55
CATEGORIES?= x11
MASTER_SITES= http://www.sillycycle.com/xlock/ \
LOCAL/jgh/x11/${PORTNAME}/
@@ -161,6 +160,8 @@ pre-extract:
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
Modified: head/x11/xlockmore/distinfo
==============================================================================
--- head/x11/xlockmore/distinfo Wed Jul 18 20:26:04 2018 (r474898)
+++ head/x11/xlockmore/distinfo Wed Jul 18 20:35:44 2018 (r474899)
@@ -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
Added: head/x11/xlockmore/files/patch-xglock_xglock.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/xlockmore/files/patch-xglock_xglock.c Wed Jul 18 20:35:44 2018 (r474899)
@@ -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.
+ *
Modified: head/x11/xlockmore/pkg-plist
==============================================================================
--- head/x11/xlockmore/pkg-plist Wed Jul 18 20:26:04 2018 (r474898)
+++ head/x11/xlockmore/pkg-plist Wed Jul 18 20:35:44 2018 (r474899)
@@ -2,8 +2,13 @@
@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
More information about the svn-ports-all
mailing list