head	1.6;
access;
symbols
	RELEASE_4_3_0:1.5
	RELEASE_4_2_0:1.5
	RELEASE_4_1_1:1.5
	RELEASE_4_1_0:1.5
	RELEASE_3_5_0:1.5
	RELEASE_4_0_0:1.4
	RELEASE_3_4_0:1.3;
locks; strict;
comment	@# @;


1.6
date	2001.07.21.18.21.56;	author sf;	state dead;
branches;
next	1.5;

1.5
date	2000.04.22.02.50.41;	author will;	state Exp;
branches;
next	1.4;

1.4
date	2000.01.30.16.23.54;	author imura;	state Exp;
branches;
next	1.3;

1.3
date	99.12.07.16.41.52;	author sumikawa;	state Exp;
branches;
next	1.2;

1.2
date	99.11.14.02.02.03;	author steve;	state Exp;
branches;
next	1.1;

1.1
date	99.10.11.19.00.30;	author sada;	state Exp;
branches;
next	;


desc
@@


1.6
log
@o add w3m-image, w3m with Imlib-based inline image browsing capability.
o remove w3m-ssl, w3m has SSL support by default now.

PR:		28996, 28997, 28998
Submitted by:	maintainer
@
text
@--- 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
@


1.5
log
@Update w3m to 0.1.9.

PR:		18149
Submitted by:	maintainer
@
text
@@


1.4
log
@Update to version 0.1.7.

PR:		16448
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- XMakefile.orig	Fri Jan 28 08:38:16 2000
+++ XMakefile	Fri Jan 28 18:55:34 2000
@@@@ -18,14 +18,14 @@@@
d7 1
a7 1
-DEFS=$(INCLUDES) #-DSTR_DEBUG # -DDEBUG
d9 4
a12 4
-LIBS=-L. -lindep $(GCLIB) -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
+DEFS+=$(INCLUDES) #-DSTR_DEBUG # -DDEBUG
+CFLAGS+=$(MYCFLAGS) $(DEFS) 
+LIBS+=-L. -lindep -lgc -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
d14 2
d24 1
a24 1
@@@@ -66,23 +66,24 @@@@
d31 2
a32 2
-	$(INSTALL) -m 644 w3mhelp_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp_en.html
-	$(INSTALL) -m 644 w3mhelp_ja.html $(DESTDIR)$(HELP_DIR)/w3mhelp_ja.html
d37 8
a44 8
-	(cd scripts; ln -s ../install.sh .; for i in *.cgi; do $(INSTALL) -m 755 $$i $(DESTDIR)$(LIB_DIR)/$$i; done)
+	$(BSD_INSTALL_PROGRAM) -m 755 $(TARGET) $(DESTDIR)$(BIN_DIR)/$(TARGET)
+	$(BSD_INSTALL_DATA) -m 644 w3mhelp_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp_en.html
+	$(BSD_INSTALL_DATA) -m 644 w3mhelp_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp_ja.html
+	$(BSD_INSTALL_DATA) -m 644 w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)/w3mhelp-lynx_en.html
+	$(BSD_INSTALL_DATA) -m 644 w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR_JA)/w3mhelp-lynx_ja.html
+	for d in $(BOOKMARKER) $(HELPER); do $(BSD_INSTALL_PROGRAM) -m 755 $$d $(DESTDIR)$(LIB_DIR)/$$d; done
+	(cd scripts; for i in *.cgi; do $(BSD_INSTALL_SCRIPT) -m 755 $$i $(DESTDIR)$(LIB_DIR)/$$i; done)
d51 2
a52 2
 	-$(RM) $(HELP_DIR)/w3mhelp_en.html 
-	-$(RM) $(HELP_DIR)/w3mhelp_ja.html 
d54 1
a54 1
+	-$(RM) $(HELP_DIR_JA)/w3mhelp_ja.html 
@


1.3
log
@Upgrade to 991203.

PR:		15283
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- XMakefile.orig	Fri Dec  3 10:57:55 1999
+++ XMakefile	Mon Dec  6 03:12:50 1999
@@@@ -17,16 +17,16 @@@@
d9 1
a9 1
-LIBS=-L. -laa $(GCLIB) -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
d12 1
a12 1
+LIBS+=$(ALIB) -lgc -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
a13 2
 INSTALL2=sh ../install.sh
 RANLIB=ranlib
d22 1
a22 3
@@@@ -48,25 +48,26 @@@@
 	cd gc; make CC='$(CC) $(MYCFLAGS)'
 
d24 4
a27 2
-	-mkdir $(DESTDIR)$(BIN_DIR)
-	-mkdir $(DESTDIR)$(HELP_DIR)
d34 2
a35 6
-	$(INSTALL) -m 755 $(BOOKMARKER) $(DESTDIR)$(HELP_DIR)/$(BOOKMARKER)
-	(cd scripts; for i in *; do $(INSTALL2) -m 755 $$i $(DESTDIR)$(HELP_DIR)/$$i; done)
+	-mkdir -p $(DESTDIR)$(BIN_DIR)
+	-mkdir -p $(DESTDIR)$(LIB_DIR)
+	-mkdir -p $(DESTDIR)$(HELP_DIR)
+	-mkdir -p $(DESTDIR)$(HELP_DIR_JA)
d41 2
a42 2
+	$(BSD_INSTALL_PROGRAM) -m 755 $(BOOKMARKER) $(DESTDIR)$(LIB_DIR)/$(BOOKMARKER)
+	(cd scripts; for i in *; do $(BSD_INSTALL_SCRIPT) -m 755 $$i $(DESTDIR)$(LIB_DIR)/$$i; done)
d51 1
a52 2
 	-$(RM) $(HELP_DIR)/w3mhelp.html
-	-$(RM) $(HELP_DIR)/$(BOOKMARKER)
d54 1
d56 2
a57 2
 clean:
 	rm -f *.o $(TARGETS) $(ALIB) mktable tagtable.c
@


1.2
log
@Update to version 991028-2.

PR:		14691
Submitted by:	maintainer
@
text
@d1 3
a3 3
--- XMakefile.orig	Thu Oct 28 12:09:40 1999
+++ XMakefile	Tue Nov  2 17:20:30 1999
@@@@ -14,9 +14,9 @@@@
d9 1
a9 1
-LIBS=$(GCLIB) -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
d12 1
a12 1
+LIBS+=$(GCLIB) -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
d14 2
d17 8
a24 2
 $(TARGET): $(ALLOBJS) $(GCTARGET)
@@@@ -28,21 +28,21 @@@@
d27 1
a27 1
 install: $(TARGET)
d30 5
a34 5
-	$(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(BIN_DIR)
-	$(INSTALL) -m 644 w3mhelp_en.html $(DESTDIR)$(HELP_DIR)
-	$(INSTALL) -m 644 w3mhelp_ja.html $(DESTDIR)$(HELP_DIR)
-	$(INSTALL) -m 644 w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)
-	$(INSTALL) -m 644 w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR)
d36 2
d39 1
d42 7
a48 5
+	${BSD_INSTALL_PROGRAM} $(TARGET) $(DESTDIR)$(BIN_DIR)
+	${BSD_INSTALL_DATA} w3mhelp_en.html $(DESTDIR)$(HELP_DIR)
+	${BSD_INSTALL_DATA} w3mhelp_ja.html $(DESTDIR)$(HELP_DIR_JA)
+	${BSD_INSTALL_DATA} w3mhelp-lynx_en.html $(DESTDIR)$(HELP_DIR)
+	${BSD_INSTALL_DATA} w3mhelp-lynx_ja.html $(DESTDIR)$(HELP_DIR_JA)
d59 2
d62 2
a63 1
 clean: sweep
@


1.1
log
@Enable user's CFLAGS and CC environments.

Submitted by:	Christian Weisgerber and the maintainer
@
text
@d1 4
a4 3
--- XMakefile.orig	Tue Sep 28 04:00:53 1999
+++ XMakefile	Mon Oct 11 17:35:10 1999
@@@@ -15,7 +15,7 @@@@
d7 1
a7 1
 DEFS=$(INCLUDES) #-DSTR_DEBUG # -DDEBUG
d9 2
d12 2
a13 1
 LIBS=$(GCLIB) -lm $(LOCAL_LIBRARIES) $(SYS_LIBRARIES)
d16 32
@

