- Pet portlint

- Drop unneeded WX_UNICODE
- Silence patching and stripping
- Remove always-true (since wx 2.6 removal) condition

1 files changed, 10 insertions, 15 deletions

diff --git a/graphics/comical/Makefile b/graphics/comical/Makefile
index 928871cdbd6b..be2a0a31bf93 100644
--- a/graphics/comical/Makefile
+++ b/graphics/comical/Makefile
@@ -10,30 +10,27 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Sequential image viewer
 
-LIB_DEPENDS=	libunrar.so:archivers/libunrar
-
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+LIB_DEPENDS=	libunrar.so:archivers/libunrar
+
 MAKE_JOBS_UNSAFE=	yes
 
 USES=		gmake
-USE_WX=		2.6+
-WX_PREMK=	yes
-WX_UNICODE=	yes
-PLIST_FILES=	bin/comical
+USE_WX=		2.8+
 
-.include <bsd.port.pre.mk>
+PLIST_FILES=	bin/comical
 
 post-patch:
-	${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|; \
+	@${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}|; \
+	@${REINPLACE_CMD} -e 's|wx-config|${WX_CONFIG}|; \
 		s|-D_UNIX|-D_UNIX -DwxUSE_UNICODE|; \
 		s|CFLAGS =|CFLAGS=${CFLAGS} |; \
 		s|CPPFLAGS =|CPPFLAGS=${CXXFLAGS} |; \
@@ -41,16 +38,14 @@ post-patch:
 		s|-I../unrar|-I${LOCALBASE}/include/libunrar3|;' \
 		${WRKSRC}/src/Makefile
 
-	${REINPLACE_CMD} -e 's|gcc|${CC}|; \
+	@${REINPLACE_CMD} -e 's|gcc|${CC}|; \
 		s|CFLAGS=|CFLAGS+=|;' \
 		${WRKSRC}/unzip/Makefile
 
-.if ${WX_VERSION} == "2.8"
-	${REINPLACE_CMD} -e 's|frame->SetIcon|//frame->SetIcon|' \
+	@${REINPLACE_CMD} -e 's|frame->SetIcon|//frame->SetIcon|' \
 		${WRKSRC}/src/ComicalApp.cpp
-.endif
 
 post-install:
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>