sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-05-24 23:16:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Remove USE_GCC and fix build with clang.

Browse source 
- Replace nomalloc script with REINPLACE_CMD.
- Remove noextradepend script.  It is no longer needed.

PR:		ports/181820
Approved by:	maintainer timeout (3 months)
This commit is contained in:
Tijl Coosemans 2013-12-03 19:12:34 +00:00
parent b517565d8c
commit fa8d0e0266
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=335588
4 changed files with 16 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
deskutils/xmdiary/Makefile
View file

@ -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 utility
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 xddump.1 xdiary.1 xdinitdb.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'

18
deskutils/xmdiary/files/patch-warnings
View file

@ -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

15
deskutils/xmdiary/scripts/noextradepend
View file

@ -1,15 +0,0 @@
#!/bin/sh
for f in `find $1 -type f -name Imakefile -print | xargs grep -l Library.tmpl`
do
patch -p << END_OF_PATCH
--- $f.orig
+++ $f
@@ -30,1 +30,1 @@
-DependTarget()
+/* DependTarget() -- Library.tmpl contains this now */
END_OF_PATCH
done

15
deskutils/xmdiary/scripts/nomalloc
View file

@ -1,15 +0,0 @@
#!/bin/sh
for f in `find $1 -type f -name \*.\[ch\] -print | xargs grep -l malloc.h`
do
patch -p0 << END_OF_PATCH
+++ $f
@@ -10,1 +10,1 @@
-#include <malloc.h>
+#include <stdlib.h>
END_OF_PATCH
done