Skip site navigation (1)Skip section navigation (2)
Date:      22 Aug 2000 03:12:35 -0000
From:      "Mario Sergio Fujikawa Ferreira" <lioux@uol.com.br>
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/20768: Modify the x11/rxvt to include a -devel port (MAINTAINER)
Message-ID:  <20000822031235.55684.qmail@Fedaykin.here>

next in thread | raw e-mail | index | archive | help

>Number:         20768
>Category:       ports
>Synopsis:       Modify the x11/rxvt to include a -devel port (MAINTAINER)
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Aug 21 20:30:03 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     Mario Sergio Fujikawa Ferreira
>Release:        FreeBSD 4.0-STABLE i386
>Organization:
>Environment:

FreeBSD Here.here 4.0-STABLE FreeBSD 4.0-STABLE #2: Fri Jun  9 13:22:10 EST 2000     lioux@Here.here:/usr/src/sys/compile/LIOUX  i386

>Description:

I created a rxvt-devel port. This will contain the devel version
2.7.3 which used to be carried as rxvt. The rxvt port will now
contain the stable version 2.6.3.

Besides, I added some MASTER_SITES so as to fix the unavailable
distfile message I got from the automated scripts.

The rxvt-devel port should be a repo copy of rxvt. Then, the FIRST
PATCH should be applied over it.

Then, the SECOND PATCH should be applied to the rxvt port.

No files were added or removed.
I kept Gary Palmer as the creator of both ports.

>How-To-Repeat:

n/a

>Fix:

----
---- FIRST PATCH
----

diff -ruN /tmp/rxvt-devel/Makefile rxvt-devel/Makefile
--- /tmp/rxvt-devel/Makefile	Fri Aug  4 04:37:02 2000
+++ rxvt-devel/Makefile	Mon Aug 21 23:54:42 2000
@@ -8,15 +8,16 @@
 # (and maybe ports/chinese/rxvt) when you upgrade rxvt.  These ports all use
 # the same distfile.
 
-PORTNAME=	rxvt
+PORTNAME=	rxvt-devel
 PORTVERSION= 	2.7.3
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/ \
 		ftp://mason.primenet.com.au/pub/rxvt/ \
-		${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	X11/terms
+		ftp://ftp.ics.es.osaka-u.ac.jp/pub/mirrors/rxvt/ \
+		ftp://ftp.fu-berlin.de/unix/X11/terms/rxvt/
+DISTNAME=	rxvt-${PORTVERSION}
 
-PATCH_SITES=	ftp://ftp.rxvt.org/pub/rxvt/
+PATCH_SITES=	${MASTER_SITES}
 PATCHFILES=	rxvt-2.7.3.patch1.gz
 PATCH_DIST_STRIP+=      -p1
 

----
---- SECOND PATCH
----


diff -ruN /usr/ports/x11/rxvt/Makefile rxvt/Makefile
--- /usr/ports/x11/rxvt/Makefile	Fri Aug  4 04:37:02 2000
+++ rxvt/Makefile	Mon Aug 21 23:54:27 2000
@@ -9,16 +9,12 @@
 # the same distfile.
 
 PORTNAME=	rxvt
-PORTVERSION= 	2.7.3
+PORTVERSION= 	2.6.3
 CATEGORIES=	x11
 MASTER_SITES=	ftp://ftp.rxvt.org/pub/rxvt/ \
 		ftp://mason.primenet.com.au/pub/rxvt/ \
-		${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	X11/terms
-
-PATCH_SITES=	ftp://ftp.rxvt.org/pub/rxvt/
-PATCHFILES=	rxvt-2.7.3.patch1.gz
-PATCH_DIST_STRIP+=      -p1
+		ftp://ftp.ics.es.osaka-u.ac.jp/pub/mirrors/rxvt/ \
+		ftp://ftp.fu-berlin.de/unix/X11/terms/rxvt/
 
 MAINTAINER=	lioux@linf.unb.br
 
diff -ruN /usr/ports/x11/rxvt/files/md5 rxvt/files/md5
--- /usr/ports/x11/rxvt/files/md5	Mon May 22 05:03:01 2000
+++ rxvt/files/md5	Tue Aug 22 00:00:31 2000
@@ -1,2 +1 @@
-MD5 (rxvt-2.7.3.tar.bz2) = 4f22d749152ba717c5b716df43801800
-MD5 (rxvt-2.7.3.patch1.gz) = 348fca4eb5e7bc41d070745e3655d184
+MD5 (rxvt-2.6.3.tar.bz2) = 4aae8a7e478cd09d3701faf35c6300c9
diff -ruN /usr/ports/x11/rxvt/patches/patch-aa rxvt/patches/patch-aa
--- /usr/ports/x11/rxvt/patches/patch-aa	Mon Jan 17 23:58:44 2000
+++ rxvt/patches/patch-aa	Mon Aug 21 23:31:58 2000
@@ -1,11 +1,11 @@
---- Makefile.in.orig	Fri Dec 24 20:05:41 1999
-+++ Makefile.in	Fri Dec 24 20:05:48 1999
+--- Makefile.in.orig	Mon Aug 21 23:31:36 2000
++++ Makefile.in	Mon Aug 21 23:31:51 2000
 @@ -9,7 +9,7 @@
  first_rule: all
  dummy:
  
--subdirs = src doc rclock src/graphics src/test
-+subdirs = src doc # rclock src/graphics src/test
+-subdirs = src doc rclock src/graphics
++subdirs = src doc
  
  DIST =	INSTALL README.configure configure Makefile Makefile.in ChangeLog
  
diff -ruN /usr/ports/x11/rxvt/patches/patch-ab rxvt/patches/patch-ab
--- /usr/ports/x11/rxvt/patches/patch-ab	Wed Dec 31 21:00:00 1969
+++ rxvt/patches/patch-ab	Mon Aug 21 23:33:16 2000
@@ -0,0 +1,12 @@
+--- doc/Makefile.in.orig	Mon Aug 21 23:32:21 2000
++++ doc/Makefile.in	Mon Aug 21 23:32:44 2000
+@@ -41,9 +41,6 @@
+ 
+ all: rxvt.1
+ 
+-rxvt.1: Makefile
+-	@if test x$(TBL) = x; then : ; else echo "$(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1 ; fi
+-
+ SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\
+ 	     -e 's%@RXVT_LSMDATE@%$(LSMDATE)%g;'\
+ 	     -e 's%@RXVT_DATE@%$(DATE)%g;'\
diff -ruN /usr/ports/x11/rxvt/patches/patch-ac rxvt/patches/patch-ac
--- /usr/ports/x11/rxvt/patches/patch-ac	Wed Mar 29 01:31:45 2000
+++ rxvt/patches/patch-ac	Mon Aug 21 23:35:05 2000
@@ -1,12 +1,20 @@
---- doc/Makefile.in	Sun Mar 12 00:26:26 2000
-+++ doc/Makefile.in.new	Mon Mar 27 01:39:53 2000
-@@ -40,9 +40,6 @@
+--- autoconf/config.h.in.orig	Mon Aug 21 23:33:43 2000
++++ autoconf/config.h.in	Mon Aug 21 23:34:39 2000
+@@ -161,7 +161,7 @@
+ #undef HAVE_UTMP_HOST
  
- all:	rxvt.1
+ /* Define location of utmp */
+-#undef RXVT_UTMP_FILE
++#define RXVT_UTMP_FILE "/var/run/utmp"
  
--rxvt.1: rxvt.tbl Makefile
--	@if test x$(TBL) = x; then : ; else echo "$(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1"; $(TBL) $(srcdir)/rxvt.tbl | grep -v '^.lf' > rxvt.1 ; fi
--
- SEDREPLACE = -e 's%@RXVT_VERSION@%$(VERSION)%g;'\
- 	     -e 's%@RXVT_LSMDATE@%$(LSMDATE)%g;'\
- 	     -e 's%@RXVT_DATE@%$(DATE)%g;'\
+ /* Define in utmpx.h has struct utmpx */
+ #undef HAVE_STRUCT_UTMPX
+@@ -173,7 +173,7 @@
+ #undef RXVT_UTMPX_FILE
+ 
+ /* Define location of wtmp */
+-#undef RXVT_WTMP_FILE
++#define RXVT_WTMP_FILE "/var/log/wtmp"
+ 
+ /* Define location of wtmpx */
+ #undef RXVT_WTMPX_FILE
diff -ruN /usr/ports/x11/rxvt/patches/patch-ad rxvt/patches/patch-ad
--- /usr/ports/x11/rxvt/patches/patch-ad	Mon Aug 23 01:34:55 1999
+++ rxvt/patches/patch-ad	Wed Dec 31 21:00:00 1969
@@ -1,20 +0,0 @@
---- autoconf/config.h.in.orig	Mon Aug 16 23:55:41 1999
-+++ autoconf/config.h.in	Sun Aug 22 21:32:25 1999
-@@ -161,7 +161,7 @@
- #undef HAVE_UTMP_HOST
- 
- /* Define location of utmp */
--#undef RXVT_UTMP_FILE
-+#define RXVT_UTMP_FILE "/var/run/utmp"
- 
- /* Define in utmpx.h has struct utmpx */
- #undef HAVE_STRUCT_UTMPX
-@@ -173,7 +173,7 @@
- #undef RXVT_UTMPX_FILE
- 
- /* Define location of wtmp */
--#undef RXVT_WTMP_FILE
-+#define RXVT_WTMP_FILE "/var/log/wtmp"
- 
- /* Define location of wtmpx */
- #undef RXVT_WTMPX_FILE

>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20000822031235.55684.qmail>