- Update to 0.8

- Respect PREFIX
- Use PLIST_FILES for small pkg-plist
- Update pkg-descr

PR:		ports/109504
Submitted by:	Martin Tournoij <carpetsmoker at xs4all.nl>
Approved by:	maintainer timeout (15 days)

4 files changed, 49 insertions, 23 deletions

diff --git a/graphics/comical/Makefile b/graphics/comical/Makefile
index e4f0e58c92c..6757f5eebac 100644
--- a/graphics/comical/Makefile
+++ b/graphics/comical/Makefile
@@ -6,29 +6,46 @@
 #
 
 PORTNAME=	comical
-PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTVERSION=	0.8
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.mcaree.org/Comical/ \
-		http://www.sketchyorigins.com/Comical/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	john@mcaree.org
 COMMENT=	A sequential image viewer
 
+LIB_DEPENDS=	unrar.3:${PORTSDIR}/archivers/libunrar
+
 USE_GMAKE=	yes
-USE_WX=		2.4
-WX_CONF_ARGS=	absolute
-GNU_CONFIGURE=	yes
-USE_X_PREFIX=	yes
+USE_WX=		2.6+
+WX_PREMK=	yes
+WX_UNICODE=	yes
+PLIST_FILES=	bin/comical
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386"
-BROKEN=		"does not compile - not 64-bit clean"
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \
+		s|\`wx-config --cxx\`|${CXX}|; \
+		s|wx-config|${WX_CONFIG}|; \
+		s|unrar/libunrar.a u|u|; \
+		s|-lunrar|-L${LOCALBASE}/lib -lunrar|;' \
+			${WRKSRC}/Makefile
+
+	@${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|; \
+		s|-D_UNIX|-D_UNIX -DwxUSE_UNICODE|; \
+		s|CFLAGS =|CFLAGS=${CFLAGS} |; \
+		s|CPPFLAGS =|CPPFLAGS=${CXXFLAGS} |; \
+		s|$$(CC)|${CXX}|; \
+		s|-I../unrar|-I${LOCALBASE}/include/libunrar3|;' \
+			${WRKSRC}/src/Makefile
+	
+	@${REINPLACE_CMD} -e 's|gcc|${CC}|; \
+		s|CFLAGS=|CFLAGS+=|;' \
+			${WRKSRC}/unzip/Makefile
 
-.if ${OSVERSION} < 500000
-BROKEN=		"does not compile with gcc-2.95"
+.if ${WX_VERSION} == "2.8"
+	@${REINPLACE_CMD} -e 's|frame->SetIcon|//frame->SetIcon|' ${WRKSRC}/src/ComicalApp.cpp
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/graphics/comical/distinfo b/graphics/comical/distinfo
index aa211c7bb52..f88f477339e 100644
--- a/graphics/comical/distinfo
+++ b/graphics/comical/distinfo
@@ -1,3 +1,3 @@
-MD5 (comical-0.4.1.tar.gz) = 50e0f3a8ad252470461efe74a6ca6060
-SHA256 (comical-0.4.1.tar.gz) = 0b2ac1db7aa4303423e2cf8d0e786214fd093cdda62f8b5d2e0f10a99d566bf7
-SIZE (comical-0.4.1.tar.gz) = 404828
+MD5 (comical-0.8.tar.gz) = f5808e28fd5a2a3d21b59cdad10eca3d
+SHA256 (comical-0.8.tar.gz) = 0b6527cc06b25a937041f1eb248d0fd881cf055362097036b939817f785ab85e
+SIZE (comical-0.8.tar.gz) = 480270
diff --git a/graphics/comical/pkg-descr b/graphics/comical/pkg-descr
index 1d86fe1c3a7..b88f5758dda 100644
--- a/graphics/comical/pkg-descr
+++ b/graphics/comical/pkg-descr
@@ -1,8 +1,18 @@
-Comical is a sequential image viewer. It supports viewing images from archives
-(bzip, zip and rar format), as well as fullscreen viewing. Image formats
-supported are JPEG, PNG, GIF, and TIFF.
+Finally - a cross-platform, open-source CBR and CBZ reader!  Read your
+favorite scanned comic books and graphic novels with Comical's
+absurdly easy GUI and in-your-face double page display!
 
-WWW: http://mlf.sketchyorigins.com/
+Nifty Features:
+* Single-Page or Double-Page display modes.
+* Zoom modes: Fit, Fit-to-Width, Fit-to-Height, Original, Custom.
+* Crisp image scaling with algorithms adapted from FreeImage 3.
+* Detects double pages scanned together and displays it accordingly.
+* Page rotation.
+* Full-Screen mode.
+* Left-to-Right or Right-to-Left browsing.
+* Displays JPG, GIF, and PNG images.
+* Supports RAR(.cbr) and ZIP(.cbz) comic book archives
+* Supports all encrypted RAR archives as well as ZIP archives with
+  pkzip 2.04g encryption.
 
-- John
-john@mcaree.org
+WWW: http://comical.sourceforge.net/
diff --git a/graphics/comical/pkg-plist b/graphics/comical/pkg-plist
deleted file mode 100644
index 006c1533af9..00000000000
--- a/graphics/comical/pkg-plist
+++ /dev/null
@@ -1 +0,0 @@
-bin/comical