Attachment #129860 for bug #173918




#

PORTNAME=	recoll
PORTVERSION=	1.18.1
PORTREVISION=	1
CATEGORIES=	deskutils
MASTER_SITES=	http://www.lesbonscomptes.com/recoll/

MAINTAINER=	nemysis@gmx.ch
COMMENT=	Personal full text search package, based on Xapian

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/COPYING

LIB_DEPENDS=	xapian:${PORTSDIR}/databases/xapian-core

OPTIONS_DEFINE=	QT4 ASPELL PYTHON X11MON
OPTIONS_DEFAULT=QT4 ASPELL PYTHON X11MON
ASPELL_DESC=	Enable ASpell support
X11MON_DESC=	Enable X11 session monitoring support

USE_ICONV=	yes
USE_GMAKE=	yes
GNU_CONFIGURE=	yes

MAN1=		recollindex.1
MAN5=		recoll.conf.5

OPTIONS_DEFINE=	QT4 ASPELL PYTHON X11MON
OPTIONS_DEFAULT=QT4 ASPELL PYTHON X11MON
ASPELL_DESC=	Enable ASpell support
X11MON_DESC=	Enable X11 session monitoring support

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MQT4}
USE_QT4=	moc_build qmake_build rcc_build uic_build iconengines imageformats \
		corelib gui xml webkit
QT_NONSTANDARD=	yes
CONFIGURE_ENV+=	QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}"
CONFIGURE_ARGS+=--enable-qtgui
INSTALLS_ICONS=	yes
PLIST_SUB+=	QT=""
MAN1+=		recollq.1 recoll.1
.else
CONFIGURE_ARGS+=--disable-qtgui
PLIST_SUB+=	QT="@comment "
.endif

.if ${PORT_OPTIONS:MASPELL}
LIB_DEPENDS+=	aspell:${PORTSDIR}/textproc/aspell
.else
CONFIGURE_ARGS+=--without-aspell
.endif


post-patch:
	@${REINPLACE_CMD} -e \
		's|$${MAKE} -C query recollq|@NOQTMAKE@$${MAKE} -C query recollq|' ${WRKSRC}/Makefile.in
	@${REINPLACE_CMD} -e \
		's|/usr/local/lib|${LOCALBASE}/lib|' ${WRKSRC}/configure
	@${REINPLACE_CMD} -e \
		's|= -g -O2|=|' ${WRKSRC}/mk/localdefs.in
	@${REINPLACE_CMD} -e \
		's|-pthread|${PTHREAD_LIBS}|' ${WRKSRC}/mk/${OPSYS}
	@${REINPLACE_CMD} -e 's|@NOCMDLINE@|@NOQTMAKE@|g' \
		${WRKSRC}/recollinstall.in

post-configure:
.if ${PORT_OPTIONS:MQT4}
	@cd ${WRKSRC}/qtgui && ${SETENV} ${CONFIGURE_ENV} \
	${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)./distinfo (-2 / +2 lines)
1	SHA256 (recoll-1.17.3.tar.gz) = 7778f80546e6b10ca45bfb7f8bb0876ccf3987dd4e98c5003ff923bd8b5acb1c	1	SHA256 (recoll-1.18.1.tar.gz) = 8ea01dc64002b594b7ca08cf40c5581963bd98617d8ab5554164a8af4a9fd933
2	SIZE (recoll-1.17.3.tar.gz) = 1757278	2	SIZE (recoll-1.18.1.tar.gz) = 2026276




%%QT%%bin/recoll
bin/recollindex
%%QT%%bin/recollq
%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll.so
%%QT%%share/applications/recoll-searchgui.desktop
%%QT%%share/icons/hicolor/48x48/apps/recoll.png

%%DATADIR%%/filters/rcldjvu
%%DATADIR%%/filters/rcldoc
%%DATADIR%%/filters/rcldvi
%%DATADIR%%/filters/rclepub
%%DATADIR%%/filters/rclexecm.py
%%DATADIR%%/filters/rclfb2
%%DATADIR%%/filters/rclgaim

%%DATADIR%%/filters/rclsiduxman
%%DATADIR%%/filters/rclsoff
%%DATADIR%%/filters/rclsvg
%%DATADIR%%/filters/rcltar
%%DATADIR%%/filters/rcltex
%%DATADIR%%/filters/rcltext
%%DATADIR%%/filters/rcluncomp
%%DATADIR%%/filters/rclwar
%%DATADIR%%/filters/rclwpd
%%DATADIR%%/filters/rclxls
%%DATADIR%%/filters/rclxml
%%DATADIR%%/filters/rclzip
%%DATADIR%%/filters/xdg-open
%%DATADIR%%/images/aptosid-book.png
%%DATADIR%%/images/aptosid-manual.png
%%DATADIR%%/images/archive.png
%%DATADIR%%/images/book.png
%%DATADIR%%/images/bookchap.png
%%DATADIR%%/images/document.png
%%DATADIR%%/images/drawing.png
%%DATADIR%%/images/folder.png

%%DATADIR%%/images/wordprocessing.png
%%DATADIR%%/translations/recoll_cs.qm
%%DATADIR%%/translations/recoll_de.qm
%%DATADIR%%/translations/recoll_el.qm
%%DATADIR%%/translations/recoll_es.qm
%%DATADIR%%/translations/recoll_fr.qm
%%DATADIR%%/translations/recoll_it.qm

@dirrm %%DATADIR%%/examples
@dirrm %%DATADIR%%/doc
@dirrm %%DATADIR%%
%%QT%%@dirrmtry share/icons/hicolor/48x48/apps
%%QT%%@dirrmtry share/icons/hicolor/48x48
%%QT%%@dirrmtry share/icons/hicolor
%%QT%%@dirrmtry share/icons
%%QT%%@dirrmtry share/applications

Return to bug 173918

Lines 6-29 Link Here

(-)./Makefile (-15 / +18 lines)
6	#	6	#
7		7
8	PORTNAME= recoll	8	PORTNAME= recoll
9	PORTVERSION= 1.17.3	9	PORTVERSION= 1.18.1
10	PORTREVISION= 1
11	CATEGORIES= deskutils	10	CATEGORIES= deskutils
12	MASTER_SITES= http://www.lesbonscomptes.com/recoll/	11	MASTER_SITES= http://www.lesbonscomptes.com/recoll/
13		12
14	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= nemysis@gmx.ch
15	COMMENT= A personal full text search package, based on Xapian	14	COMMENT= Personal full text search package, based on Xapian
16		15
17	LICENSE= GPLv2	16	LICENSE= GPLv2
18	LICENSE_FILE= ${WRKSRC}/COPYING
19		17
20	LIB_DEPENDS= xapian:${PORTSDIR}/databases/xapian-core	18	LIB_DEPENDS= xapian:${PORTSDIR}/databases/xapian-core
21		19
22	OPTIONS_DEFINE= QT4 ASPELL PYTHON X11MON
23	OPTIONS_DEFAULT=QT4 ASPELL PYTHON X11MON
24	ASPELL_DESC= Enable ASpell support
25	X11MON_DESC= Enable X11 session monitoring support
26
27	USE_ICONV= yes	20	USE_ICONV= yes
28	USE_GMAKE= yes	21	USE_GMAKE= yes
29	GNU_CONFIGURE= yes	22	GNU_CONFIGURE= yes
Lines 35-56 Link Here
35	MAN1= recollindex.1	28	MAN1= recollindex.1
36	MAN5= recoll.conf.5	29	MAN5= recoll.conf.5
37		30
		31	OPTIONS_DEFINE= QT4 ASPELL PYTHON X11MON
		32	OPTIONS_DEFAULT=QT4 ASPELL PYTHON X11MON
		33	ASPELL_DESC= Enable ASpell support
		34	X11MON_DESC= Enable X11 session monitoring support
		35
38	.include <bsd.port.options.mk>	36	.include <bsd.port.options.mk>
39		37
40	.if ${PORT_OPTIONS:MQT4}	38	.if ${PORT_OPTIONS:MQT4}
41	USE_QT4= webkit moc_build qmake_build rcc_build uic_build	39	USE_QT4= moc_build qmake_build rcc_build uic_build iconengines imageformats \
		40	corelib gui xml webkit
42	QT_NONSTANDARD= yes	41	QT_NONSTANDARD= yes
43	CONFIGURE_ENV+= QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}"	42	CONFIGURE_ENV+= QTDIR="${QT_PREFIX}" QMAKE="${QMAKE}"
		43	CONFIGURE_ARGS+=--enable-qtgui
44	INSTALLS_ICONS= yes	44	INSTALLS_ICONS= yes
45	PLIST_SUB+= QT=""	45	PLIST_SUB+= QT=""
46	MAN1+= recoll.1	46	MAN1+= recollq.1 recoll.1
47	.else	47	.else
48	CONFIGURE_ARGS+=--disable-qtgui	48	CONFIGURE_ARGS+=--disable-qtgui
49	PLIST_SUB+= QT="@comment "	49	PLIST_SUB+= QT="@comment "
50	.endif	50	.endif
51		51
52	.if ${PORT_OPTIONS:MASPELL}	52	.if ${PORT_OPTIONS:MASPELL}
53	LIB_DEPENDS+= aspell.16:${PORTSDIR}/textproc/aspell	53	LIB_DEPENDS+= aspell:${PORTSDIR}/textproc/aspell
54	.else	54	.else
55	CONFIGURE_ARGS+=--without-aspell	55	CONFIGURE_ARGS+=--without-aspell
56	.endif	56	.endif
Lines 75-91 Link Here
75		75
76	post-patch:	76	post-patch:
77	@${REINPLACE_CMD} -e \	77	@${REINPLACE_CMD} -e \
78	's\|@QMAKE@\|${TRUE}\|' ${WRKSRC}/Makefile.in	78	's\|$${MAKE} -C query recollq\|@NOQTMAKE@$${MAKE} -C query recollq\|' ${WRKSRC}/Makefile.in
79	@${REINPLACE_CMD} -e \	79	@${REINPLACE_CMD} -e \
80	's\|/usr/local/lib\|${LOCALBASE}/lib\|' ${WRKSRC}/configure	80	's\|/usr/local/lib\|${LOCALBASE}/lib\|' ${WRKSRC}/configure
81	@${REINPLACE_CMD} -e \	81	@${REINPLACE_CMD} -e \
82	's\|= -g -O2\|=\|' ${WRKSRC}/mk/localdefs.in	82	's\|= -g -O2\|=\|' ${WRKSRC}/mk/localdefs.in
83	@${REINPLACE_CMD} -e \	83	@${REINPLACE_CMD} -e \
84	's\|-pthread\|${PTHREAD_LIBS}\|' ${WRKSRC}/mk/${OPSYS}	84	's\|-pthread\|${PTHREAD_LIBS}\|' ${WRKSRC}/mk/${OPSYS}
		85	@${REINPLACE_CMD} -e 's\|@NOCMDLINE@\|@NOQTMAKE@\|g' \
		86	${WRKSRC}/recollinstall.in
85		87
86	post-configure:	88	post-configure:
87	.if ${PORT_OPTIONS:MQT4}	89	.if ${PORT_OPTIONS:MQT4}
88	@(cd ${WRKSRC}/qtgui && ${SETENV} ${MAKE_ENV} ${QMAKE} ${QMAKEFLAGS})	90	@cd ${WRKSRC}/qtgui && ${SETENV} ${CONFIGURE_ENV} \
		91	${QMAKE} ${QMAKEFLAGS} PREFIX=${PREFIX}
89	.endif	92	.endif
90		93
91	.include <bsd.port.mk>	94	.include <bsd.port.mk>

Lines 1-5 Link Here

(-)./pkg-plist (-5 / +13 lines)
1	%%QT%%bin/recoll	1	%%QT%%bin/recoll
2	bin/recollindex	2	bin/recollindex
		3	%%QT%%bin/recollq
3	%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll.so	4	%%PYTHON%%%%PYTHON_SITELIBDIR%%/recoll.so
4	%%QT%%share/applications/recoll-searchgui.desktop	5	%%QT%%share/applications/recoll-searchgui.desktop
5	%%QT%%share/icons/hicolor/48x48/apps/recoll.png	6	%%QT%%share/icons/hicolor/48x48/apps/recoll.png
Lines 23-28 Link Here
23	%%DATADIR%%/filters/rcldjvu	24	%%DATADIR%%/filters/rcldjvu
24	%%DATADIR%%/filters/rcldoc	25	%%DATADIR%%/filters/rcldoc
25	%%DATADIR%%/filters/rcldvi	26	%%DATADIR%%/filters/rcldvi
		27	%%DATADIR%%/filters/rclepub
26	%%DATADIR%%/filters/rclexecm.py	28	%%DATADIR%%/filters/rclexecm.py
27	%%DATADIR%%/filters/rclfb2	29	%%DATADIR%%/filters/rclfb2
28	%%DATADIR%%/filters/rclgaim	30	%%DATADIR%%/filters/rclgaim
Lines 51-66 Link Here
51	%%DATADIR%%/filters/rclsiduxman	53	%%DATADIR%%/filters/rclsiduxman
52	%%DATADIR%%/filters/rclsoff	54	%%DATADIR%%/filters/rclsoff
53	%%DATADIR%%/filters/rclsvg	55	%%DATADIR%%/filters/rclsvg
		56	%%DATADIR%%/filters/rcltar
54	%%DATADIR%%/filters/rcltex	57	%%DATADIR%%/filters/rcltex
55	%%DATADIR%%/filters/rcltext	58	%%DATADIR%%/filters/rcltext
56	%%DATADIR%%/filters/rcluncomp	59	%%DATADIR%%/filters/rcluncomp
57	%%DATADIR%%/filters/rclwar	60	%%DATADIR%%/filters/rclwar
58	%%DATADIR%%/filters/rclwpd	61	%%DATADIR%%/filters/rclwpd
59	%%DATADIR%%/filters/rclxls	62	%%DATADIR%%/filters/rclxls
		63	%%DATADIR%%/filters/rclxml
60	%%DATADIR%%/filters/rclzip	64	%%DATADIR%%/filters/rclzip
61	%%DATADIR%%/filters/xdg-open	65	%%DATADIR%%/filters/xdg-open
62	%%DATADIR%%/images/aptosid-book.png	66	%%DATADIR%%/images/aptosid-book.png
63	%%DATADIR%%/images/aptosid-manual.png	67	%%DATADIR%%/images/aptosid-manual.png
		68	%%DATADIR%%/images/archive.png
		69	%%DATADIR%%/images/book.png
		70	%%DATADIR%%/images/bookchap.png
64	%%DATADIR%%/images/document.png	71	%%DATADIR%%/images/document.png
65	%%DATADIR%%/images/drawing.png	72	%%DATADIR%%/images/drawing.png
66	%%DATADIR%%/images/folder.png	73	%%DATADIR%%/images/folder.png
Lines 82-87 Link Here
82	%%DATADIR%%/images/wordprocessing.png	89	%%DATADIR%%/images/wordprocessing.png
83	%%DATADIR%%/translations/recoll_cs.qm	90	%%DATADIR%%/translations/recoll_cs.qm
84	%%DATADIR%%/translations/recoll_de.qm	91	%%DATADIR%%/translations/recoll_de.qm
		92	%%DATADIR%%/translations/recoll_el.qm
85	%%DATADIR%%/translations/recoll_es.qm	93	%%DATADIR%%/translations/recoll_es.qm
86	%%DATADIR%%/translations/recoll_fr.qm	94	%%DATADIR%%/translations/recoll_fr.qm
87	%%DATADIR%%/translations/recoll_it.qm	95	%%DATADIR%%/translations/recoll_it.qm
Lines 98-105 Link Here
98	@dirrm %%DATADIR%%/examples	106	@dirrm %%DATADIR%%/examples
99	@dirrm %%DATADIR%%/doc	107	@dirrm %%DATADIR%%/doc
100	@dirrm %%DATADIR%%	108	@dirrm %%DATADIR%%
101	@dirrmtry share/icons/hicolor/48x48/apps	109	%%QT%%@dirrmtry share/icons/hicolor/48x48/apps
102	@dirrmtry share/icons/hicolor/48x48	110	%%QT%%@dirrmtry share/icons/hicolor/48x48
103	@dirrmtry share/icons/hicolor	111	%%QT%%@dirrmtry share/icons/hicolor
104	@dirrmtry share/icons	112	%%QT%%@dirrmtry share/icons
105	@dirrmtry share/applications	113	%%QT%%@dirrmtry share/applications