Attachment #15681 for bug #28996

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

Lines 7-13 Link Here

(-)w3m/Makefile (-1 / +24 lines)
7		7
8	PORTNAME= w3m	8	PORTNAME= w3m
9	PORTVERSION= 0.2.1	9	PORTVERSION= 0.2.1
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES+= www ipv6	11	CATEGORIES+= www ipv6
12	MASTER_SITES= ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/ \	12	MASTER_SITES= ftp://ei5nazha.yz.yamagata-u.ac.jp/w3m/ \
13	http://mi.med.tohoku.ac.jp/~satodai/w3m/src/ \	13	http://mi.med.tohoku.ac.jp/~satodai/w3m/src/ \
Lines 42-47 Link Here
42	MANLANG+= ja	42	MANLANG+= ja
43	DOCS_JP= ${DOCS} HISTORY.kokb README.SSL README.cookie \	43	DOCS_JP= ${DOCS} HISTORY.kokb README.SSL README.cookie \
44	README.keymap README.mailcap README.menu	44	README.keymap README.mailcap README.menu
		45
		46	PLIST_SUB= JAPANESE_ONLY=""
		47	.else
		48	PLIST_SUB= JAPANESE_ONLY="@comment "
45	.endif	49	.endif
46		50
47	.if defined(USE_OPENSSL)	51	.if defined(USE_OPENSSL)
Lines 54-59 Link Here
54	LIBS="${SSL_LIBS} ${EXTRA_SSL_LIBS} -L${LOCALBASE}/lib"	58	LIBS="${SSL_LIBS} ${EXTRA_SSL_LIBS} -L${LOCALBASE}/lib"
55	.else	59	.else
56	MAKE_FLAGS+= DEFS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"	60	MAKE_FLAGS+= DEFS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib"
		61	.endif
		62
		63	.if !defined(WITHOUT_IMLIB)
		64	PATCH_SITES= http://www2u.biglobe.ne.jp/~hsaka/w3m/patch/
		65	PATCHFILES= w3m-0.2.1-img-1.3.patch
		66	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-XMakefile
		67
		68	USE_IMLIB= yes
		69
		70	DOCS_JP+= README.img
		71	PLIST_SUB+= INLINE_IMAGE_ONLY=""
		72	.else
		73	EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-XMakefile.noimg
		74	PLIST_SUB+= INLINE_IMAGE_ONLY="@comment "
		75	.endif
		76
		77	.if !defined(WITHOUT_IMLIB)
		78	post-patch:
		79	@${CP} ${WRKSRC}/README.img ${WRKSRC}/doc-jp/
57	.endif	80	.endif
58		81
59	post-configure:	82	post-configure:

Line 1 Link Here

(-)w3m/distinfo (+1 lines)
1	MD5 (w3m-0.2.1.tar.gz) = 906c2506f570b563807bcd1d23fecea5	1	MD5 (w3m-0.2.1.tar.gz) = 906c2506f570b563807bcd1d23fecea5
		2	MD5 (w3m-0.2.1-img-1.3.patch) = 33c68defc24791ac3439ddae4f8a7c47




--- XMakefile.orig	Mon Jul 16 11:14:38 2001
+++ XMakefile	Mon Jul 16 11:14:47 2001
@@ -22,16 +22,16 @@
 
 INCLUDES=-I.
 
-DEFS=$(INCLUDES) # -DDEBUG
-CFLAGS=$(MYCFLAGS) $(DEFS) 
-LIBS=-L. -lindep $(GCLIB) $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
+DEFS+=$(INCLUDES) # -DDEBUG
+CFLAGS+=$(DEFS) 
+LIBS+=-L. -lindep -lgc $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
 INSTALL=sh install.sh
 INSTALL2=sh ../install.sh
 AR=ar
 
 all: $(TARGETS)
 
-$(TARGET): $(ALLOBJS) $(ALIB) $(GCTARGET)
+$(TARGET): $(ALLOBJS) $(ALIB)
 	$(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
 
 $(ALIB): $(ALIBOBJS)
@@ -86,24 +86,24 @@
 install: $(TARGETS)
 	-$(MKDIR) $(DESTDIR)$(BIN_DIR)
 	-$(MKDIR) $(DESTDIR)$(HELP_DIR)
+	-$(MKDIR) $(DESTDIR)$(HELP_DIR_JA)
 	-$(MKDIR) $(DESTDIR)$(LIB_DIR)
-	$(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
-	$(INSTALL) -m 644 w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html
-	$(INSTALL) -m 644 w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_ja.html
-	$(INSTALL) -m 644 w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
-	$(INSTALL) -m 644 w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_ja.html
-	$(INSTALL) -m 644 $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
-	for d in $(BOOKMARKER) $(HELPER) $(IMGDISPLAY) $(IMGSIZE); \
-		do $(INSTALL) -m 755 $$d $(DESTDIR)$(LIB_DIR)/$$d; done
-	(cd scripts; for i in *.cgi; do $(INSTALL2) -m 755 $$i $(DESTDIR)$(LIB_DIR)/$$i; done)
+	$(BSD_INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
+	$(BSD_INSTALL_DATA) w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html
+	$(BSD_INSTALL_DATA) w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-w3m_ja.html
+	$(BSD_INSTALL_DATA) w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
+	$(BSD_INSTALL_DATA) w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-lynx_ja.html
+	for d in $(BOOKMARKER) $(HELPER) $(IMGDISPLAY) $(IMGSIZE); do $(BSD_INSTALL_PROGRAM) $$d $(DESTDIR)$(LIB_DIR)/$$d; done
+	cd scripts; for i in *.cgi; do $(BSD_INSTALL_SCRIPT) $$i $(DESTDIR)$(LIB_DIR)/$$i; done
 
 uninstall:
 	-$(RM) $(BIN_DIR)/$(TARGET)
 	-$(RM) $(HELP_DIR)/w3mhelp-lynx_en.html
-	-$(RM) $(HELP_DIR)/w3mhelp-lynx_ja.html
+	-$(RM) $(HELP_DIR_JA)/w3mhelp-lynx_ja.html
 	-$(RM) $(HELP_DIR)/w3mhelp-w3m_en.html 
-	-$(RM) $(HELP_DIR)/w3mhelp-w3m_ja.html 
-	-$(RM) $(HELP_DIR)/w3mhelp.html
+	-$(RM) $(HELP_DIR_JA)/w3mhelp-w3m_ja.html 
+	-$(RM) $(LIB_DIR)/$(BOOKMARKER)
+	-$(RM) $(LIB_DIR)/$(HELPER)
 
 clean: sweep
 	rm -f *.o *.a $(TARGETS) mktable$(EXT)




--- XMakefile.orig	Fri Apr 21 13:35:48 2000
+++ XMakefile	Sat Apr 22 06:51:43 2000
@@ -18,16 +18,16 @@
 
 INCLUDES=-I.
 
-DEFS=$(INCLUDES) # -DDEBUG
-CFLAGS=$(MYCFLAGS) $(DEFS) 
-LIBS=-L. -lindep $(GCLIB) $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
+DEFS+=$(INCLUDES) # -DDEBUG
+CFLAGS+=$(DEFS) 
+LIBS+=-L. -lindep -lgc $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
 INSTALL=sh install.sh
 INSTALL2=sh ../install.sh
 AR=ar
 
 all: $(TARGETS)
 
-$(TARGET): $(ALLOBJS) $(ALIB) $(GCTARGET)
+$(TARGET): $(ALLOBJS) $(ALIB)
 	$(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
 
 $(ALIB): $(ALIBOBJS)
@@ -67,23 +67,24 @@
 install: $(TARGETS)
 	-$(MKDIR) $(DESTDIR)$(BIN_DIR)
 	-$(MKDIR) $(DESTDIR)$(HELP_DIR)
+	-$(MKDIR) $(DESTDIR)$(HELP_DIR_JA)
 	-$(MKDIR) $(DESTDIR)$(LIB_DIR)
-	$(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
-	$(INSTALL) -m 644 w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html
-	$(INSTALL) -m 644 w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_ja.html
-	$(INSTALL) -m 644 w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
-	$(INSTALL) -m 644 w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_ja.html
-	$(INSTALL) -m 644 $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
-	for d in $(BOOKMARKER) $(HELPER); do $(INSTALL) -m 755 $$d $(DESTDIR)$(LIB_DIR)/$$d; done
-	(cd scripts; for i in *.cgi; do $(INSTALL2) -m 755 $$i $(DESTDIR)$(LIB_DIR)/$$i; done)
+	$(BSD_INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
+	$(BSD_INSTALL_DATA) w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html
+	$(BSD_INSTALL_DATA) w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-w3m_ja.html
+	$(BSD_INSTALL_DATA) w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
+	$(BSD_INSTALL_DATA) w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-lynx_ja.html
+	for d in $(BOOKMARKER) $(HELPER); do $(BSD_INSTALL_PROGRAM) $$d $(DESTDIR)$(LIB_DIR)/$$d; done
+	cd scripts; for i in *.cgi; do $(BSD_INSTALL_SCRIPT) $$i $(DESTDIR)$(LIB_DIR)/$$i; done
 
 uninstall:
 	-$(RM) $(BIN_DIR)/$(TARGET)
 	-$(RM) $(HELP_DIR)/w3mhelp-lynx_en.html
-	-$(RM) $(HELP_DIR)/w3mhelp-lynx_ja.html
+	-$(RM) $(HELP_DIR_JA)/w3mhelp-lynx_ja.html
 	-$(RM) $(HELP_DIR)/w3mhelp-w3m_en.html 
-	-$(RM) $(HELP_DIR)/w3mhelp-w3m_ja.html 
-	-$(RM) $(HELP_DIR)/w3mhelp.html
+	-$(RM) $(HELP_DIR_JA)/w3mhelp-w3m_ja.html 
+	-$(RM) $(LIB_DIR)/$(BOOKMARKER)
+	-$(RM) $(LIB_DIR)/$(HELPER)
 
 clean: sweep
 	rm -f *.o *.a $(TARGETS) mktable

Lines 1-5 Link Here

(-)w3m/files/patch-aa (-3 / +6 lines)
1	--- config.h.orig Fri Mar 23 11:49:44 2001	1	--- config.h.orig Mon Jul 16 11:23:48 2001
2	+++ config.h Fri Mar 23 15:20:22 2001	2	+++ config.h Mon Jul 16 11:24:21 2001
3	@@ -18,7 +18,7 @@	3	@@ -18,7 +18,7 @@
4	goto-next-mark (ESC p), goto-next-mark (ESC n) and	4	goto-next-mark (ESC p), goto-next-mark (ESC n) and
5	mark-by-regexp (").	5	mark-by-regexp (").
Lines 63-69 Link Here
63	RANLIB=ranlib	63	RANLIB=ranlib
64	MKDIR=mkdir -p	64	MKDIR=mkdir -p
65	VERSION=0.2.1	65	VERSION=0.2.1
66	@@ -120,26 +115,36 @@	66	@@ -120,26 +115,39 @@
67		67
68	#define JA 0	68	#define JA 0
69	#define EN 1	69	#define EN 1
Lines 101-106 Link Here
101	+#define DEF_EDITOR "/usr/bin/vi"	101	+#define DEF_EDITOR "/usr/bin/vi"
102	+#define DEF_MAILER "/usr/bin/mail"	102	+#define DEF_MAILER "/usr/bin/mail"
103	+#define DEF_EXT_BROWSER "%%PREFIX%%/bin/netscape"	103	+#define DEF_EXT_BROWSER "%%PREFIX%%/bin/netscape"
		104	+
		105	+#define IMGSIZE "w3mimgsize"
		106	+#define IMGDISPLAY "w3mimgdisplay"
104	+	107	+
105	+#define LIB_DIR "%%PREFIX%%/libexec/w3m"	108	+#define LIB_DIR "%%PREFIX%%/libexec/w3m"
106	+#ifdef JAPANESE	109	+#ifdef JAPANESE




--- XMakefile.orig	Fri Apr 21 13:35:48 2000
+++ XMakefile	Sat Apr 22 06:51:43 2000
@@ -18,16 +18,16 @@
 
 INCLUDES=-I.
 
-DEFS=$(INCLUDES) # -DDEBUG
-CFLAGS=$(MYCFLAGS) $(DEFS) 
-LIBS=-L. -lindep $(GCLIB) $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
+DEFS+=$(INCLUDES) # -DDEBUG
+CFLAGS+=$(DEFS) 
+LIBS+=-L. -lindep -lgc $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
 INSTALL=sh install.sh
 INSTALL2=sh ../install.sh
 AR=ar
 
 all: $(TARGETS)
 
-$(TARGET): $(ALLOBJS) $(ALIB) $(GCTARGET)
+$(TARGET): $(ALLOBJS) $(ALIB)
 	$(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
 
 $(ALIB): $(ALIBOBJS)
@@ -67,23 +67,24 @@
 install: $(TARGETS)
 	-$(MKDIR) $(DESTDIR)$(BIN_DIR)
 	-$(MKDIR) $(DESTDIR)$(HELP_DIR)
+	-$(MKDIR) $(DESTDIR)$(HELP_DIR_JA)
 	-$(MKDIR) $(DESTDIR)$(LIB_DIR)
-	$(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
-	$(INSTALL) -m 644 w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html
-	$(INSTALL) -m 644 w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_ja.html
-	$(INSTALL) -m 644 w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
-	$(INSTALL) -m 644 w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_ja.html
-	$(INSTALL) -m 644 $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
-	for d in $(BOOKMARKER) $(HELPER); do $(INSTALL) -m 755 $$d $(DESTDIR)$(LIB_DIR)/$$d; done
-	(cd scripts; for i in *.cgi; do $(INSTALL2) -m 755 $$i $(DESTDIR)$(LIB_DIR)/$$i; done)
+	$(BSD_INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
+	$(BSD_INSTALL_DATA) w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html
+	$(BSD_INSTALL_DATA) w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-w3m_ja.html
+	$(BSD_INSTALL_DATA) w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
+	$(BSD_INSTALL_DATA) w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-lynx_ja.html
+	for d in $(BOOKMARKER) $(HELPER); do $(BSD_INSTALL_PROGRAM) $$d $(DESTDIR)$(LIB_DIR)/$$d; done
+	cd scripts; for i in *.cgi; do $(BSD_INSTALL_SCRIPT) $$i $(DESTDIR)$(LIB_DIR)/$$i; done
 
 uninstall:
 	-$(RM) $(BIN_DIR)/$(TARGET)
 	-$(RM) $(HELP_DIR)/w3mhelp-lynx_en.html
-	-$(RM) $(HELP_DIR)/w3mhelp-lynx_ja.html
+	-$(RM) $(HELP_DIR_JA)/w3mhelp-lynx_ja.html
 	-$(RM) $(HELP_DIR)/w3mhelp-w3m_en.html 
-	-$(RM) $(HELP_DIR)/w3mhelp-w3m_ja.html 
-	-$(RM) $(HELP_DIR)/w3mhelp.html
+	-$(RM) $(HELP_DIR_JA)/w3mhelp-w3m_ja.html 
+	-$(RM) $(LIB_DIR)/$(BOOKMARKER)
+	-$(RM) $(LIB_DIR)/$(HELPER)
 
 clean: sweep
 	rm -f *.o *.a $(TARGETS) mktable




libexec/w3m/dirlist.cgi
libexec/w3m/w3mbookmark
libexec/w3m/w3mhelperpanel
%%INLINE_IMAGE_ONLY%%libexec/w3m/w3mimgdisplay
%%INLINE_IMAGE_ONLY%%libexec/w3m/w3mimgsize
%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/FAQ.html
%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/HISTORY
%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/HISTORY.kokb
%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/MANUAL.html
%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README
%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.SSL
%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.cookie
%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.dict
%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.func
%%PORTDOCS%%%%JAPANESE_ONLY%%%%INLINE_IMAGE_ONLY%%share/doc/ja/w3m/README.img
%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.keymap
%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.mailcap
%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.menu
%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/STORY.html
%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/keymap.default
%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/keymap.lynx
%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/menu.default
%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/menu.submenu
share/doc/ja/w3m/w3mhelp-lynx_ja.html
share/doc/ja/w3m/w3mhelp-w3m_ja.html
%%PORTDOCS%%share/doc/w3m/FAQ.html
%%PORTDOCS%%share/doc/w3m/HISTORY
%%PORTDOCS%%share/doc/w3m/MANUAL.html
%%PORTDOCS%%share/doc/w3m/README
%%PORTDOCS%%share/doc/w3m/README.dict
%%PORTDOCS%%share/doc/w3m/README.func
%%PORTDOCS%%share/doc/w3m/STORY.html
%%PORTDOCS%%share/doc/w3m/keymap.default
%%PORTDOCS%%share/doc/w3m/keymap.lynx
%%PORTDOCS%%share/doc/w3m/menu.default
%%PORTDOCS%%share/doc/w3m/menu.submenu
share/doc/w3m/w3mhelp-lynx_en.html
share/doc/w3m/w3mhelp-w3m_en.html
@dirrm libexec/w3m




bin/w3m
libexec/w3m/dirlist.cgi
libexec/w3m/w3mbookmark
libexec/w3m/w3mhelperpanel
share/doc/ja/w3m/FAQ.html
share/doc/ja/w3m/HISTORY
share/doc/ja/w3m/HISTORY.kokb
share/doc/ja/w3m/MANUAL.html
share/doc/ja/w3m/README
share/doc/ja/w3m/README.SSL
share/doc/ja/w3m/README.cookie
share/doc/ja/w3m/README.dict
share/doc/ja/w3m/README.func
share/doc/ja/w3m/README.keymap
share/doc/ja/w3m/README.mailcap
share/doc/ja/w3m/README.menu
share/doc/ja/w3m/STORY.html
share/doc/ja/w3m/keymap.default
share/doc/ja/w3m/keymap.lynx
share/doc/ja/w3m/menu.default
share/doc/ja/w3m/menu.submenu
share/doc/ja/w3m/w3mhelp-lynx_ja.html
share/doc/ja/w3m/w3mhelp-w3m_ja.html
share/doc/w3m/FAQ.html
share/doc/w3m/HISTORY
share/doc/w3m/MANUAL.html
share/doc/w3m/README
share/doc/w3m/README.dict
share/doc/w3m/README.func
share/doc/w3m/STORY.html
share/doc/w3m/keymap.default
share/doc/w3m/keymap.lynx
share/doc/w3m/menu.default
share/doc/w3m/menu.submenu
share/doc/w3m/w3mhelp-lynx_en.html
share/doc/w3m/w3mhelp-w3m_en.html
@dirrm libexec/w3m
@dirrm share/doc/ja/w3m
@dirrm share/doc/w3m

Return to bug 28996

Line 0 Link Here

(-)w3m/files/extra-patch-XMakefile (+60 lines)
	1	--- XMakefile.orig Mon Jul 16 11:14:38 2001
	2	+++ XMakefile Mon Jul 16 11:14:47 2001
	3	@@ -22,16 +22,16 @@
	4
	5	INCLUDES=-I.
	6
	7	-DEFS=$(INCLUDES) # -DDEBUG
	8	-CFLAGS=$(MYCFLAGS) $(DEFS)
	9	-LIBS=-L. -lindep $(GCLIB) $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
	10	+DEFS+=$(INCLUDES) # -DDEBUG
	11	+CFLAGS+=$(DEFS)
	12	+LIBS+=-L. -lindep -lgc $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
	13	INSTALL=sh install.sh
	14	INSTALL2=sh ../install.sh
	15	AR=ar
	16
	17	all: $(TARGETS)
	18
	19	-$(TARGET): $(ALLOBJS) $(ALIB) $(GCTARGET)
	20	+$(TARGET): $(ALLOBJS) $(ALIB)
	21	$(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
	22
	23	$(ALIB): $(ALIBOBJS)
	24	@@ -86,24 +86,24 @@
	25	install: $(TARGETS)
	26	-$(MKDIR) $(DESTDIR)$(BIN_DIR)
	27	-$(MKDIR) $(DESTDIR)$(HELP_DIR)
	28	+ -$(MKDIR) $(DESTDIR)$(HELP_DIR_JA)
	29	-$(MKDIR) $(DESTDIR)$(LIB_DIR)
	30	- $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
	31	- $(INSTALL) -m 644 w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html
	32	- $(INSTALL) -m 644 w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_ja.html
	33	- $(INSTALL) -m 644 w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
	34	- $(INSTALL) -m 644 w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_ja.html
	35	- $(INSTALL) -m 644 $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
	36	- for d in $(BOOKMARKER) $(HELPER) $(IMGDISPLAY) $(IMGSIZE); \
	37	- do $(INSTALL) -m 755 $$d $(DESTDIR)$(LIB_DIR)/$$d; done
	38	- (cd scripts; for i in *.cgi; do $(INSTALL2) -m 755 $$i $(DESTDIR)$(LIB_DIR)/$$i; done)
	39	+ $(BSD_INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
	40	+ $(BSD_INSTALL_DATA) w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html
	41	+ $(BSD_INSTALL_DATA) w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-w3m_ja.html
	42	+ $(BSD_INSTALL_DATA) w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
	43	+ $(BSD_INSTALL_DATA) w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-lynx_ja.html
	44	+ for d in $(BOOKMARKER) $(HELPER) $(IMGDISPLAY) $(IMGSIZE); do $(BSD_INSTALL_PROGRAM) $$d $(DESTDIR)$(LIB_DIR)/$$d; done
	45	+ cd scripts; for i in *.cgi; do $(BSD_INSTALL_SCRIPT) $$i $(DESTDIR)$(LIB_DIR)/$$i; done
	46
	47	uninstall:
	48	-$(RM) $(BIN_DIR)/$(TARGET)
	49	-$(RM) $(HELP_DIR)/w3mhelp-lynx_en.html
	50	- -$(RM) $(HELP_DIR)/w3mhelp-lynx_ja.html
	51	+ -$(RM) $(HELP_DIR_JA)/w3mhelp-lynx_ja.html
	52	-$(RM) $(HELP_DIR)/w3mhelp-w3m_en.html
	53	- -$(RM) $(HELP_DIR)/w3mhelp-w3m_ja.html
	54	- -$(RM) $(HELP_DIR)/w3mhelp.html
	55	+ -$(RM) $(HELP_DIR_JA)/w3mhelp-w3m_ja.html
	56	+ -$(RM) $(LIB_DIR)/$(BOOKMARKER)
	57	+ -$(RM) $(LIB_DIR)/$(HELPER)
	58
	59	clean: sweep
	60	rm -f .o .a $(TARGETS) mktable$(EXT)

Line 0 Link Here

(-)w3m/files/extra-patch-XMakefile.noimg (+59 lines)
	1	--- XMakefile.orig Fri Apr 21 13:35:48 2000
	2	+++ XMakefile Sat Apr 22 06:51:43 2000
	3	@@ -18,16 +18,16 @@
	4
	5	INCLUDES=-I.
	6
	7	-DEFS=$(INCLUDES) # -DDEBUG
	8	-CFLAGS=$(MYCFLAGS) $(DEFS)
	9	-LIBS=-L. -lindep $(GCLIB) $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
	10	+DEFS+=$(INCLUDES) # -DDEBUG
	11	+CFLAGS+=$(DEFS)
	12	+LIBS+=-L. -lindep -lgc $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
	13	INSTALL=sh install.sh
	14	INSTALL2=sh ../install.sh
	15	AR=ar
	16
	17	all: $(TARGETS)
	18
	19	-$(TARGET): $(ALLOBJS) $(ALIB) $(GCTARGET)
	20	+$(TARGET): $(ALLOBJS) $(ALIB)
	21	$(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
	22
	23	$(ALIB): $(ALIBOBJS)
	24	@@ -67,23 +67,24 @@
	25	install: $(TARGETS)
	26	-$(MKDIR) $(DESTDIR)$(BIN_DIR)
	27	-$(MKDIR) $(DESTDIR)$(HELP_DIR)
	28	+ -$(MKDIR) $(DESTDIR)$(HELP_DIR_JA)
	29	-$(MKDIR) $(DESTDIR)$(LIB_DIR)
	30	- $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
	31	- $(INSTALL) -m 644 w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html
	32	- $(INSTALL) -m 644 w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_ja.html
	33	- $(INSTALL) -m 644 w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
	34	- $(INSTALL) -m 644 w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_ja.html
	35	- $(INSTALL) -m 644 $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
	36	- for d in $(BOOKMARKER) $(HELPER); do $(INSTALL) -m 755 $$d $(DESTDIR)$(LIB_DIR)/$$d; done
	37	- (cd scripts; for i in *.cgi; do $(INSTALL2) -m 755 $$i $(DESTDIR)$(LIB_DIR)/$$i; done)
	38	+ $(BSD_INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
	39	+ $(BSD_INSTALL_DATA) w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html
	40	+ $(BSD_INSTALL_DATA) w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-w3m_ja.html
	41	+ $(BSD_INSTALL_DATA) w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
	42	+ $(BSD_INSTALL_DATA) w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-lynx_ja.html
	43	+ for d in $(BOOKMARKER) $(HELPER); do $(BSD_INSTALL_PROGRAM) $$d $(DESTDIR)$(LIB_DIR)/$$d; done
	44	+ cd scripts; for i in *.cgi; do $(BSD_INSTALL_SCRIPT) $$i $(DESTDIR)$(LIB_DIR)/$$i; done
	45
	46	uninstall:
	47	-$(RM) $(BIN_DIR)/$(TARGET)
	48	-$(RM) $(HELP_DIR)/w3mhelp-lynx_en.html
	49	- -$(RM) $(HELP_DIR)/w3mhelp-lynx_ja.html
	50	+ -$(RM) $(HELP_DIR_JA)/w3mhelp-lynx_ja.html
	51	-$(RM) $(HELP_DIR)/w3mhelp-w3m_en.html
	52	- -$(RM) $(HELP_DIR)/w3mhelp-w3m_ja.html
	53	- -$(RM) $(HELP_DIR)/w3mhelp.html
	54	+ -$(RM) $(HELP_DIR_JA)/w3mhelp-w3m_ja.html
	55	+ -$(RM) $(LIB_DIR)/$(BOOKMARKER)
	56	+ -$(RM) $(LIB_DIR)/$(HELPER)
	57
	58	clean: sweep
	59	rm -f .o .a $(TARGETS) mktable

Lines 1-59 Link Here

(-)w3m/files/patch-ae (-59 lines)
1	--- XMakefile.orig Fri Apr 21 13:35:48 2000
2	+++ XMakefile Sat Apr 22 06:51:43 2000
3	@@ -18,16 +18,16 @@
4
5	INCLUDES=-I.
6
7	-DEFS=$(INCLUDES) # -DDEBUG
8	-CFLAGS=$(MYCFLAGS) $(DEFS)
9	-LIBS=-L. -lindep $(GCLIB) $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
10	+DEFS+=$(INCLUDES) # -DDEBUG
11	+CFLAGS+=$(DEFS)
12	+LIBS+=-L. -lindep -lgc $(MATHLIB) $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
13	INSTALL=sh install.sh
14	INSTALL2=sh ../install.sh
15	AR=ar
16
17	all: $(TARGETS)
18
19	-$(TARGET): $(ALLOBJS) $(ALIB) $(GCTARGET)
20	+$(TARGET): $(ALLOBJS) $(ALIB)
21	$(CC) $(CFLAGS) -o $(TARGET) $(ALLOBJS) $(LIBS)
22
23	$(ALIB): $(ALIBOBJS)
24	@@ -67,23 +67,24 @@
25	install: $(TARGETS)
26	-$(MKDIR) $(DESTDIR)$(BIN_DIR)
27	-$(MKDIR) $(DESTDIR)$(HELP_DIR)
28	+ -$(MKDIR) $(DESTDIR)$(HELP_DIR_JA)
29	-$(MKDIR) $(DESTDIR)$(LIB_DIR)
30	- $(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
31	- $(INSTALL) -m 644 w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html
32	- $(INSTALL) -m 644 w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_ja.html
33	- $(INSTALL) -m 644 w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
34	- $(INSTALL) -m 644 w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_ja.html
35	- $(INSTALL) -m 644 $(HELP_FILE) $(DESTDIR)$(HELP_DIR)/w3mhelp.html
36	- for d in $(BOOKMARKER) $(HELPER); do $(INSTALL) -m 755 $$d $(DESTDIR)$(LIB_DIR)/$$d; done
37	- (cd scripts; for i in *.cgi; do $(INSTALL2) -m 755 $$i $(DESTDIR)$(LIB_DIR)/$$i; done)
38	+ $(BSD_INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
39	+ $(BSD_INSTALL_DATA) w3mhelp-w3m_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-w3m_en.html
40	+ $(BSD_INSTALL_DATA) w3mhelp-w3m_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-w3m_ja.html
41	+ $(BSD_INSTALL_DATA) w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
42	+ $(BSD_INSTALL_DATA) w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-lynx_ja.html
43	+ for d in $(BOOKMARKER) $(HELPER); do $(BSD_INSTALL_PROGRAM) $$d $(DESTDIR)$(LIB_DIR)/$$d; done
44	+ cd scripts; for i in *.cgi; do $(BSD_INSTALL_SCRIPT) $$i $(DESTDIR)$(LIB_DIR)/$$i; done
45
46	uninstall:
47	-$(RM) $(BIN_DIR)/$(TARGET)
48	-$(RM) $(HELP_DIR)/w3mhelp-lynx_en.html
49	- -$(RM) $(HELP_DIR)/w3mhelp-lynx_ja.html
50	+ -$(RM) $(HELP_DIR_JA)/w3mhelp-lynx_ja.html
51	-$(RM) $(HELP_DIR)/w3mhelp-w3m_en.html
52	- -$(RM) $(HELP_DIR)/w3mhelp-w3m_ja.html
53	- -$(RM) $(HELP_DIR)/w3mhelp.html
54	+ -$(RM) $(HELP_DIR_JA)/w3mhelp-w3m_ja.html
55	+ -$(RM) $(LIB_DIR)/$(BOOKMARKER)
56	+ -$(RM) $(LIB_DIR)/$(HELPER)
57
58	clean: sweep
59	rm -f .o .a $(TARGETS) mktable

Lines 2-20 Link Here

(-)w3m/pkg-plist (-11 / +31 lines)
2	libexec/w3m/dirlist.cgi	2	libexec/w3m/dirlist.cgi
3	libexec/w3m/w3mbookmark	3	libexec/w3m/w3mbookmark
4	libexec/w3m/w3mhelperpanel	4	libexec/w3m/w3mhelperpanel
		5	%%INLINE_IMAGE_ONLY%%libexec/w3m/w3mimgdisplay
		6	%%INLINE_IMAGE_ONLY%%libexec/w3m/w3mimgsize
		7	%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/FAQ.html
		8	%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/HISTORY
		9	%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/HISTORY.kokb
		10	%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/MANUAL.html
		11	%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README
		12	%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.SSL
		13	%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.cookie
		14	%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.dict
		15	%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.func
		16	%%PORTDOCS%%%%JAPANESE_ONLY%%%%INLINE_IMAGE_ONLY%%share/doc/ja/w3m/README.img
		17	%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.keymap
		18	%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.mailcap
		19	%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/README.menu
		20	%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/STORY.html
		21	%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/keymap.default
		22	%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/keymap.lynx
		23	%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/menu.default
		24	%%PORTDOCS%%%%JAPANESE_ONLY%%share/doc/ja/w3m/menu.submenu
5	share/doc/ja/w3m/w3mhelp-lynx_ja.html	25	share/doc/ja/w3m/w3mhelp-lynx_ja.html
6	share/doc/ja/w3m/w3mhelp-w3m_ja.html	26	share/doc/ja/w3m/w3mhelp-w3m_ja.html
7	share/doc/w3m/FAQ.html	27	%%PORTDOCS%%share/doc/w3m/FAQ.html
8	share/doc/w3m/HISTORY	28	%%PORTDOCS%%share/doc/w3m/HISTORY
9	share/doc/w3m/MANUAL.html	29	%%PORTDOCS%%share/doc/w3m/MANUAL.html
10	share/doc/w3m/README	30	%%PORTDOCS%%share/doc/w3m/README
11	share/doc/w3m/README.dict	31	%%PORTDOCS%%share/doc/w3m/README.dict
12	share/doc/w3m/README.func	32	%%PORTDOCS%%share/doc/w3m/README.func
13	share/doc/w3m/STORY.html	33	%%PORTDOCS%%share/doc/w3m/STORY.html
14	share/doc/w3m/keymap.default	34	%%PORTDOCS%%share/doc/w3m/keymap.default
15	share/doc/w3m/keymap.lynx	35	%%PORTDOCS%%share/doc/w3m/keymap.lynx
16	share/doc/w3m/menu.default	36	%%PORTDOCS%%share/doc/w3m/menu.default
17	share/doc/w3m/menu.submenu	37	%%PORTDOCS%%share/doc/w3m/menu.submenu
18	share/doc/w3m/w3mhelp-lynx_en.html	38	share/doc/w3m/w3mhelp-lynx_en.html
19	share/doc/w3m/w3mhelp-w3m_en.html	39	share/doc/w3m/w3mhelp-w3m_en.html
20	@dirrm libexec/w3m	40	@dirrm libexec/w3m

Lines 1-39 Link Here

(-)w3m/pkg-plist.ja (-39 lines)
1	bin/w3m
2	libexec/w3m/dirlist.cgi
3	libexec/w3m/w3mbookmark
4	libexec/w3m/w3mhelperpanel
5	share/doc/ja/w3m/FAQ.html
6	share/doc/ja/w3m/HISTORY
7	share/doc/ja/w3m/HISTORY.kokb
8	share/doc/ja/w3m/MANUAL.html
9	share/doc/ja/w3m/README
10	share/doc/ja/w3m/README.SSL
11	share/doc/ja/w3m/README.cookie
12	share/doc/ja/w3m/README.dict
13	share/doc/ja/w3m/README.func
14	share/doc/ja/w3m/README.keymap
15	share/doc/ja/w3m/README.mailcap
16	share/doc/ja/w3m/README.menu
17	share/doc/ja/w3m/STORY.html
18	share/doc/ja/w3m/keymap.default
19	share/doc/ja/w3m/keymap.lynx
20	share/doc/ja/w3m/menu.default
21	share/doc/ja/w3m/menu.submenu
22	share/doc/ja/w3m/w3mhelp-lynx_ja.html
23	share/doc/ja/w3m/w3mhelp-w3m_ja.html
24	share/doc/w3m/FAQ.html
25	share/doc/w3m/HISTORY
26	share/doc/w3m/MANUAL.html
27	share/doc/w3m/README
28	share/doc/w3m/README.dict
29	share/doc/w3m/README.func
30	share/doc/w3m/STORY.html
31	share/doc/w3m/keymap.default
32	share/doc/w3m/keymap.lynx
33	share/doc/w3m/menu.default
34	share/doc/w3m/menu.submenu
35	share/doc/w3m/w3mhelp-lynx_en.html
36	share/doc/w3m/w3mhelp-w3m_en.html
37	@dirrm libexec/w3m
38	@dirrm share/doc/ja/w3m
39	@dirrm share/doc/w3m