Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 29 Jun 2005 11:15:43 +0100
From:      Tim Bishop <tim-lists@bishnet.net>
To:        freebsd-ports@freebsd.org
Cc:        vsevolod@highsecure.ru
Subject:   USE_X11_PREFIX... when to use?
Message-ID:  <20050629101543.GE57144@carrick.bishnet.net>

next in thread | raw e-mail | index | archive | help
Vsevolod has pointed me a the following cvs-all discussion:

http://www.monkey.org/freebsd/archive/freebsd-cvs-all/200506/msg02895.html

Now, I'm not trying to debate what the documentation says, but clearly
there does seem to be some issue over where ports (like gnubiff below)
should go.

When doing gnubiff I used USE_X11_PREFIX because it seemed to be the
normal thing to do. But maybe that's not the right thing?

Can we try and reach a consensus on what is correct? IMHO the right
thing to do isn't to end up with X-based ports splattered across the
local and X11R6 prefix - we should go one way or the other.

If nobody cares then I'll just do whatever I think is right for this
port and forget the bigger picture.

Tim.

----- Forwarded message from Vsevolod Stakhov <vsevolod@highsecure.ru> -----

Date: Wed, 29 Jun 2005 03:15:35 +0400
From: Vsevolod Stakhov <vsevolod@highsecure.ru>
To: FreeBSD-gnats-submit@FreeBSD.org
Cc: tim@bishnet.net
Subject: ports/82754: Update port: mail/gnubiff to 2.1.4

>Number:         82754
>Category:       ports
>Synopsis:       Update port: mail/gnubiff to 2.1.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 28 23:20:24 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Vsevolod Stakhov
>Release:        FreeBSD 5.4-RELEASE i386
>Organization:
>Environment:
>Description:
Update to 2.1.4.
Remove USE_X11_PREFIX as it was discussed at cvs-all maillist.
Removed files:
files/patch-src-socket.cc
files/patch-src-ui-properties.cc

>How-To-Repeat:
>Fix:

diff -ruPN gnubiff.orig/Makefile gnubiff/Makefile
--- gnubiff.orig/Makefile	Wed Jun 29 03:10:28 2005
+++ gnubiff/Makefile	Wed Jun 29 03:10:46 2005
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnubiff
-PORTVERSION=	2.1.3
-PORTREVISION=	1
+PORTVERSION=	2.1.4
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -18,7 +17,6 @@
 LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
 		fam.0:${PORTSDIR}/devel/fam
 
-USE_X_PREFIX=	yes
 USE_GNOME=	intlhack libglade2 esound
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
diff -ruPN gnubiff.orig/distinfo gnubiff/distinfo
--- gnubiff.orig/distinfo	Wed Jun 29 03:10:28 2005
+++ gnubiff/distinfo	Wed Jun 29 03:10:46 2005
@@ -1,2 +1,2 @@
-MD5 (gnubiff-2.1.3.tar.gz) = 4832f7d100b8f476082191a4c66a772f
-SIZE (gnubiff-2.1.3.tar.gz) = 765654
+MD5 (gnubiff-2.1.4.tar.gz) = 834443eb47d5a83ff24a37bc7940676a
+SIZE (gnubiff-2.1.4.tar.gz) = 782287
diff -ruPN gnubiff.orig/files/patch-src-socket.cc gnubiff/files/patch-src-socket.cc
--- gnubiff.orig/files/patch-src-socket.cc	Wed Jun 29 03:10:28 2005
+++ gnubiff/files/patch-src-socket.cc	Thu Jan  1 03:00:00 1970
@@ -1,11 +0,0 @@
---- src/socket.cc.orig	Sun Mar 20 14:29:15 2005
-+++ src/socket.cc	Wed Apr  6 00:30:05 2005
-@@ -42,6 +42,8 @@
- #include <netinet/in.h>
- #include <arpa/inet.h>
- 
-+#include <errno.h>
-+
- #include "ui-certificate.h"
- #include "mailbox.h"
- #include "socket.h"
diff -ruPN gnubiff.orig/files/patch-src-ui-properties.cc gnubiff/files/patch-src-ui-properties.cc
--- gnubiff.orig/files/patch-src-ui-properties.cc	Wed Jun 29 03:10:28 2005
+++ gnubiff/files/patch-src-ui-properties.cc	Thu Jan  1 03:00:00 1970
@@ -1,11 +0,0 @@
---- src/ui-properties.cc.orig	Tue Feb  8 00:02:37 2005
-+++ src/ui-properties.cc	Wed Apr  6 00:40:23 2005
-@@ -594,7 +594,7 @@
- #ifndef HAVE_LIBSSL
- 	if ((auth == AUTH_SSL) || (auth == AUTH_CERTIFICATE))
- #  ifdef HAVE_CRYPTO
--		if (selected_type == TYPE_POP)
-+		if (selected_type_ == TYPE_POP)
- 			auth = AUTH_APOP;
- #  else
- 		auth = AUTH_USER_PASS;
diff -ruPN gnubiff.orig/pkg-plist gnubiff/pkg-plist
--- gnubiff.orig/pkg-plist	Wed Jun 29 03:10:28 2005
+++ gnubiff/pkg-plist	Wed Jun 29 03:10:46 2005
@@ -1,4 +1,5 @@
 bin/gnubiff
+share/locale/cs/LC_MESSAGES/gnubiff.mo
 share/locale/de/LC_MESSAGES/gnubiff.mo
 share/locale/es/LC_MESSAGES/gnubiff.mo
 share/locale/fr/LC_MESSAGES/gnubiff.mo
@@ -7,6 +8,7 @@
 share/locale/it/LC_MESSAGES/gnubiff.mo
 share/locale/nl/LC_MESSAGES/gnubiff.mo
 share/locale/ro/LC_MESSAGES/gnubiff.mo
+share/locale/rw/LC_MESSAGES/gnubiff.mo
 share/locale/sv/LC_MESSAGES/gnubiff.mo
 share/locale/vi/LC_MESSAGES/gnubiff.mo
 %%SHAREDIR%%/gnubiff/applet-gnome.glade

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

----- End forwarded message -----

-- 
Tim Bishop
http://www.bishnet.net/tim/
PGP Key: 0x5AE7D984



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