- Un-break build

- Cleanup Makefile
- Pet portlint

PR:		199222
Submitted by:	tkato432@yahoo.com
MFH:		2015Q2

deskutils/cdcat/Makefile

@@ -3,25 +3,17 @@
 
 PORTNAME=	cdcat
 PORTVERSION=	2.3.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} \
-		GOOGLE_CODE:lib7zip
-PROJECTHOST=	lib7zip
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${L7Z_DISTFILE}:lib7zip
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Qt based tool for offline CD/DVD/disk catalogs
 
-BROKEN=		Fails to build with new p7zip
-
 LICENSE=	GPLv2 MPL
 LICENSE_COMB=	multi
 
-BUILD_DEPENDS=	${NONEXISTENT}:${PORTSDIR}/archivers/p7zip:patch \
-		cryptopp>0:${PORTSDIR}/security/cryptopp
+BUILD_DEPENDS=	cryptopp>0:${PORTSDIR}/security/cryptopp
 LIB_DEPENDS=	libtar.so:${PORTSDIR}/devel/libtar \
 		libexif.so:${PORTSDIR}/graphics/libexif \
 		libmediainfo.so:${PORTSDIR}/multimedia/libmediainfo \
@@ -32,9 +24,7 @@ BUILD_WRKSRC=	${CONFIGURE_WRKSRC}
 
 USES=		libtool qmake:norecursive tar:bzip2
 USE_QT4=	corelib gui xml linguist_build moc_build uic_build
-QMAKE_ARGS=	INCLUDEPATH+="${L7Z_WRKSRC}/Lib7Zip" \
-		LIBS+="${L7Z_WRKSRC}/Lib7Zip/lib7zip.a" \
-		LIBS+="${LOCALBASE}/lib/libcryptopp.a" \
+QMAKE_ARGS=	LIBS+="${LOCALBASE}/lib/libcryptopp.a" \
 		LIBS+="-lz -lbz2 -ltar -lexif -lmediainfo -lzen" \
 		DEFINES+="MEDIAINFO_STATIC" \
 		DEFINES+="MEDIAINFO_UNICODE" \
@@ -57,42 +47,20 @@ DESKTOP_ENTRIES="CdCat" "Hyper's CD Catalog" "${DATADIR}/${PORTNAME}.png" \
 
 OPTIONS_DEFINE=	DOCS
 
-L7Z_NAME=	lib7zip
-L7Z_VERSION=	1.6.5
-L7Z_DISTFILE=	${L7Z_NAME}-${L7Z_VERSION}.tar.gz
-L7Z_WRKSRC=	${WRKDIR}/${L7Z_NAME}
-
-.include <bsd.port.pre.mk>
-
-P7Z_WRKSRC=	$$(cd ${PORTSDIR}/archivers/p7zip && ${MAKE_CMD} -V WRKSRC)
-
-post-extract:
-	@${GZCAT} ${DISTDIR}/${L7Z_DISTFILE} | (cd ${WRKDIR} && ${TAR} -xf -)
-	@${LN} -sf ${L7Z_NAME}-${L7Z_VERSION} ${L7Z_WRKSRC}
-
 post-patch:
 	@${REINPLACE_CMD} -e \
-		'/LIBS/s|^|#|' ${BUILD_WRKSRC}/${PORTNAME}.pro
+		'/USE_LIB7ZIP/s|^|#| ; \
+		 /LIBS/s|^|#|' ${BUILD_WRKSRC}/${PORTNAME}.pro
 	@${REINPLACE_CMD} -e \
 		's|/dev/sr0|/dev/cd0|' ${BUILD_WRKSRC}/config.cpp
 .for i in newdbdialog.cpp wdbfile.h
 	@${REINPLACE_CMD} -e \
 		's|crypto++/|cryptopp/|' ${BUILD_WRKSRC}/${i}
 .endfor
-	@${REINPLACE_CMD} -e \
-		's|-ldl||' ${L7Z_WRKSRC}/Test7Zip/Makefile.in
 
 pre-configure:
-	@cd ${L7Z_WRKSRC} && ./configure --disable-shared \
-		CC="${CC}" CFLAGS="${CFLAGS}" \
-		CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
-		P7ZIP_SOURCE_DIR="${P7Z_WRKSRC}"
 	@${LRELEASE} ${BUILD_WRKSRC}/${PORTNAME}.pro
 
-pre-build:
-	@cd ${L7Z_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} \
-		${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET}
-
 do-install:
 	(cd ${BUILD_WRKSRC} && ${INSTALL_PROGRAM} ${PORTNAME} \
 		${STAGEDIR}${PREFIX}/bin)
@@ -115,4 +83,4 @@ do-install:
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
 .endfor
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

deskutils/cdcat/distinfo

@@ -1,4 +1,2 @@
 SHA256 (cdcat-2.3.1.tar.bz2) = 7cb1bbd7646faf93359acda5835f510766c82e612bca577282571f13a8d5f01c
 SIZE (cdcat-2.3.1.tar.bz2) = 428708
-SHA256 (lib7zip-1.6.5.tar.gz) = a6fb9118657c71db5b40068cd6ddd35430818aaa21aa2d0af4d6c3309e9f2a38
-SIZE (lib7zip-1.6.5.tar.gz) = 359986

deskutils/cdcat/files/patch-src__exportcdcatdb.cpp

@@ -1,6 +1,6 @@
---- src/exportcdcatdb.cpp.orig
+--- src/exportcdcatdb.cpp.orig	2013-08-29 06:08:32 UTC
 +++ src/exportcdcatdb.cpp
-@@ -30,6 +30,7 @@
+@@ -30,6 +30,7 @@ Copyright : (C) 2003 Christoph Thielecke
  #include <QGridLayout>
  #include <QVBoxLayout>
  #include <iostream>