svn commit: r308487 - head/deskutils/cdcat

[Pawel Pekala]

Author: pawel
Date: Sat Dec  8 17:08:59 2012
New Revision: 308487
URL: http://svnweb.freebsd.org/changeset/ports/308487

Log:
  - Fix build on FreeBSD 7.x [1]
  - Remove leading article from COMMENT
  - Correct spelling errors in pkg-descr
  
  PR:		ports/174156 [1]
  Submitted by:	KATO Tsuguru <tkato432 at yahoo.com> [1]
  Feature safe:	yes

Modified:
  head/deskutils/cdcat/Makefile
  head/deskutils/cdcat/pkg-descr

Modified: head/deskutils/cdcat/Makefile
==============================================================================
--- head/deskutils/cdcat/Makefile	Sat Dec  8 16:40:27 2012	(r308486)
+++ head/deskutils/cdcat/Makefile	Sat Dec  8 17:08:59 2012	(r308487)
@@ -12,7 +12,7 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	A QT based tool for offline CD/DVD/disk catalogs
+COMMENT=	Qt based tool for offline CD/DVD/disk catalogs
 
 LICENSE=	GPLv2 MPL
 LICENSE_COMB=	multi
@@ -68,10 +68,6 @@ L7Z_WRKSRC=	${WRKDIR}/${L7Z_NAME}
 P7Z_WRKSRC=	$$(cd ${PORTSDIR}/archivers/p7zip && ${MAKE} -V WRKSRC)
 MIF_WRKSRC=	$$(cd ${PORTSDIR}/multimedia/mediainfo && ${MAKE} -V WRKSRC)
 
-.if ${OSVERSION} < 800000
-BROKEN=		does not build on 7.X
-.endif
-
 post-extract:
 	@${GZCAT} ${DISTDIR}/${L7Z_DISTFILE} | (cd ${WRKDIR} && ${TAR} -xf -)
 	@${LN} -sf ${L7Z_NAME}-${L7Z_VERSION} ${L7Z_WRKSRC}
@@ -83,6 +79,11 @@ post-patch:
 		's|/dev/sr0|/dev/cd0|' ${BUILD_WRKSRC}/config.cpp
 	@${REINPLACE_CMD} -e \
 		's|-ldl||' ${L7Z_WRKSRC}/Test7Zip/Makefile.in
+.if ${OSVERSION} < 800501
+	@${REINPLACE_CMD} -e \
+		's|const struct dirent|struct dirent|' \
+		${L7Z_WRKSRC}/Lib7Zip/OSFunctions_UnixLike.cpp
+.endif
 
 pre-configure:
 	@cd ${L7Z_WRKSRC} && ./configure --disable-shared \

Modified: head/deskutils/cdcat/pkg-descr
==============================================================================
--- head/deskutils/cdcat/pkg-descr	Sat Dec  8 16:40:27 2012	(r308486)
+++ head/deskutils/cdcat/pkg-descr	Sat Dec  8 17:08:59 2012	(r308487)
@@ -1,6 +1,6 @@
-cdcat is a powerful QT based tool for creating fully searcheable offline
+cdcat is a powerful Qt based tool for creating fully searchable offline
 catalogs of the contents of any arbitrary media. Primarily it is most
-useful for cataloging CDs, DVDs, and other such removeable media. The
+useful for cataloging CDs, DVDs, and other such removable media. The
 catalogs can be quickly searched (including across multiple catalogs)
 with regular expressions, exported as CSV or HTML files, sorted, and
 statistical information gathered.