Attachment #139750 for bug #186060

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





PORTNAME=	monotone
PORTVERSION=	1.0
PORTREVISION=	4
CATEGORIES=	devel
MASTER_SITES=	http://www.monotone.ca/downloads/${PORTVERSION}/


USES=		iconv pkgconfig gmake perl5
USE_PERL5=	build
USE_LUA=	5.1+
MAKE_JOBS_SAFE=	yes

GNU_CONFIGURE=	yes
CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"

		"@dirrm share/monotone"
.if !defined(NO_INSTALL_MANPAGES)
INFO=		monotone
PLIST_FILES+=	man/man1/mtn.1.gz \
		man/man1/mtn-cleanup.1.gz \
		man/man1/mtnopt.1.gz
.endif
PORTDOCS=	*

NO_STAGE=	yes
.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MNLS}

	${REINPLACE_CMD} -Ee '/^install-info: /s/ install-info-am$$//' \
	-e '/^install-data-am:/s/ install-info-am$$//' ${WRKSRC}/doc/Makefile.in
.endif
	${REINPLACE_CMD} \
		-e "s/\"idn/\"libidn/g" \
		-e "s/\"pcre/\"libpcre/g" \
		-e "s/\"botan/\"botan-1.10/g" \
		-e "s/REBUILD_NLS=true/REBUILD_NLS=false/g" \
		-e "s/std::tr1::/std::/g" \
		${WRKSRC}/configure
	${REINPLACE_CMD} \
		-e "s/std::tr1::/std::/g" \
		${WRKSRC}/src/hash_map.hh

post-install:
	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
	${INSTALL_DATA} ${WRKSRC}/contrib/monotone.zsh_completion ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_mtn
.if ${PORT_OPTIONS:MDOCS}
	${MKDIR} ${STAGEDIR}${DOCSDIR}
	cd ${WRKSRC} && ${INSTALL_DATA} NEWS UPGRADE ${STAGEDIR}${DOCSDIR}
.endif
	@${CAT} ${PKGMESSAGE}





--- configure.orig	2014-01-22 00:48:12.855108408 +0100
+++ configure	2014-01-22 00:48:54.244105202 +0100
@@ -4594,9 +4594,7 @@ fi
 
 # The dummy "pkg-config" package is guaranteed to exist.
 if test -n "$PKG_CONFIG"; then
-  mtn__full_pkg_config_path=`$PKG_CONFIG --debug pkg-config 2>&1 |
-    sed -ne "/^Scanning directory '/{; s///; s/'$//; p;}" |
-    tr "$as_nl" ':' | sed 's/:$//'`
+  mtn__full_pkg_config_path=`$PKG_CONFIG --variable=pc_path pkg-config 2>&1 | sed 's/:.*$//'`
   #AC_MSG_NOTICE([detected pkg-config path: $mtn__full_pkg_config_path])
 fi
 

Line 0 Link Here

(-)./files/patch-src_automate_reader.hh (+10 lines)
	1	--- src/automate_reader.hh.orig 2014-01-22 01:04:27.675051506 +0100
	2	+++ src/automate_reader.hh 2014-01-22 01:04:41.682040341 +0100
	3	@@ -13,6 +13,7 @@
	4	#define __AUTOMATE_READER_HH__
	5
	6	#include <vector>
	7	+#include <iostream>
	8
	9	class automate_reader
	10	{

Return to bug 186060

Lines 3-9 Link Here

(-)./Makefile (-13 / +14 lines)
3		3
4	PORTNAME= monotone	4	PORTNAME= monotone
5	PORTVERSION= 1.0	5	PORTVERSION= 1.0
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= devel	7	CATEGORIES= devel
8	MASTER_SITES= http://www.monotone.ca/downloads/${PORTVERSION}/	8	MASTER_SITES= http://www.monotone.ca/downloads/${PORTVERSION}/
9		9
Lines 24-29 Link Here
24	USES= iconv pkgconfig gmake perl5	24	USES= iconv pkgconfig gmake perl5
25	USE_PERL5= build	25	USE_PERL5= build
26	USE_LUA= 5.1+	26	USE_LUA= 5.1+
		27	MAKE_JOBS_SAFE= yes
27		28
28	GNU_CONFIGURE= yes	29	GNU_CONFIGURE= yes
29	CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"	30	CONFIGURE_ENV= MAKEINFO="makeinfo --no-split"
Lines 50-62 Link Here
50	"@dirrm share/monotone"	51	"@dirrm share/monotone"
51	.if !defined(NO_INSTALL_MANPAGES)	52	.if !defined(NO_INSTALL_MANPAGES)
52	INFO= monotone	53	INFO= monotone
53	MAN1= mtn.1 \	54	PLIST_FILES+= man/man1/mtn.1.gz \
54	mtn-cleanup.1 \	55	man/man1/mtn-cleanup.1.gz \
55	mtnopt.1	56	man/man1/mtnopt.1.gz
56	.endif	57	.endif
57	PORTDOCS= *	58	PORTDOCS= *
58		59
59	NO_STAGE= yes
60	.include <bsd.port.options.mk>	60	.include <bsd.port.options.mk>
61		61
62	.if ${PORT_OPTIONS:MNLS}	62	.if ${PORT_OPTIONS:MNLS}
Lines 82-100 Link Here
82	${REINPLACE_CMD} -Ee '/^install-info: /s/ install-info-am$$//' \	82	${REINPLACE_CMD} -Ee '/^install-info: /s/ install-info-am$$//' \
83	-e '/^install-data-am:/s/ install-info-am$$//' ${WRKSRC}/doc/Makefile.in	83	-e '/^install-data-am:/s/ install-info-am$$//' ${WRKSRC}/doc/Makefile.in
84	.endif	84	.endif
85	${REINPLACE_CMD} -e "s/\"lua/\"lua-${LUA_VER}/g" \	85	${REINPLACE_CMD} \
86	-e "s/\"idn/\"libidn/g" \
87	-e "s/\"pcre/\"libpcre/g" \
88	-e "s/\"botan/\"botan-1.10/g" \
89	-e "s/REBUILD_NLS=true/REBUILD_NLS=false/g" \	86	-e "s/REBUILD_NLS=true/REBUILD_NLS=false/g" \
		87	-e "s/std::tr1::/std::/g" \
90	${WRKSRC}/configure	88	${WRKSRC}/configure
		89	${REINPLACE_CMD} \
		90	-e "s/std::tr1::/std::/g" \
		91	${WRKSRC}/src/hash_map.hh
91		92
92	post-install:	93	post-install:
93	${MKDIR} ${PREFIX}/share/zsh/site-functions	94	${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions
94	${INSTALL_DATA} ${WRKSRC}/contrib/monotone.zsh_completion ${PREFIX}/share/zsh/site-functions/_mtn	95	${INSTALL_DATA} ${WRKSRC}/contrib/monotone.zsh_completion ${STAGEDIR}${PREFIX}/share/zsh/site-functions/_mtn
95	.if ${PORT_OPTIONS:MDOCS}	96	.if ${PORT_OPTIONS:MDOCS}
96	${MKDIR} ${DOCSDIR}	97	${MKDIR} ${STAGEDIR}${DOCSDIR}
97	cd ${WRKSRC} && ${INSTALL_DATA} NEWS UPGRADE ${DOCSDIR}	98	cd ${WRKSRC} && ${INSTALL_DATA} NEWS UPGRADE ${STAGEDIR}${DOCSDIR}
98	.endif	99	.endif
99	@${CAT} ${PKGMESSAGE}	100	@${CAT} ${PKGMESSAGE}
100		101

Line 0 Link Here

(-)./files/patch-configure (+13 lines)
	1	--- configure.orig 2014-01-22 00:48:12.855108408 +0100
	2	+++ configure 2014-01-22 00:48:54.244105202 +0100
	3	@@ -4594,9 +4594,7 @@ fi
	4
	5	# The dummy "pkg-config" package is guaranteed to exist.
	6	if test -n "$PKG_CONFIG"; then
	7	- mtn__full_pkg_config_path=`$PKG_CONFIG --debug pkg-config 2>&1 \|
	8	- sed -ne "/^Scanning directory '/{; s///; s/'$//; p;}" \|
	9	- tr "$as_nl" ':' \| sed 's/:$//'`
	10	+ mtn__full_pkg_config_path=`$PKG_CONFIG --variable=pc_path pkg-config 2>&1 \| sed 's/:.*$//'`
	11	#AC_MSG_NOTICE([detected pkg-config path: $mtn__full_pkg_config_path])
	12	fi
	13