5 files changed, 14 insertions, 55 deletions

diff --git a/misc/wmcalendar/Makefile b/misc/wmcalendar/Makefile
index c5ece828dc31..6298691841a6 100644
--- a/misc/wmcalendar/Makefile
+++ b/misc/wmcalendar/Makefile
@@ -6,26 +6,30 @@
 #
 
 PORTNAME=	wmcalendar
-PORTVERSION=	0.3.6
+PORTVERSION=	0.5.0
 CATEGORIES=	misc windowmaker
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		http://freebsd.nsu.ru/distfiles/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	danfe@regency.nsu.ru
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A dockable calendar with interface to iCalendar based calendars
 
 LIB_DEPENDS=	ical.0:${PORTSDIR}/devel/libical
 
-BUILD_WRKSRC=	${WRKSRC}/Src
+WRKSRC=		${WRKDIR}/${DISTNAME}/Src
 
-USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
 USE_XPM=	yes
+USE_GNOME=	gtk20
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" \
+		INCDIR="`pkg-config --cflags gtk+-2.0`" \
+		LIBDIR="`pkg-config --libs gtk+-2.0`" \
+		LIBS="-lical -lXpm"
 
 MAN1=		wmCalendar.1
 
 do-install:
-	@${INSTALL_PROGRAM} ${BUILD_WRKSRC}/wmCalendar ${PREFIX}/bin
-	@${INSTALL_MAN} ${BUILD_WRKSRC}/wmCalendar.1 ${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/wmCalendar ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/wmCalendar.1 ${MANPREFIX}/man/man1
 
 .include <bsd.port.mk>
diff --git a/misc/wmcalendar/distinfo b/misc/wmcalendar/distinfo
index e0fe611865b4..590c1120241e 100644
--- a/misc/wmcalendar/distinfo
+++ b/misc/wmcalendar/distinfo
@@ -1 +1 @@
-MD5 (wmcalendar-0.3.6.tar.gz) = 257e9ff06f3f16cef7bbe7ba0ae7bf32
+MD5 (wmcalendar-0.5.0.tar.gz) = bde2dfcbc8b94f9bbc60e45fc06b79b1
diff --git a/misc/wmcalendar/files/patch-Src::Makefile b/misc/wmcalendar/files/patch-Src::Makefile
deleted file mode 100644
index 7dd45b2bdaef..000000000000
--- a/misc/wmcalendar/files/patch-Src::Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
---- Src/Makefile.orig	Thu Apr 24 15:19:02 2003
-+++ Src/Makefile	Thu Apr 24 15:19:53 2003
-@@ -1,10 +1,10 @@
- CC     = gcc 
--INCLUDES = `gtk-config --cflags` -I. 
--LFLAGS = `gtk-config --libs`
--CFLAGS = -O2 -Wall 	 -pedantic $(INCLUDES) -DICON_TYPE=$(ICON_TYPE)
--INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
-+INCLUDES = `gtk12-config --cflags` -I. 
-+LFLAGS = `gtk12-config --libs`
-+CFLAGS =  $(INCLUDES) -DICON_TYPE=$(ICON_TYPE)
-+INCDIR = -I${X11BASE}/include/X11 -I${X11BASE}/include
- DESTDIR= /usr/local
--LIBDIR = -L/usr/lib -L/usr/X11R6/lib
-+LIBDIR = -L/usr/lib -L${X11BASE}/lib -L/usr/local/lib
- 
- # for Linux
- LIBS   = -lXpm -lX11 -lXext -lical
-@@ -17,7 +17,7 @@
- 		calendarfunc.o
- 
- .c.o:
--	$(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
-+	$(CC) $(CFLAGS) -D`uname -s` -DHAVE_SYS_TIME_H -c $< -o $*.o $(INCDIR)
- 
- 
- all:	wmCalendar.o wmCalendar
diff --git a/misc/wmcalendar/files/patch-Src::wmCalendar.c b/misc/wmcalendar/files/patch-Src::wmCalendar.c
deleted file mode 100644
index 9ab9d60ab593..000000000000
--- a/misc/wmcalendar/files/patch-Src::wmCalendar.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- Src/wmCalendar.c.orig	Thu Apr 24 16:23:05 2003
-+++ Src/wmCalendar.c	Thu Apr 24 16:23:15 2003
-@@ -55,6 +55,7 @@
-  -----------------------------------------------------*/
- void initValues(){
-     int i;
-+    XpmColorSymbol colors[2] = { {"Back0", NULL, 0}, {"Back1", NULL, 0} };
-     monthOffset = 0;
- 
-     /* Compute widths of months and digits */
-@@ -72,7 +73,6 @@
-     for (i = 0; i < 32; ++i) 
- 	datetype[i][1] = 0;
- 
--    XpmColorSymbol colors[2] = { {"Back0", NULL, 0}, {"Back1", NULL, 0} };
-     dockapp_set_eventmask();
-     dockapp_xpm2pixmap( wmCalendar_master2_xpm, &bg[1], &mask, colors, 0);
-     dockapp_xpm2pixmap( wmCalendar_master_xpm, &bg[0], &mask, colors, 0);
diff --git a/misc/wmcalendar/pkg-descr b/misc/wmcalendar/pkg-descr
index cffeb64f3878..5d6523ae8ce2 100644
--- a/misc/wmcalendar/pkg-descr
+++ b/misc/wmcalendar/pkg-descr
@@ -1,4 +1,4 @@
 A dockapp calendar with monthly view and interface to iCalendar based
 calendars like Ximian Evolution or Mozilla calendar.
 
-WWW: http://sourceforge.net/projects/wmcalendar/
+WWW: http://wmcalendar.sourceforge.net/