Attachment #166958 for bug #207169

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




# $FreeBSD$

PORTNAME=	qxmpp
PORTVERSION=	0.9.3
DISTVERSIONPREFIX=	v
CATEGORIES=	net-im


COMMENT=	QXmpp is an xmpp client library based on Qt & C++

LICENSE=	LGPL21
LICENSE_FILE=	${WRKSRC}/LICENSE.LGPL

USES=		qmake pathfix pkgconfig libtool
USE_QT4=	gui network qtestlib xml uic_build moc_build \
		rcc_build
QMAKE_ARGS=	QXMPP_NO_TESTS=1

USE_GITHUB=	yes
GH_ACCOUNT=	qxmpp-project

PLIST_SUB=	VERSION=${PORTVERSION} VERSION_MAJOR=${PORTVERSION:R}

pre-configure:
	${REINPLACE_CMD} -e 's|pkgconfig|../libdata/pkgconfig|g' \
		${WRKSRC}/src/src.pro

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (qxmpp-project-qxmpp-v0.8.0_GH0.tar.gz) = 00aa821ab9e18d33ad15f12ae80aca8c3d9180e40d419ae34a90bfab91a78b02	1	SHA256 (qxmpp-project-qxmpp-v0.9.3_GH0.tar.gz) = 13f5162a1df720702c6ae15a476a4cb8ea3e57d861a992c4de9147909765e6de
2	SIZE (qxmpp-project-qxmpp-v0.8.0_GH0.tar.gz) = 275638	2	SIZE (qxmpp-project-qxmpp-v0.9.3_GH0.tar.gz) = 300764




--- ./qxmpp.pro.orig	2014-07-02 00:55:44.879359720 +0400
+++ ./qxmpp.pro	2014-07-02 00:56:27.297356491 +0400
@@ -6,29 +6,19 @@
 
 android {
 } else {
-    SUBDIRS += tests examples doc
-    INSTALLS += htmldocs
+    SUBDIRS += tests examples
 }
 
 CONFIG += ordered
 
-# Documentation generation
-docs.commands = cd doc/ && $(QMAKE) && $(MAKE) docs
-
 # Source distribution
 QXMPP_ARCHIVE = qxmpp-$$QXMPP_VERSION
 dist.commands = \
     $(DEL_FILE) -r $$QXMPP_ARCHIVE && \
     $(MKDIR) $$QXMPP_ARCHIVE && \
     git archive master | tar -x -C $$QXMPP_ARCHIVE && \
-    $(COPY_DIR) doc/html $$QXMPP_ARCHIVE/doc && \
     tar czf $${QXMPP_ARCHIVE}.tar.gz $$QXMPP_ARCHIVE && \
     $(DEL_FILE) -r $$QXMPP_ARCHIVE
-dist.depends = docs
 
-# Install rules
-htmldocs.files = doc/html
-htmldocs.path = $$PREFIX/share/doc/qxmpp
-htmldocs.CONFIG += no_check_exist directory
 
-QMAKE_EXTRA_TARGETS += dist docs
+QMAKE_EXTRA_TARGETS += dist
yes
native
text/plain

Lines 42-48 Link Here

(-)pkg-plist (-2 / +4 lines)
42	include/qxmpp/QXmppRosterManager.h	42	include/qxmpp/QXmppRosterManager.h
43	include/qxmpp/QXmppRpcIq.h	43	include/qxmpp/QXmppRpcIq.h
44	include/qxmpp/QXmppRpcManager.h	44	include/qxmpp/QXmppRpcManager.h
		45	include/qxmpp/QXmppRtcpPacket.h
45	include/qxmpp/QXmppRtpChannel.h	46	include/qxmpp/QXmppRtpChannel.h
		47	include/qxmpp/QXmppRtpPacket.h
46	include/qxmpp/QXmppServer.h	48	include/qxmpp/QXmppServer.h
47	include/qxmpp/QXmppServerExtension.h	49	include/qxmpp/QXmppServerExtension.h
48	include/qxmpp/QXmppServerPlugin.h	50	include/qxmpp/QXmppServerPlugin.h
Lines 63-68 Link Here
63	include/qxmpp/qdnslookup_p.h	65	include/qxmpp/qdnslookup_p.h
64	lib/libqxmpp.so	66	lib/libqxmpp.so
65	lib/libqxmpp.so.0	67	lib/libqxmpp.so.0
66	lib/libqxmpp.so.0.8	68	lib/libqxmpp.so.%%VERSION_MAJOR%%
67	lib/libqxmpp.so.0.8.0	69	lib/libqxmpp.so.%%VERSION%%
68	libdata/pkgconfig/qxmpp.pc	70	libdata/pkgconfig/qxmpp.pc

Return to bug 207169

Lines 2-8 Link Here

(-)Makefile (-1 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= qxmpp	4	PORTNAME= qxmpp
5	PORTVERSION= 0.8.0	5	PORTVERSION= 0.9.3
6	DISTVERSIONPREFIX= v	6	DISTVERSIONPREFIX= v
7	CATEGORIES= net-im	7	CATEGORIES= net-im
8		8
Lines 10-23 Link Here
10	COMMENT= QXmpp is an xmpp client library based on Qt & C++	10	COMMENT= QXmpp is an xmpp client library based on Qt & C++
11		11
12	LICENSE= LGPL21	12	LICENSE= LGPL21
		13	LICENSE_FILE= ${WRKSRC}/LICENSE.LGPL
13		14
14	USES= qmake pathfix pkgconfig libtool	15	USES= qmake pathfix pkgconfig libtool
15	USE_QT4= gui network qtestlib xml uic_build moc_build \	16	USE_QT4= gui network qtestlib xml uic_build moc_build \
16	rcc_build	17	rcc_build
		18	QMAKE_ARGS= QXMPP_NO_TESTS=1
17		19
18	USE_GITHUB= yes	20	USE_GITHUB= yes
19	GH_ACCOUNT= qxmpp-project	21	GH_ACCOUNT= qxmpp-project
20		22
		23	PLIST_SUB= VERSION=${PORTVERSION} VERSION_MAJOR=${PORTVERSION:R}
		24
21	pre-configure:	25	pre-configure:
22	${REINPLACE_CMD} -e 's\|pkgconfig\|../libdata/pkgconfig\|g' \	26	${REINPLACE_CMD} -e 's\|pkgconfig\|../libdata/pkgconfig\|g' \
23	${WRKSRC}/src/src.pro	27	${WRKSRC}/src/src.pro

Lines 1-34 Link Here

(-)files/patch-qxmpp.pro (-37 lines)
1	--- ./qxmpp.pro.orig 2014-07-02 00:55:44.879359720 +0400
2	+++ ./qxmpp.pro 2014-07-02 00:56:27.297356491 +0400
3	@@ -6,29 +6,19 @@
4
5	android {
6	} else {
7	- SUBDIRS += tests examples doc
8	- INSTALLS += htmldocs
9	+ SUBDIRS += tests examples
10	}
11
12	CONFIG += ordered
13
14	-# Documentation generation
15	-docs.commands = cd doc/ && $(QMAKE) && $(MAKE) docs
16	-
17	# Source distribution
18	QXMPP_ARCHIVE = qxmpp-$$QXMPP_VERSION
19	dist.commands = \
20	$(DEL_FILE) -r $$QXMPP_ARCHIVE && \
21	$(MKDIR) $$QXMPP_ARCHIVE && \
22	git archive master \| tar -x -C $$QXMPP_ARCHIVE && \
23	- $(COPY_DIR) doc/html $$QXMPP_ARCHIVE/doc && \
24	tar czf $${QXMPP_ARCHIVE}.tar.gz $$QXMPP_ARCHIVE && \
25	$(DEL_FILE) -r $$QXMPP_ARCHIVE
26	-dist.depends = docs
27
28	-# Install rules
29	-htmldocs.files = doc/html
30	-htmldocs.path = $$PREFIX/share/doc/qxmpp
31	-htmldocs.CONFIG += no_check_exist directory
32
33	-QMAKE_EXTRA_TARGETS += dist docs
34	+QMAKE_EXTRA_TARGETS += dist
35	yes
36	native
37	text/plain