Attachment #78021 for bug #112240

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




# $FreeBSD: ports/www/ikiwiki/Makefile,v 1.1 2007/04/23 09:00:59 miwi Exp $

PORTNAME=	ikiwiki
PORTVERSION=	1.51
CATEGORIES=	www
MASTER_SITES=	${MASTER_SITE_DEBIAN_POOL}
DISTNAME=	${PORTNAME}_${PORTVERSION}

.endif

post-patch:
	@${RM} ${WRKSRC}/IkiWiki/Rcs/svn.pm.orig
	@${REINPLACE_CMD} -e "s|/usr/bin/markdown|${LOCALBASE}/bin/markdown|" \
		${WRKSRC}/IkiWiki/Plugin/mdwn.pm
	@${REINPLACE_CMD} \
		-e 's|$$(CP) -a|$$(CP) -pPR|' \
		-e 's|$$(PREFIX)/share/man|$$(PREFIX)/man|' \
		-e 's|$$(PREFIX)/lib/w3m|$$(PREFIX)/libexec/w3m|' \
		${WRKSRC}/Makefile.PL

Lines 1-3 Link Here

(-)ikiwiki/distinfo (-3 / +3 lines)
1	MD5 (ikiwiki_1.50.tar.gz) = d50de4fe7fd4fb752bf0941e1cf0dc10	1	MD5 (ikiwiki_1.51.tar.gz) = 28e8e5d3830833a3ed5b9934407452a3
2	SHA256 (ikiwiki_1.50.tar.gz) = 30bbf5ee0e1841f4cbb7c9f10216300ffbf757e41f1e69b6b1402803d994320f	2	SHA256 (ikiwiki_1.51.tar.gz) = 2cd365080193f2bdcf9a90c47b965a6d38d8c9e211771a9c3c46b7ae942c7f88
3	SIZE (ikiwiki_1.50.tar.gz) = 401720	3	SIZE (ikiwiki_1.51.tar.gz) = 418926




--- Makefile.PL.orig	Sun Apr 29 12:57:51 2007
+++ Makefile.PL	Sun Apr 29 13:27:51 2007
@@ -47,8 +47,12 @@ extra_clean:
 
 extra_install:
 	install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
-	find basewiki templates \( -type f -or -type l \) ! -regex '.*\.svn.*' \
-		-exec cp --parents -aL {} $(DESTDIR)$(PREFIX)/share/ikiwiki \;
+	for dir in `find -L basewiki templates -type d ! -regex '.*\.svn.*'`; do \
+		install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
+		for file in `find -L $$dir -maxdepth 1 -type f`; do \
+			install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
+		done; \
+	done
 
 	install -d $(DESTDIR)$(PREFIX)/share/man/man1
 	install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1




--- IkiWiki/Rcs/svn.pm.orig	Sun Jan 28 01:04:48 2007
+++ IkiWiki/Rcs/svn.pm	Mon Apr 16 22:55:29 2007
@@ -176,7 +176,8 @@ sub rcs_recentchanges ($) { #{{{
 		}
 
 		foreach (keys %{$logentry->{paths}}) {
-			next unless /^\/\Q$config{svnpath}\E\/([^ ]+)(?:$|\s)/;
+			next unless ! length $config{svnpath} || 
+			            /^\/\Q$config{svnpath}\E\/([^ ]+)(?:$|\s)/;
 			my $file=$1;
 			my $diffurl=$config{diffurl};
 			$diffurl=~s/\[\[file\]\]/$file/g;
@@ -218,7 +219,8 @@ sub rcs_notify () { #{{{
 	my @changed_pages;
 	foreach my $change (`svnlook changed $config{svnrepo} -r $rev`) {
 		chomp $change;
-		if ($change =~ /^[A-Z]+\s+\Q$config{svnpath}\E\/(.*)/) {
+		if (! length $config{svnpath} || 
+		    $change =~ /^[A-Z]+\s+\Q$config{svnpath}\E\/(.*)/) {
 			push @changed_pages, $1;
 		}
 	}

Lines 116-121 Link Here

(-)ikiwiki/pkg-plist (+1 lines)
116	%%SITE_PERL%%/IkiWiki/Plugin/table.pm	116	%%SITE_PERL%%/IkiWiki/Plugin/table.pm
117	%%SITE_PERL%%/IkiWiki/Plugin/tag.pm	117	%%SITE_PERL%%/IkiWiki/Plugin/tag.pm
118	%%SITE_PERL%%/IkiWiki/Plugin/template.pm	118	%%SITE_PERL%%/IkiWiki/Plugin/template.pm
		119	%%SITE_PERL%%/IkiWiki/Plugin/testpagespec.pm
119	%%SITE_PERL%%/IkiWiki/Plugin/textile.pm	120	%%SITE_PERL%%/IkiWiki/Plugin/textile.pm
120	%%SITE_PERL%%/IkiWiki/Plugin/toc.pm	121	%%SITE_PERL%%/IkiWiki/Plugin/toc.pm
121	%%SITE_PERL%%/IkiWiki/Plugin/toggle.pm	122	%%SITE_PERL%%/IkiWiki/Plugin/toggle.pm

Return to bug 112240

Lines 5-11 Link Here

(-)ikiwiki/Makefile (-3 / +1 lines)
5	# $FreeBSD: ports/www/ikiwiki/Makefile,v 1.1 2007/04/23 09:00:59 miwi Exp $	5	# $FreeBSD: ports/www/ikiwiki/Makefile,v 1.1 2007/04/23 09:00:59 miwi Exp $
6		6
7	PORTNAME= ikiwiki	7	PORTNAME= ikiwiki
8	PORTVERSION= 1.50	8	PORTVERSION= 1.51
9	CATEGORIES= www	9	CATEGORIES= www
10	MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}	10	MASTER_SITES= ${MASTER_SITE_DEBIAN_POOL}
11	DISTNAME= ${PORTNAME}_${PORTVERSION}	11	DISTNAME= ${PORTNAME}_${PORTVERSION}
Lines 51-61 PLIST_SUB= W3M="@comment " Link Here
51	.endif	51	.endif
52		52
53	post-patch:	53	post-patch:
54	@${RM} ${WRKSRC}/IkiWiki/Rcs/svn.pm.orig
55	@${REINPLACE_CMD} -e "s\|/usr/bin/markdown\|${LOCALBASE}/bin/markdown\|" \	54	@${REINPLACE_CMD} -e "s\|/usr/bin/markdown\|${LOCALBASE}/bin/markdown\|" \
56	${WRKSRC}/IkiWiki/Plugin/mdwn.pm	55	${WRKSRC}/IkiWiki/Plugin/mdwn.pm
57	@${REINPLACE_CMD} \	56	@${REINPLACE_CMD} \
58	-e 's\|$$(CP) -a\|$$(CP) -pPR\|' \
59	-e 's\|$$(PREFIX)/share/man\|$$(PREFIX)/man\|' \	57	-e 's\|$$(PREFIX)/share/man\|$$(PREFIX)/man\|' \
60	-e 's\|$$(PREFIX)/lib/w3m\|$$(PREFIX)/libexec/w3m\|' \	58	-e 's\|$$(PREFIX)/lib/w3m\|$$(PREFIX)/libexec/w3m\|' \
61	${WRKSRC}/Makefile.PL	59	${WRKSRC}/Makefile.PL

Line 0 Link Here

(-)ikiwiki/files/patch-Makefile.PL (+17 lines)
	1	--- Makefile.PL.orig Sun Apr 29 12:57:51 2007
	2	+++ Makefile.PL Sun Apr 29 13:27:51 2007
	3	@@ -47,8 +47,12 @@ extra_clean:
	4
	5	extra_install:
	6	install -d $(DESTDIR)$(PREFIX)/share/ikiwiki
	7	- find basewiki templates \( -type f -or -type l \) ! -regex '.\.svn.' \
	8	- -exec cp --parents -aL {} $(DESTDIR)$(PREFIX)/share/ikiwiki \;
	9	+ for dir in `find -L basewiki templates -type d ! -regex '.\.svn.'`; do \
	10	+ install -d $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
	11	+ for file in `find -L $$dir -maxdepth 1 -type f`; do \
	12	+ install -m 644 $$file $(DESTDIR)$(PREFIX)/share/ikiwiki/$$dir; \
	13	+ done; \
	14	+ done
	15
	16	install -d $(DESTDIR)$(PREFIX)/share/man/man1
	17	install -m 644 ikiwiki.man $(DESTDIR)$(PREFIX)/share/man/man1/ikiwiki.1

Lines 1-22 Link Here

(-)ikiwiki/files/patch-svn.pm (-22 lines)
1	--- IkiWiki/Rcs/svn.pm.orig Sun Jan 28 01:04:48 2007
2	+++ IkiWiki/Rcs/svn.pm Mon Apr 16 22:55:29 2007
3	@@ -176,7 +176,8 @@ sub rcs_recentchanges ($) { #{{{
4	}
5
6	foreach (keys %{$logentry->{paths}}) {
7	- next unless /^\/\Q$config{svnpath}\E\/([^ ]+)(?:$\|\s)/;
8	+ next unless ! length $config{svnpath} \|\|
9	+ /^\/\Q$config{svnpath}\E\/([^ ]+)(?:$\|\s)/;
10	my $file=$1;
11	my $diffurl=$config{diffurl};
12	$diffurl=~s/\[\[file\]\]/$file/g;
13	@@ -218,7 +219,8 @@ sub rcs_notify () { #{{{
14	my @changed_pages;
15	foreach my $change (`svnlook changed $config{svnrepo} -r $rev`) {
16	chomp $change;
17	- if ($change =~ /^[A-Z]+\s+\Q$config{svnpath}\E\/(.*)/) {
18	+ if (! length $config{svnpath} \|\|
19	+ $change =~ /^[A-Z]+\s+\Q$config{svnpath}\E\/(.*)/) {
20	push @changed_pages, $1;
21	}
22	}