The attached patch removes USE_GCC=any and fixes the build with clang (change "unsigned int argc" into "int argc"). It also removes the scripts directory. The scripts do not work with the new patch in current. The nomalloc script is replaced with a REINPLACE_CMD and the noextradepend script no longer seems to be necessary.
Responsible Changed From-To: freebsd-ports-bugs->mi mi@aldan.algebra.com => mi@ (via the GNATS Auto Assign Tool)
Maintainer of deskutils/xmdiary, Please note that PR ports/181820 has just been submitted. If it contains a patch for an upgrade, an enhancement or a bug fix you agree on, reply to this email stating that you approve the patch and a committer will take care of it. The full text of the PR can be found at: http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/181820 -- Edwin Groothuis via the GNATS Auto Assign Tool edwin@FreeBSD.org
State Changed From-To: open->feedback Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Author: tijl Date: Tue Dec 3 19:12:34 2013 New Revision: 335588 URL: http://svnweb.freebsd.org/changeset/ports/335588 Log: - Remove USE_GCC and fix build with clang. - Replace nomalloc script with REINPLACE_CMD. - Remove noextradepend script. It is no longer needed. PR: ports/181820 Approved by: maintainer timeout (3 months) Deleted: head/deskutils/xmdiary/scripts/ Modified: head/deskutils/xmdiary/Makefile head/deskutils/xmdiary/files/patch-warnings Modified: head/deskutils/xmdiary/Makefile ============================================================================== --- head/deskutils/xmdiary/Makefile Tue Dec 3 19:08:47 2013 (r335587) +++ head/deskutils/xmdiary/Makefile Tue Dec 3 19:12:34 2013 (r335588) @@ -3,7 +3,7 @@ PORTNAME= xmdiary PORTVERSION= 3.0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= office @@ -15,7 +15,6 @@ COMMENT= Personal and group calendar uti NO_CDROM= Don't sell for profit EXTRACT_ONLY= ${DISTNAME}.tar.gz USES= imake motif -USE_GCC= any USE_XORG= x11 xext xp xpm xt MAN1= xdaclunix.1 xdalarm.1 xdcustom.1 xddump.1 xdiary.1 xdinitdb.1 \ xdlight.1 xdnotify.1 xdprformat.1 xdremind.1 xdremove.1 \ @@ -23,10 +22,9 @@ MAN1= xdaclunix.1 xdalarm.1 xdcustom.1 NO_STAGE= yes post-patch: - @${ECHO_MSG} removing the "malloc.h" includes - ${SH} ${SCRIPTDIR}/nomalloc $(WRKSRC) 2>&1 > /dev/zero - @${ECHO_MSG} removing unnecessary DependTarget from Imakefile-s - ${SH} ${SCRIPTDIR}/noextradepend $(WRKSRC) 2>&1 > /dev/zero + @${REINPLACE_CMD} -e 's/malloc\.h/stdlib.h/' \ + ${WRKSRC}/tools/LstLinked.c ${WRKSRC}/tools/System.c \ + ${WRKSRC}/xtools/xitClipboard.c ${WRKSRC}/xtools/xitInfoFile.c ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e 's|CcCmd gcc|CcCmd ${CC}|' '${WRKSRC}/XDiary.tmpl' Modified: head/deskutils/xmdiary/files/patch-warnings ============================================================================== --- head/deskutils/xmdiary/files/patch-warnings Tue Dec 3 19:08:47 2013 (r335587) +++ head/deskutils/xmdiary/files/patch-warnings Tue Dec 3 19:12:34 2013 (r335588) @@ -524,8 +524,9 @@ ----------------------------------------------------------------------------*/ -void +- main( unsigned int argc, char *argv[] ) +int - main( unsigned int argc, char *argv[] ) ++ main( int argc, char *argv[] ) { --- xdalarm/xtmAlarmProc.c 1997-05-04 18:02:19.000000000 -0400 +++ xdalarm/xtmAlarmProc.c 2013-03-27 21:54:22.000000000 -0400 @@ -533,8 +534,9 @@ ----------------------------------------------------------------------------*/ -void +- main( unsigned int argc, char *argv[] ) +int - main( unsigned int argc, char *argv[] ) ++ main( int argc, char *argv[] ) { --- xdcustom/xtmCustom.c 1997-05-04 18:02:16.000000000 -0400 +++ xdcustom/xtmCustom.c 2013-03-27 21:55:45.000000000 -0400 @@ -542,8 +544,9 @@ ----------------------------------------------------------------------------*/ -void +- main( unsigned int argc, char *argv[] ) +int - main( unsigned int argc, char *argv[] ) ++ main( int argc, char *argv[] ) { @@ -616,5 +616,5 @@ @@ -586,8 +589,9 @@ ----------------------------------------------------------------------------*/ -void +- main( unsigned int argc, char **argv ) +int - main( unsigned int argc, char **argv ) ++ main( int argc, char **argv ) { --- xdnotify/xtmNotify.c 1997-05-04 18:02:15.000000000 -0400 +++ xdnotify/xtmNotify.c 2013-03-27 21:57:28.000000000 -0400 @@ -595,8 +599,9 @@ ----------------------------------------------------------------------------*/ -void +- main( unsigned int argc, char *argv[] ) +int - main( unsigned int argc, char *argv[] ) ++ main( int argc, char *argv[] ) { --- xdprformat/xtmPrFormat.c 1997-05-04 18:02:15.000000000 -0400 +++ xdprformat/xtmPrFormat.c 2013-03-27 21:58:19.000000000 -0400 @@ -612,8 +617,9 @@ ----------------------------------------------------------------------------*/ -void +- main( unsigned int argc, char *argv[] ) +int - main( unsigned int argc, char *argv[] ) ++ main( int argc, char *argv[] ) { --- xdrestore/xtmRestore.c 1997-05-04 18:02:14.000000000 -0400 +++ xdrestore/xtmRestore.c 2013-03-27 21:59:54.000000000 -0400 _______________________________________________ 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: feedback->closed Committed in r335588.