- Update to 2.2.1

- Provide WITH_GTK2 tunable

PR:		ports/96218
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

3 files changed, 53 insertions, 21 deletions

diff --git a/mail/wmmaiload/Makefile b/mail/wmmaiload/Makefile
index dce33bd33ea6..0df5afc50f78 100644
--- a/mail/wmmaiload/Makefile
+++ b/mail/wmmaiload/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	wmmaiload
-PORTVERSION=	1.0.3
-PORTREVISION=	1
+PORTVERSION=	2.2.1
 CATEGORIES=	mail windowmaker
 MASTER_SITES=	http://tnemeth.free.fr/projets/programmes/
 
@@ -16,16 +15,59 @@ COMMENT=	Incoming mail monitor dockapp with a similar look to wmcpuload
 
 USE_X_PREFIX=	yes
 USE_XPM=	yes
-USE_GNOME=	gtk12
-USE_REINPLACE=	yes
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--program-prefix=""
+USE_OPENSSL=	yes
+USE_GMAKE=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--prefix=${PREFIX}
+MAKE_ARGS=	CC="${CC}" \
+		CFLAGS="${CFLAGS} -D_GNU_SOURCE ${PTHREAD_CFLAGS}" \
+		CPPFLAGS="-I${X11BASE}/include" \
+		LDFLAGS="-L${X11BASE}/lib" \
+		LIB_SSL="-lssl -lcrypto" \
+		LIB_THREADS="${PTHREAD_LIBS}" \
+		DEBUG_CFLAGS="-I${OPENSSLINC}" \
+		DEBUG_LDFLAGS="-L${OPENSSLLIB}"
 
 MAN1=		${PORTNAME}.1 ${PORTNAME}-config.1
 PLIST_FILES=	bin/wmmaiload bin/wmmaiload-config
 
+.if defined(WITH_GTK2)
+USE_GNOME+=	gtk20
+MAKE_ARGS+=	GTK_CFLAGS="pkg-config --cflags gtk+-2.0" \
+		GTK_LIBS="pkg-config --libs gtk+-2.0"
+.else
+USE_GNOME+=	gtk12
+MAKE_ARGS+=	GTK_CFLAGS="pkg-config --cflags gtk+" \
+		GTK_LIBS="pkg-config --libs gtk+"
+.endif
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|gtk-config|${GTK_CONFIG}|g' \
-		${WRKSRC}/wmmaiload-config/Makefile.in
+.for i in wmmaiload/Init.make
+	@${REINPLACE_CMD} -e 's|-L/usr/X11R6/lib||g' ${WRKSRC}/${i}
+.endfor
+.for i in wmmaiload/checkthread.c
+	@${REINPLACE_CMD} -e 's|isnumber(|isnum(|g' ${WRKSRC}/${i}
+.endfor
+.for i in wmmaiload/main.h
+	@${REINPLACE_CMD} -e '/time\.h>/d' ${WRKSRC}/${i}
+.endfor
+.for i in wmmaiload-config/Init.make
+	@${REINPLACE_CMD} -e 's|gtk-config --cflags|$${GTK_CFLAGS}|g ; \
+		 s|gtk-config --libs|$${GTK_LIBS}|g' ${WRKSRC}/${i}
+.endfor
+.for i in wmmaiload-config/dialogs.c wmmaiload-config/mainwindow.c \
+	wmmaiload-config/popedit.c
+	@${REINPLACE_CMD} -e 's|_widget_draw_default|_widget_queue_draw|g ; \
+		 s|remove;|rm;|g ; \
+		 s|remove,|rm,|g ; \
+		 s|remove =|rm =|g ; \
+		 s|PACKAGE"-config"|PACKAGE|g' ${WRKSRC}/${i}
+.endfor
+
+do-install:
+.for i in wmmaiload wmmaiload-config
+	${INSTALL_PROGRAM} ${WRKSRC}/${i}/${i} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/${i}.1 ${MANPREFIX}/man/man1
+.endfor
 
 .include <bsd.port.mk>
diff --git a/mail/wmmaiload/distinfo b/mail/wmmaiload/distinfo
index 4495082e898b..47054cf07b87 100644
--- a/mail/wmmaiload/distinfo
+++ b/mail/wmmaiload/distinfo
@@ -1,3 +1,3 @@
-MD5 (wmmaiload-1.0.3.tar.gz) = 8bbbd43a1de2f1c2cf96fc529f3ed8c3
-SHA256 (wmmaiload-1.0.3.tar.gz) = cf68d4e9302dd93d3dafa18a39dd927fd617a2cce1f0b585970dd2e8816d019f
-SIZE (wmmaiload-1.0.3.tar.gz) = 113586
+MD5 (wmmaiload-2.2.1.tar.gz) = 4ad615d763e6346aec72e856676ad28a
+SHA256 (wmmaiload-2.2.1.tar.gz) = f8f281590c238a713d38825b698931bf73459125eb47bbba8c2e1d8ff1b11d3f
+SIZE (wmmaiload-2.2.1.tar.gz) = 183538
diff --git a/mail/wmmaiload/files/patch-src::imapclient.c b/mail/wmmaiload/files/patch-src::imapclient.c
deleted file mode 100644
index 85cc3361d254..000000000000
--- a/mail/wmmaiload/files/patch-src::imapclient.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/imapclient.c.orig	Sun Nov 28 06:16:30 2004
-+++ src/imapclient.c	Sun Nov 28 06:16:01 2004
-@@ -10,6 +10,7 @@
- #include <stdlib.h>
- #include <unistd.h>
- #include <sys/select.h>
-+#include <sys/time.h>
- 
- #include "imapclient.h"
-