Bug 29226 - Update port: www/w3m
Summary: Update port: www/w3m
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: FUJISHIMA Satsuki
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2001-07-25 18:20 UTC by nobutaka
Modified: 2001-08-28 00:48 UTC (History)
0 users

See Also:


Attachments
file.diff (2.30 KB, patch)
2001-07-25 18:20 UTC, nobutaka
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description nobutaka 2001-07-25 18:20:22 UTC
Update w3m inline image support patch to 1.4.
Add pkg-message for w3m-image slave ports.
Comment 1 FUJISHIMA Satsuki freebsd_committer freebsd_triage 2001-07-26 08:14:58 UTC
Responsible Changed
From-To: freebsd-ports->sf

I'll handle this.
Comment 2 FUJISHIMA Satsuki freebsd_committer freebsd_triage 2001-07-30 21:04:37 UTC
I assume that PORTREVISION should be overridable from slave
ports. Updates only for w3m-image like this PR shouldn't bump revision
of w3m MASTER port. Thoughts?

Index: japanese/w3m-image/Makefile
===================================================================
RCS file: /home/ncvs/ports/japanese/w3m-image/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- japanese/w3m-image/Makefile	2001/07/21 18:21:55	1.1
+++ japanese/w3m-image/Makefile	2001/07/26 07:09:37
@@ -11,6 +11,7 @@
 MASTERDIR=	${.CURDIR}/../../www/w3m
 PKGDIR=		${.CURDIR}
 PLIST=		${MASTERDIR}/pkg-plist
+PORTREVISION=	2
 
 JAPANESE=	Yes
 INLINE_IMAGE=	yes
Index: www/w3m/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/w3m/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- www/w3m/Makefile	2001/07/21 18:31:06	1.30
+++ www/w3m/Makefile	2001/07/26 07:10:05
@@ -7,7 +7,7 @@
 
 PORTNAME=	w3m
 PORTVERSION=	0.2.1
-PORTREVISION=	1
+PORTREVISION?=	1
 CATEGORIES+=	www ipv6
 MASTER_SITES=	ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/ \
 		http://mi.med.tohoku.ac.jp/~satodai/w3m/src/ \
@@ -66,16 +66,21 @@
 
 .if defined(INLINE_IMAGE)
 PATCH_SITES=	http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
-PATCHFILES=	w3m-0.2.1-img-1.3.patch
+PATCHFILES=	w3m-0.2.1-img-1.4.patch
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-XMakefile
 
 USE_IMLIB=	yes
 
 DOCS_JP+=	README.img
 PLIST_SUB+=	INLINE_IMAGE_ONLY=""
+
+PKGMESSAGE=	${MASTERDIR}/pkg-message
 .else
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-XMakefile.noimg
 PLIST_SUB+=	INLINE_IMAGE_ONLY="@comment "
+
+# Don't use pkg-massage
+PKGMESSAGE=	${NONEXISTENT}
 .endif
 
 pre-extract:
@@ -112,6 +117,9 @@
 	@${INSTALL_MAN} ${WRKSRC}/doc/w3m.1 ${PREFIX}/man/man1
 .if defined(JAPANESE)
 	@${INSTALL_MAN} ${WRKSRC}/doc-jp/w3m.1 ${PREFIX}/man/ja/man1
+.endif
+.if defined(INLINE_IMAGE)
+	@${CAT} ${PKGMESSAGE}
 .endif
 
 .include <bsd.port.post.mk>
Index: www/w3m/distinfo
===================================================================
RCS file: /home/ncvs/ports/www/w3m/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- www/w3m/distinfo	2001/07/21 18:21:55	1.11
+++ www/w3m/distinfo	2001/07/26 07:05:55
@@ -1,2 +1,2 @@
 MD5 (w3m-0.2.1.tar.gz) = 906c2506f570b563807bcd1d23fecea5
-MD5 (w3m-0.2.1-img-1.3.patch) = 33c68defc24791ac3439ddae4f8a7c47
+MD5 (w3m-0.2.1-img-1.4.patch) = 6c577ac4d28f010167c4cd7b56e85248
Index: www/w3m/pkg-message
===================================================================
RCS file: pkg-message
diff -N pkg-message
--- /dev/null	Thu Jul 26 16:11:00 2001
+++ pkg-message	Thu Jul 26 16:05:55 2001
@@ -0,0 +1,12 @@
+**********************************************************
+* To display images in proper positions,                 *
+* you should set font size of your terminal emulator to  *
+* "# of pixels per character" and "# of pixels per line" *
+* in Option Setting Panel.                               *
+*                                                        *
+* For example, if you use 14 pixel fonts, the values     *
+* should be these.                                       *
+*                                                        *
+* # of pixels per character = 7                          *
+* # of pixels per line = 14                              *
+**********************************************************
Index: www/w3m-image/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/w3m-image/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- www/w3m-image/Makefile	2001/07/21 18:21:56	1.1
+++ www/w3m-image/Makefile	2001/07/26 07:09:58
@@ -10,6 +10,7 @@
 MASTERDIR=	${.CURDIR}/../../www/w3m
 PKGDIR=		${.CURDIR}
 PLIST=		${MASTERDIR}/pkg-plist
+PORTREVISION=	2
 
 INLINE_IMAGE=	yes
Comment 3 FUJISHIMA Satsuki freebsd_committer freebsd_triage 2001-08-28 00:48:00 UTC
State Changed
From-To: open->closed

at last this update committed, thanks!