diff --git a/deskutils/xmdiary/Makefile b/deskutils/xmdiary/Makefile index 786b0201125a..665de3c793f6 100644 --- a/deskutils/xmdiary/Makefile +++ b/deskutils/xmdiary/Makefile @@ -6,11 +6,11 @@ # PORTNAME= xmdiary -PORTVERSION= 3.0.1 +PORTVERSION= 3.0.3 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_XCONTRIB} MASTER_SITE_SUBDIR= office -DISTFILES= ${DISTNAME}.tar.gz xmdfix.gz +DISTFILES= ${DISTNAME}.tar.gz MAINTAINER= mi@aldan.algebra.com @@ -22,13 +22,6 @@ MAN1= xdaclunix.1 xdalarm.1 xdcustom.1 xddump.1 xdiary.1 xdinitdb.1 \ xdlight.1 xdnotify.1 xdprformat.1 xdremind.1 xdremove.1 \ xdrestore.1 -pre-patch: - @for node in `tar tzf ${DISTDIR}/xmdfix.gz` ; \ - do \ - test -f $(WRKSRC)/$$node && ${RM} -f $(WRKSRC)/$$node ; \ - done - cd $(WRKSRC) && tar xzpf ${DISTDIR}/xmdfix.gz - post-patch: @${ECHO_MSG} removing the "malloc.h" includes ${SCRIPTDIR}/nomalloc $(WRKSRC) 2>&1 > /dev/zero diff --git a/deskutils/xmdiary/distinfo b/deskutils/xmdiary/distinfo index 879e0335b5d5..e142a1e13338 100644 --- a/deskutils/xmdiary/distinfo +++ b/deskutils/xmdiary/distinfo @@ -1,2 +1 @@ -MD5 (xmdiary-3.0.1.tar.gz) = 0873b27a5dc385ce0566c53f25cdffeb -MD5 (xmdfix.gz) = 76dc4f4ee6db13f5b4e068a3a8f4ed99 +MD5 (xmdiary-3.0.3.tar.gz) = d3930a74c2c9d1757e5847555270f773 diff --git a/deskutils/xmdiary/files/patch-ab b/deskutils/xmdiary/files/patch-ab index 067a116d9801..9a3f20c9cfc3 100644 --- a/deskutils/xmdiary/files/patch-ab +++ b/deskutils/xmdiary/files/patch-ab @@ -38,13 +38,4 @@ +XDXMLIB = -L/usr/X11R6/lib - /*---------------------------------------------------------------------------- -@@ -155,7 +155,7 @@ - -- - -----------------------------------------------------------------------------*/ - --/* XDEXTRALIBS = */ -+XDEXTRALIBS = -lXext - - /*---------------------------------------------------------------------------- diff --git a/deskutils/xmdiary/files/patch-ac b/deskutils/xmdiary/files/patch-ac new file mode 100644 index 000000000000..50b561e99948 --- /dev/null +++ b/deskutils/xmdiary/files/patch-ac @@ -0,0 +1,11 @@ +--- dtools/xtmEditAclUx.c Sun May 4 18:25:10 1997 ++++ dtools/xtmEditAclUx.c Mon Jul 23 20:34:40 2001 +@@ -37,2 +37,3 @@ + ++#include + #include +--- xdremove/xtmRemove.c Sun May 4 18:02:15 1997 ++++ xdremove/xtmRemove.c Mon Jul 23 20:53:07 2001 +@@ -293 +293 @@ +- gets( buffer ); ++ fgets(buffer, sizeof(buffer), stdin); diff --git a/deskutils/xmdiary/pkg-plist b/deskutils/xmdiary/pkg-plist index aad5a07f4334..2427b17d7919 100644 --- a/deskutils/xmdiary/pkg-plist +++ b/deskutils/xmdiary/pkg-plist @@ -15,7 +15,6 @@ bin/xdremove bin/xdrestore lib/libTools.a lib/libXdiary.a -lib/libXdndbm.a lib/libXtools.a lib/X11/app-defaults/XDiary lib/X11/app-defaults/XDiary.map