Update to 2.12. Assign maintainership to submitter

PR:             ports/97374
Submitted by:   Wesley Shields

5 files changed, 24 insertions, 24 deletions

diff --git a/deskutils/jlj/Makefile b/deskutils/jlj/Makefile
index 458bf58e6aca..cd362fa8a442 100644
--- a/deskutils/jlj/Makefile
+++ b/deskutils/jlj/Makefile
@@ -6,25 +6,29 @@
 #
 
 PORTNAME=	jlj
-PORTVERSION=	2.7
-PORTREVISION=	1
+PORTVERSION=	2.12
 CATEGORIES=	deskutils net
 MASTER_SITES=	http://patsy.cis.rit.edu/Software/perl/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
-PATCH_SITES=	http://www.atarininja.org/~wxs/patches/
-PATCHFILES=	jlj-tags-port.diff
-
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	wxs@csh.rit.edu
 COMMENT=	Jerry's command-line LiveJournal.com entry system
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_PERL5=	yes
+USE_PERL5_RUN=	yes
 NO_BUILD=	yes
+SUB_FILES=	pkg-message
+
+PLIST_FILES=	bin/jlj share/examples/jlj/dot.livejournal.rc
+PLIST_DIRS=	share/examples/jlj
+
+.if !defined(NOPORTDOCS)
+PORTDOCS=	README
+.endif
 
 post-patch:
-	@${PERL} -pi -e 's!/usr/bin/perl!${PERL}!' ${WRKSRC}/jlj.pl
+	@${REINPLACE_CMD} -e 's!/usr/bin/perl!${PERL}!' ${WRKSRC}/jlj.pl
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/jlj.pl ${PREFIX}/bin/jlj
@@ -32,8 +36,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/.livejournal.rc \
 		${PREFIX}/share/examples/jlj/dot.livejournal.rc
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/jlj
-	${INSTALL_DATA} ${WRKSRC}/README.JLJ ${PREFIX}/share/doc/jlj/README
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.JLJ ${DOCSDIR}/README
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/deskutils/jlj/distinfo b/deskutils/jlj/distinfo
index 89c0857c9d3f..18e892a268a5 100644
--- a/deskutils/jlj/distinfo
+++ b/deskutils/jlj/distinfo
@@ -1,6 +1,3 @@
-MD5 (jlj_2.7.tar.gz) = 8be1675feaad41baed6ac3616a8a6fb9
-SHA256 (jlj_2.7.tar.gz) = 81f428b991b4b1cd8c5a820d0d6e599fc4cbc2458e986f06a3cf1a080df38fe1
-SIZE (jlj_2.7.tar.gz) = 30157
-MD5 (jlj-tags-port.diff) = 78c98ef68f68ea61dc8c13a0110b84c6
-SHA256 (jlj-tags-port.diff) = 42b0284517034ef49d72dc0ba72eacee8af2a0cfa75e16039ab4fc17769ba239
-SIZE (jlj-tags-port.diff) = 3498
+MD5 (jlj_2.12.tar.gz) = 55724c4d6d26211f34803ef856075234
+SHA256 (jlj_2.12.tar.gz) = da3e1626338c5337e28bb4bc8da0b64d7a8ab441a52aa2364037e9eea152bc27
+SIZE (jlj_2.12.tar.gz) = 32480
diff --git a/deskutils/jlj/files/pkg-message.in b/deskutils/jlj/files/pkg-message.in
new file mode 100644
index 000000000000..438e42207b48
--- /dev/null
+++ b/deskutils/jlj/files/pkg-message.in
@@ -0,0 +1,7 @@
+---------------------------------------------------------------------
+
+Be sure to copy %%PREFIX%%/share/examples/jlj/dot.livejournal.rc to
+~/.livejournal.rc before running jlj.  More details can be found
+in %%PREFIX%%/share/doc/jlj/README.
+
+---------------------------------------------------------------------
diff --git a/deskutils/jlj/pkg-message b/deskutils/jlj/pkg-message
deleted file mode 100644
index ee8e351d5126..000000000000
--- a/deskutils/jlj/pkg-message
+++ /dev/null
@@ -1,3 +0,0 @@
-Be sure to copy ${PREFIX}/share/examples/jlj/dot.livejournal.rc to
-~/.livejournal.rc before running jlj.  More details can be found
-in ${PREFIX}/share/doc/jlj/README.
diff --git a/deskutils/jlj/pkg-plist b/deskutils/jlj/pkg-plist
deleted file mode 100644
index 81b082af20b5..000000000000
--- a/deskutils/jlj/pkg-plist
+++ /dev/null
@@ -1,5 +0,0 @@
-bin/jlj
-%%PORTDOCS%%share/doc/jlj/README
-share/examples/jlj/dot.livejournal.rc
-@dirrm share/examples/jlj
-%%PORTDOCS%%@dirrm share/doc/jlj