On Thu 2010.12.23 at 09:21 +0000, Mikolaj Kucharski wrote: > On Thu, Dec 23, 2010 at 08:51:11AM +0000, Mikolaj Kucharski wrote: > > On Tue, Dec 21, 2010 at 09:12:37PM +0000, Mikolaj Kucharski wrote: > > > Hi Okan, > > > > > > Attached is a patch for p5-Text-Markdown update to version 1.000031. > > > This version drops previously included Text::MultiMarkdown module, so > > > I'm attaching separate port for that. > > > > > > - regress tests pass for both modules > > > - not sure how to handle @conflict and @pkgpath markers for this > > > situation, I think removing them should be fine, as those ports do not > > > conflict any more, as they could in the past > > > - I think devel/quirks should be involved in this upgrade as someone who > > > had previous p5-Text-Markdown installed and was using > > > Text::MultiMarkdown > > > module will get issues. > > > - scripts from $PREFIX/bin got renamed > > > > > > > Regards the ports dependant on above. I've checked > > > > textproc/p5-Catalyst-Plugin-Markdown > > textproc/p5-Template-Plugin-Markdown > > > > by searching for MultiMarkdown string: > > > > grep -R MultiMarkdown `make show=WRKDIR` > > > > and found no matching lines. I think this update shouldn't break > > anything currently in ports tree. > > > > Re quirks, I agree with what sthen@ wrote. I would skip any > > complications too. > > Sorry, for previous. I'm attaching diff and port again. I've added > conflict line to MultiMarkdown port for old versions of Markdown.
Hi Mikolaj, I've made some additional changes: - got rid of groff requirement for pages render fine with mandoc. - no need for BUILD_DEPENDS for either port. - tightened up REGRESS_DEPENDS. - other minor bits I forget... - oh took maintainer of p5-Text-MultiMarkdown, since you didn't :) diff to existing port and new port attached. Cheers, Okan
Index: Makefile
===================================================================
RCS file: /home/open/anoncvs/cvs/ports/textproc/p5-Text-Markdown/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 3 Dec 2010 11:46:49 -0000 1.9
+++ Makefile 28 Dec 2010 18:54:50 -0000
@@ -1,12 +1,10 @@
# $OpenBSD: Makefile,v 1.9 2010/12/03 11:46:49 ajacoutot Exp $
-COMMENT= convert Markdown / MultiMarkdown syntax to (X)HTML
+COMMENT= convert Markdown syntax to (X)HTML
-DISTNAME= Text-Markdown-1.0.24
-REVISION= 0
+DISTNAME= Text-Markdown-1.000031
CATEGORIES= textproc www
MODULES= cpan
-USE_GROFF = Yes
MAINTAINER= Okan Demirmen <o...@openbsd.org>
@@ -19,17 +17,10 @@ PERMIT_DISTFILES_FTP= Yes
RUN_DEPENDS= devel/p5-File-Slurp \
devel/p5-List-MoreUtils \
devel/p5-Test-Exception
-BUILD_DEPENDS= ${RUN_DEPENDS}
-MAKE_ENV= TEST_POD=Yes \
- TEST_SPELLING=Yes
-REGRESS_DEPENDS=devel/p5-Test-Spelling \
- textproc/p5-Text-Diff \
- www/p5-HTML-Tidy
-
-post-install:
- ${INSTALL_SCRIPT} ${WRKSRC}/script/Markdown.pl ${PREFIX}/bin/Markdown
- ${INSTALL_SCRIPT} ${WRKSRC}/script/MultiMarkdown.pl \
- ${PREFIX}/bin/MultiMarkdown
+MAKE_ENV= TEST_POD=Yes
+
+REGRESS_DEPENDS= devel/p5-Test-Differences \
+ www/p5-HTML-Tidy
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/open/anoncvs/cvs/ports/textproc/p5-Text-Markdown/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo 8 Dec 2008 14:48:35 -0000 1.5
+++ distinfo 28 Dec 2010 18:15:10 -0000
@@ -1,5 +1,5 @@
-MD5 (Text-Markdown-1.0.24.tar.gz) = Rx1h33/fZqeR1mrTcHS9ew==
-RMD160 (Text-Markdown-1.0.24.tar.gz) = nFv17KSsA3dNAEpWo7DuYgdJxsU=
-SHA1 (Text-Markdown-1.0.24.tar.gz) = DN78JehNa9zhzzYiAKS9WgRQmo8=
-SHA256 (Text-Markdown-1.0.24.tar.gz) =
X1vph/OZYPT90dktMFph33OHA0l1RGmRBzPKzQEy0N4=
-SIZE (Text-Markdown-1.0.24.tar.gz) = 143401
+MD5 (Text-Markdown-1.000031.tar.gz) = iKzhew3r6+iPDqRadsOX7Q==
+RMD160 (Text-Markdown-1.000031.tar.gz) = xXKZN8YQkPVHTOV8h3/EKF0PjJI=
+SHA1 (Text-Markdown-1.000031.tar.gz) = y2i2FQ2dTVT9LyV2UdeFidz2O5k=
+SHA256 (Text-Markdown-1.000031.tar.gz) =
wZHG1ezrjLdcBWUZI2BmLSAtcWutB6IzxLMppChNxxs=
+SIZE (Text-Markdown-1.000031.tar.gz) = 103428
Index: pkg/DESCR
===================================================================
RCS file: /home/open/anoncvs/cvs/ports/textproc/p5-Text-Markdown/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- pkg/DESCR 5 Jun 2008 11:41:44 -0000 1.2
+++ pkg/DESCR 28 Dec 2010 18:15:10 -0000
@@ -2,6 +2,3 @@ Markdown is a text-to-HTML filter; it tr
easy-to-write structured text format into HTML. Markdown's text format
is most similar to that of plain text email, and supports features such
as headers, *emphasis*, code blocks, blockquotes, and links.
-
-The Text::MultiMarkdown module implements the MultiMarkdown markdown
-syntax extensions.
Index: pkg/PLIST
===================================================================
RCS file: /home/open/anoncvs/cvs/ports/textproc/p5-Text-Markdown/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 5 Jun 2008 11:41:44 -0000 1.2
+++ pkg/PLIST 28 Dec 2010 18:15:10 -0000
@@ -1,10 +1,6 @@
@comment $OpenBSD: PLIST,v 1.2 2008/06/05 11:41:44 okan Exp $
-...@conflict p5-Text-MultiMarkdown-*
-...@pkgpath textproc/p5-Text-MultiMarkdown
-bin/Markdown
-bin/MultiMarkdown
+bin/Markdown.pl
${P5SITE}/Text/
${P5SITE}/Text/Markdown.pm
-${P5SITE}/Text/MultiMarkdown.pm
+...@man man/man1/Markdown.pl.1
@man man/man3p/Text::Markdown.3p
-...@man man/man3p/Text::MultiMarkdown.3p
p5-Text-MultiMarkdown.tgz
Description: application/tar-gz
