Bug 16684 - Update port: editors/the to 3.0
Summary: Update port: editors/the to 3.0
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: freebsd-ports (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2000-02-12 23:10 UTC by tkato
Modified: 2000-02-17 05:19 UTC (History)
0 users

See Also:


Attachments
file.diff (2.50 KB, patch)
2000-02-12 23:10 UTC, tkato
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato 2000-02-12 23:10:05 UTC
- Update to version 3.0

New file:
patches/patch-ab

Fix: +  contribdir		= $(srcdir)/contrib
   thisdir		=@thisdir@
+  
+! INSTALL_PROGRAM	= @INSTALL_PROGRAM@
+  INSTALL_DATA	= @INSTALL_DATA@
+  
+  HTML_EXT		= @HTML_EXT@
 ***************
-*** 30,36 ****
+*** 31,37 ****
   CFLAGS		= @CFLAGS@
   
   INCDIR		= $(srcdir)
 ! CPPFLAGS	= -I. -I$(INCDIR) @DEFS@ @SYS_DEFS@ -DTHE_HOME_DIRECTORY=\"$(prefix)/THE/\"
   
-  CCFLAGS		= -c $(CFLAGS) $(CPPFLAGS) @MH_CURSES_INC@ @MH_REXX_INC@
+  CCFLAGS		= -c $(CFLAGS) $(CPPFLAGS) @MH_REXX_INC@ @MH_CURSES_INC@
   
---- 30,36 ----
+--- 31,37 ----
   CFLAGS		= @CFLAGS@
   
   INCDIR		= $(srcdir)
-! CPPFLAGS	= -I. -I$(INCDIR) @DEFS@ @SYS_DEFS@ -DTHE_HOME_DIRECTORY=\"$(datadir)/THE/\"
+! CPPFLAGS	= -I. -I$(INCDIR) @DEFS@ @SYS_DEFS@ -DTHE_HOME_DIRECTORY=\"$(libdir)/THE/\"
   
-  CCFLAGS		= -c $(CFLAGS) $(CPPFLAGS) @MH_CURSES_INC@ @MH_REXX_INC@
+  CCFLAGS		= -c $(CFLAGS) $(CPPFLAGS) @MH_REXX_INC@ @MH_CURSES_INC@
   
 ***************
-*** 163,185 ****
+*** 186,208 ****
   
   install: the the.man THE_Help.txt
   	$(INSTALL_DATA) -m 755 -d $(exec_prefix)/bin
@@ -58,28 +70,28 @@
 ! 	$(INSTALL_DATA) $(srcdir)/THE_Help.txt $(prefix)/THE/THE_Help.txt
   
   clean:
-  	-rm -f *.o trace the manext *.man *$(HTML_EXT) *.new
---- 163,185 ----
+  	-rm -f *.o trace the manext *.man *$(HTML_EXT) *.new config.log config.cache config.status
+--- 186,208 ----
   
   install: the the.man THE_Help.txt
   	$(INSTALL_DATA) -m 755 -d $(exec_prefix)/bin
-! 	$(INSTALL_DATA) -m 755 -d $(datadir)/THE
-! 	$(INSTALL) -m 755 $(srcdir)/the $(exec_prefix)/bin/the
-! 	$(INSTALL_DATA) $(srcdir)/the.man $(datadir)/THE/the.man
-! 	$(INSTALL_DATA) $(srcdir)/append.the   $(datadir)/THE/append.the
-! 	$(INSTALL_DATA) $(srcdir)/comm.the     $(datadir)/THE/comm.the
-! 	$(INSTALL_DATA) $(srcdir)/build.the    $(datadir)/THE/build.the
-! 	$(INSTALL_DATA) $(srcdir)/setbuild.the $(datadir)/THE/setbuild.the
-! 	$(INSTALL_DATA) $(srcdir)/uncomm.the   $(datadir)/THE/uncomm.the
-! 	$(INSTALL_DATA) $(srcdir)/total.the    $(datadir)/THE/total.the
-! 	$(INSTALL_DATA) $(srcdir)/match.the    $(datadir)/THE/match.the
-! 	$(INSTALL_DATA) $(srcdir)/rm.the       $(datadir)/THE/rm.the
-! 	$(INSTALL_DATA) $(srcdir)/words.the    $(datadir)/THE/words.the
-! 	$(INSTALL_DATA) $(srcdir)/l.the        $(datadir)/THE/l.the
-! 	$(INSTALL_DATA) $(srcdir)/compile.the  $(datadir)/THE/compile.the
-! 	$(INSTALL_DATA) $(srcdir)/spell.the    $(datadir)/THE/spell.the
-! 	$(INSTALL_DATA) $(srcdir)/demo.the     $(datadir)/THE/demo.the
-! 	$(INSTALL_DATA) $(srcdir)/THE_Help.txt $(datadir)/THE/THE_Help.txt
+! 	$(INSTALL_DATA) -m 755 -d $(libdir)/THE
+! 	$(INSTALL_PROGRAM) ./the $(exec_prefix)/bin/the
+! 	$(INSTALL_DATA) ./the.man $(libdir)/THE/the.man
+! 	$(INSTALL_DATA) $(srcdir)/append.the   $(libdir)/THE/append.the
+! 	$(INSTALL_DATA) $(srcdir)/comm.the     $(libdir)/THE/comm.the
+! 	$(INSTALL_DATA) $(srcdir)/build.the    $(libdir)/THE/build.the
+! 	$(INSTALL_DATA) $(srcdir)/setbuild.the $(libdir)/THE/setbuild.the
+! 	$(INSTALL_DATA) $(srcdir)/uncomm.the   $(libdir)/THE/uncomm.the
+! 	$(INSTALL_DATA) $(srcdir)/total.the    $(libdir)/THE/total.the
+! 	$(INSTALL_DATA) $(srcdir)/match.the    $(libdir)/THE/match.the
+! 	$(INSTALL_DATA) $(srcdir)/rm.the       $(libdir)/THE/rm.the
+! 	$(INSTALL_DATA) $(srcdir)/words.the    $(libdir)/THE/words.the
+! 	$(INSTALL_DATA) $(srcdir)/l.the        $(libdir)/THE/l.the
+! 	$(INSTALL_DATA) $(srcdir)/compile.the  $(libdir)/THE/compile.the
+! 	$(INSTALL_DATA) $(srcdir)/spell.the    $(libdir)/THE/spell.the
+! 	$(INSTALL_DATA) $(srcdir)/demo.the     $(libdir)/THE/demo.the
+! 	$(INSTALL_DATA) $(srcdir)/THE_Help.txt $(libdir)/THE/THE_Help.txt
   
   clean:
-  	-rm -f *.o trace the manext *.man *$(HTML_EXT) *.new
+  	-rm -f *.o trace the manext *.man *$(HTML_EXT) *.new config.log config.cache config.status


Sent by Japanese ProntoMail--ED8wh94oqgF0fmpewxrDYgwlymzFIVHH4ayawmRoyLmW73Gy
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

diff -urN /usr/ports/editors/the/Makefile editors/the/Makefile
--- /usr/ports/editors/the/Makefile	Mon Sep 27 19:13:01 1999
+++ editors/the/Makefile	Tue Feb  1 05:17:46 2000
@@ -1,25 +1,30 @@
 # New ports collection makefile for:	THE
-# Version required:	2.8
+# Version required:	3.0
 # Date created:		7 May 1999
 # Whom:			giffunip@asme.org
 #
 # $FreeBSD: ports/editors/the/Makefile,v 1.3 1999/09/27 02:39:57 steve Exp $
 #
 
-DISTNAME=	THE-2.8
-PKGNAME=	the-2.8
+DISTNAME=	THE-3.0
+PKGNAME=	the-3.0
 CATEGORIES=	editors
 MASTER_SITES=	ftp://ftp.lightlink.com/pub/hessling/THE/	\
-		ftp://uiarchive.cso.uiuc.edu/pub/packages/THE/	\
 		ftp://ftp.qut.edu.au/pub/markh/THE/		\
-		ftp://ftp.rzg.mpg.de/pub/software/the/THE/	\
 		ftp://ftp.wu-wien.ac.at/pub/src/Editors/THE/
 
 MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	rexx:${PORTSDIR}/lang/rexx-imc
+RUN_DEPENDS=	rexx:${PORTSDIR}/lang/rexx-imc
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-rexximc --with-ncurses
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/THE
+	${INSTALL_DATA} ${WRKSRC}/*.html ${PREFIX}/share/doc/THE
+.endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/editors/the/files/md5 editors/the/files/md5
--- /usr/ports/editors/the/files/md5	Mon Sep 27 19:13:01 1999
+++ editors/the/files/md5	Mon Jan 31 23:12:36 2000
@@ -1 +1 @@
-MD5 (THE-2.8.tar.gz) = 4564ec9cbbce7a16f6dfb453b80d3da3
+MD5 (THE-3.0.tar.gz) = d6505635a68f16a225fd4c7bac3536a3
diff -urN /usr/ports/editors/the/patches/patch-aa editors/the/patches/patch-aa
--- /usr/ports/editors/the/patches/patch-aa	Mon Sep 27 19:13:01 1999
+++ editors/the/patches/patch-aa	Tue Feb  1 20:41:27 2000
@@ -1,41 +1,53 @@
-*** Makefile.in.orig	Mon Aug  2 18:24:26 1999
---- Makefile.in	Mon Sep  6 21:22:42 1999
+*** Makefile.in.orig	Sat Jan 15 13:37:34 2000
+--- Makefile.in	Tue Feb  1 20:31:45 2000
 ***************
-*** 16,22 ****
+*** 16,28 ****
   srcdir		= @srcdir@
   prefix		= @prefix@
   exec_prefix	= @exec_prefix@
 ! libdir		= $(exec_prefix)/lib
   includedir		= $(exec_prefix)/include
   docdir		= $(srcdir)/doc
+  contribdir		= $(srcdir)/contrib
   thisdir		=@thisdir@
---- 16,22 ----
+  
+! INSTALL		= @INSTALL@
+  INSTALL_DATA	= @INSTALL_DATA@
+  
+  HTML_EXT		= @HTML_EXT@
+--- 16,28 ----
   srcdir		= @srcdir@
   prefix		= @prefix@
   exec_prefix	= @exec_prefix@
-! datadir		= $(exec_prefix)/share
+! libdir		= $(exec_prefix)/libdata
   includedir		= $(exec_prefix)/include
   docdir		= $(srcdir)/doc
Comment 1 TAOKA Satoshi 2000-02-13 16:17:24 UTC
> --- /usr/ports/editors/the/patches/patch-aa	Mon Sep 27 19:13:01 1999
> +++ editors/the/patches/patch-aa	Tue Feb  1 20:41:27 2000

This patch was rejected in my system. Why?

TAOKA
Comment 2 tkato 2000-02-14 12:47:34 UTC
> This patch was rejected in my system. Why?

Hmm... It was applied cleanly on mine.

Please check with following uuencoded one.

begin 644 the.patch.gz
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
(ZY2=N7$B``"Y
`
end
 


Sent by Japanese ProntoMail
Comment 3 taoka freebsd_committer freebsd_triage 2000-02-17 05:18:31 UTC
State Changed
From-To: open->closed

Committed, thanks!