Date: Tue, 17 Dec 2013 02:51:56 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/184878: x11/tycoon: Fix build with clang Message-ID: <20131217025156.1dec2c0870e992cc9ad82e2e@yahoo.com> Resent-Message-ID: <201312161810.rBGIAMuo016444@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 184878
>Category: ports
>Synopsis: x11/tycoon: Fix build with clang
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Dec 16 18:10:21 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/x11/tycoon/Makefile x11/tycoon/Makefile
--- /usr/ports/x11/tycoon/Makefile 2013-11-06 21:55:56.000000000 +0900
+++ x11/tycoon/Makefile 2013-12-17 00:00:00.000000000 +0900
@@ -5,24 +5,25 @@
PORTVERSION= 1.07o
PORTREVISION= 5
CATEGORIES= x11
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= X11/desktop
+MASTER_SITES= SUNSITE/X11/desktop
MAINTAINER= ports@FreeBSD.org
COMMENT= Nifty set of desktop apps, including floating buttons
-LIB_DEPENDS= forms.2:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS= libforms.so:${PORTSDIR}/x11-toolkits/xforms
USES= imake
USE_XORG= xaw
-REINPLACE_ARGS= -i ""
-NO_STAGE= yes
post-patch:
- ${RM} -f ${WRKSRC}/xbackdrop/backdrops/index~
- ${REINPLACE_CMD} -e 's,/usr/lib,${PREFIX}/lib,' \
+ @${REINPLACE_CMD} -e 's,/usr/lib,${PREFIX}/lib,' \
${WRKSRC}/xbackdrop/backdrops/index
- ${FIND} ${WRKSRC} -name '*.c' -type f | ${XARGS} ${REINPLACE_CMD} -e \
+ @${REINPLACE_CMD} -e 's|^update_file|void update_file|' \
+ ${WRKSRC}/xchooser/xchooser.c
+ @${FIND} ${WRKSRC} -name '*.c' -type f | ${XARGS} ${REINPLACE_CMD} -e \
's,FL_REVISION>=80,FL_REVISION >= 80 || FL_VERSION != 0,g'
+pre-configure:
+ @${RM} -f ${WRKSRC}/xbackdrop/backdrops/index?*
+
.include <bsd.port.mk>
diff -urN /usr/ports/x11/tycoon/files/patch-ac x11/tycoon/files/patch-ac
--- /usr/ports/x11/tycoon/files/patch-ac 2013-11-06 21:55:56.000000000 +0900
+++ x11/tycoon/files/patch-ac 2013-12-17 00:00:00.000000000 +0900
@@ -1,6 +1,6 @@
--- xbackdrop/Imakefile.orig Sat Mar 9 22:41:13 1996
+++ xbackdrop/Imakefile Wed Nov 1 08:19:17 2000
-@@ -1,24 +1,28 @@
+@@ -1,26 +1,27 @@
-XBACKDROP_DIR = /usr/lib/X11/backdrops
+XCOMM
+XCOMM FBSD--SF--I'm not sure about this location--backdrops??
@@ -28,12 +28,16 @@
+ComplexProgramTargetNoMan(xbackdrop)
-install:: xbackdrop @@\
-+install:: xbackdrop @@\
- @if [ -d $(XBACKDROP_DIR) ]; then set +x; \ @@\
- else (set -x; $(MKDIRHIER) $(XBACKDROP_DIR)); fi @@\
- cp backdrops/?* $(XBACKDROP_DIR); @@\
+- @if [ -d $(XBACKDROP_DIR) ]; then set +x; \ @@\
+- else (set -x; $(MKDIRHIER) $(XBACKDROP_DIR)); fi @@\
+- cp backdrops/?* $(XBACKDROP_DIR); @@\
- chown root.root $(XBACKDROP_DIR) $(XBACKDROP_DIR)/?*; @@\
-+ chown root:daemon $(XBACKDROP_DIR) $(XBACKDROP_DIR)/?*; @@\
- chmod 0755 $(XBACKDROP_DIR); @@\
- chmod 0644 $(XBACKDROP_DIR)/?*; @@\
+- chmod 0755 $(XBACKDROP_DIR); @@\
+- chmod 0644 $(XBACKDROP_DIR)/?*; @@\
++install:: xbackdrop @@\
++ @if [ -d $(DESTDIR)$(XBACKDROP_DIR) ]; then set +x; \ @@\
++ else (set -x; $(MKDIRHIER) $(DESTDIR)$(XBACKDROP_DIR)); fi @@\
++ $(INSTALL) $(INSTALLFLAGS) $(INSTDATFLAGS) backdrops/?* $(DESTDIR)$(XBACKDROP_DIR); @@\
+
+
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20131217025156.1dec2c0870e992cc9ad82e2e>