Attachment #25589 for bug #43702

View | Details | Raw Unified | Return to bug 43702
Collapse All | Expand All




#

PORTNAME=	qhacc
PORTVERSION=	2.4
CATEGORIES=	misc
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
		ftp://ftp.ostrich-emulators.cx/qhacc/
MASTER_SITE_SUBDIR=	${PORTNAME}

MAINTAINER=	kde@FreeBSD.org

USE_QT_VER=	3
USE_QT_VER=	2
USE_X_PREFIX=	yes
USE_REINPLACE=	yes
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
CONFIGURE_ARGS=	--with-qt-moc=${QT_PREFIX}/bin \
		--with-qt-libs=${QT_PREFIX}/lib

post-extract:
	@${RM} -f ${WRKSRC}/src/moc_*.cpp

pre-patch:
	@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
		's|^CXXFLAGS =.*$$|CXXFLAGS = \@CXXFLAGS\@|g'
		 s|-O2 -Wall|\@CXXFLAGS\@|g' ${WRKSRC}/${file}
.endfor

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/src/qhacc ${PREFIX}/bin
	@${MKDIR} ${DATADIR}
	${INSTALL_DATA} ${WRKSRC}/qm/*.qm ${DATADIR}
	${INSTALL_DATA} ${FILESDIR}/config ${DATADIR}/config.sample
.if !defined(NOPORTDOCS)
	@${MKDIR} ${DOCSDIR}

Line 1 Link Here

(-)misc/qhacc/distinfo (-1 / +1 lines)
1	MD5 (qhacc-1.4.tar.gz) = 5cc9cb98286d44badedca3de77ee4c4c	1	MD5 (qhacc-2.4.tar.gz) = 37a27b49e707e4656e47bed73c2c0c81




--- src/qhacctable.h.orig	Sat Aug 17 13:19:35 2002
+++ src/qhacctable.h	Wed Oct  2 19:08:15 2002
@@ -26,9 +26,10 @@
 #include <qstring.h>
 #include <qdatetime.h>
 
-class QFile;
+#include <fstream>
+using std::ostream;
 
-class ostream;
+class QFile;
 
 class QHaccTableIndex;
 

Lines 7-11 Link Here

(-)misc/qhacc/pkg-plist (+1 lines)
7	%%PORTDOCS%%share/doc/qhacc/using.html	7	%%PORTDOCS%%share/doc/qhacc/using.html
8	%%PORTDOCS%%share/doc/qhacc/primer.html	8	%%PORTDOCS%%share/doc/qhacc/primer.html
9	share/qhacc/config.sample	9	share/qhacc/config.sample
		10	share/qhacc/qhacc_es_ES.qm
10	@dirrm share/qhacc	11	@dirrm share/qhacc
11	%%PORTDOCS%%@dirrm share/doc/qhacc	12	%%PORTDOCS%%@dirrm share/doc/qhacc

Return to bug 43702

Lines 6-39 Link Here

(-)misc/qhacc/Makefile (-13 / +13 lines)
6	#	6	#
7		7
8	PORTNAME= qhacc	8	PORTNAME= qhacc
9	PORTVERSION= 1.4	9	PORTVERSION= 2.4
10	CATEGORIES= misc	10	CATEGORIES= misc
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	ftp://ftp.ostrich-emulators.cx/qhacc/
13	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
14		13
15	MAINTAINER= kde@freebsd.org	14	MAINTAINER= kde@FreeBSD.org
16		15
17	USE_REINPLACE= yes	16	USE_QT_VER= 3
18	USE_QT_VER= 2
19	USE_X_PREFIX= yes	17	USE_X_PREFIX= yes
		18	USE_REINPLACE= yes
		19	USE_GMAKE= yes
20	GNU_CONFIGURE= yes	20	GNU_CONFIGURE= yes
21	CONFIGURE_ARGS= --with-qt-moc=${X11BASE}/bin \	21	CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd${OSREL}
22	--with-qt-libs=${X11BASE}/lib	22	CONFIGURE_ARGS= --with-qt-moc=${QT_PREFIX}/bin \
		23	--with-qt-libs=${QT_PREFIX}/lib
23		24
24	post-extract:	25	post-extract:
25	@${RM} -f ${WRKSRC}/src/moc_*.cpp	26	@${RM} -f ${WRKSRC}/src/moc_*.cpp
26		27
27	pre-patch:	28	pre-patch:
28	.for file in configure src/Makefile.in	29	@${REINPLACE_CMD} 's\|-lpthread\|${PTHREAD_LIBS}\|g' ${WRKSRC}/configure
29	@${REINPLACE_CMD} -e 's\|/moc\|/${MOC:T}\|g ; \	30	@${FIND} ${WRKSRC} -name "Makefile.in" \| ${XARGS} ${REINPLACE_CMD} -e \
30	s\|-lqt\|-l${QTNAME}\|g ; \	31	's\|^CXXFLAGS =.*$$\|CXXFLAGS = \@CXXFLAGS\@\|g'
31	s\|-O2 -Wall\|\@CXXFLAGS\@\|g' ${WRKSRC}/${file}
32	.endfor
33		32
34	do-install:	33	do-install:
35	${INSTALL_PROGRAM} ${WRKSRC}/src/qhacc ${PREFIX}/bin	34	${INSTALL_PROGRAM} ${WRKSRC}/src/qhacc ${PREFIX}/bin
36	@${MKDIR} ${DATADIR}	35	@${MKDIR} ${DATADIR}
		36	${INSTALL_DATA} ${WRKSRC}/qm/*.qm ${DATADIR}
37	${INSTALL_DATA} ${FILESDIR}/config ${DATADIR}/config.sample	37	${INSTALL_DATA} ${FILESDIR}/config ${DATADIR}/config.sample
38	.if !defined(NOPORTDOCS)	38	.if !defined(NOPORTDOCS)
39	@${MKDIR} ${DOCSDIR}	39	@${MKDIR} ${DOCSDIR}

Line 0 Link Here

(-)misc/qhacc/files/patch-src::qhacctable.h (+15 lines)
	1	--- src/qhacctable.h.orig Sat Aug 17 13:19:35 2002
	2	+++ src/qhacctable.h Wed Oct 2 19:08:15 2002
	3	@@ -26,9 +26,10 @@
	4	#include <qstring.h>
	5	#include <qdatetime.h>
	6
	7	-class QFile;
	8	+#include <fstream>
	9	+using std::ostream;
	10
	11	-class ostream;
	12	+class QFile;
	13
	14	class QHaccTableIndex;
	15