- Fix build with clang
Responsible Changed From-To: freebsd-ports-bugs->pawel I'll take it.
Author: pawel Date: Fri Dec 20 19:09:05 2013 New Revision: 337078 URL: http://svnweb.freebsd.org/changeset/ports/337078 Log: Fix build with clang PR: ports/184878 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Modified: head/x11/tycoon/Makefile (contents, props changed) head/x11/tycoon/files/patch-ac (contents, props changed) head/x11/tycoon/pkg-descr (contents, props changed) Modified: head/x11/tycoon/Makefile ============================================================================== --- head/x11/tycoon/Makefile Fri Dec 20 19:02:51 2013 (r337077) +++ head/x11/tycoon/Makefile Fri Dec 20 19:09:05 2013 (r337078) @@ -5,24 +5,25 @@ PORTNAME= tycoon 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> Modified: head/x11/tycoon/files/patch-ac ============================================================================== --- head/x11/tycoon/files/patch-ac Fri Dec 20 19:02:51 2013 (r337077) +++ head/x11/tycoon/files/patch-ac Fri Dec 20 19:09:05 2013 (r337078) @@ -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,15 @@ +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); @@\ + Modified: head/x11/tycoon/pkg-descr ============================================================================== --- head/x11/tycoon/pkg-descr Fri Dec 20 19:02:51 2013 (r337077) +++ head/x11/tycoon/pkg-descr Fri Dec 20 19:09:05 2013 (r337078) @@ -4,5 +4,5 @@ is remembered and restored on the next r Right now I have put into tycoon support for OffiX drag-and-drop, so now you can drag icons from the OffiX filemanager into tycoon -icons and have apppropriate action invoked. Check out OffiX, it's +icons and have appropriate action invoked. Check out OffiX, it's very fine package. _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
State Changed From-To: open->closed Committed. Thanks!
Author: mat Date: Sat Dec 21 10:20:51 2013 New Revision: 337121 URL: http://svnweb.freebsd.org/changeset/ports/337121 Log: MFH: r337078 Fix build with clang PR: ports/184878 Submitted by: KATO Tsuguru <tkato432@yahoo.com> Approved by: portmgr (implicit) Modified: branches/2014Q1/x11/tycoon/Makefile (contents, props changed) branches/2014Q1/x11/tycoon/files/patch-ac (contents, props changed) branches/2014Q1/x11/tycoon/pkg-descr (contents, props changed) Directory Properties: branches/2014Q1/ (props changed) Modified: branches/2014Q1/x11/tycoon/Makefile ============================================================================== --- branches/2014Q1/x11/tycoon/Makefile Sat Dec 21 10:09:12 2013 (r337120) +++ branches/2014Q1/x11/tycoon/Makefile Sat Dec 21 10:20:51 2013 (r337121) @@ -5,24 +5,25 @@ PORTNAME= tycoon 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> Modified: branches/2014Q1/x11/tycoon/files/patch-ac ============================================================================== --- branches/2014Q1/x11/tycoon/files/patch-ac Sat Dec 21 10:09:12 2013 (r337120) +++ branches/2014Q1/x11/tycoon/files/patch-ac Sat Dec 21 10:20:51 2013 (r337121) @@ -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,15 @@ +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); @@\ + Modified: branches/2014Q1/x11/tycoon/pkg-descr ============================================================================== --- branches/2014Q1/x11/tycoon/pkg-descr Sat Dec 21 10:09:12 2013 (r337120) +++ branches/2014Q1/x11/tycoon/pkg-descr Sat Dec 21 10:20:51 2013 (r337121) @@ -4,5 +4,5 @@ is remembered and restored on the next r Right now I have put into tycoon support for OffiX drag-and-drop, so now you can drag icons from the OffiX filemanager into tycoon -icons and have apppropriate action invoked. Check out OffiX, it's +icons and have appropriate action invoked. Check out OffiX, it's very fine package. _______________________________________________ svn-ports-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-ports-all To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"