Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 17 Jul 1999 14:41:15 +1000 (EST)
From:      jim@phrantic.phear.net
To:        FreeBSD-gnats-submit@freebsd.org
Subject:   ports/12678: update port: asmail-0.50 to 0.54
Message-ID:  <199907170441.OAA82098@blues.ghis.net>

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

>Number:         12678
>Category:       ports
>Synopsis:       update port: asmail-0.50 to 0.54
>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:   Fri Jul 16 21:50:01 PDT 1999
>Closed-Date:
>Last-Modified:
>Originator:     Jim Mock
>Release:        FreeBSD 3.2-STABLE i386
>Organization:
>Environment:

	

>Description:

Patch updates asmail port to the latest version.  Also changed the
Makefile a bit.. a list of pixmaps in it with this version would've been
huge.  Also removed patch-aa since the port no longer uses Imake; it now
uses configure.

>How-To-Repeat:

	

>Fix:
	
Apply the following diff..

diff -ruN /usr/ports/mail/asmail/Makefile asmail/Makefile
--- /usr/ports/mail/asmail/Makefile	Mon Jan 18 17:38:07 1999
+++ asmail/Makefile	Sat Jul 17 14:27:01 1999
@@ -1,42 +1,37 @@
 # New ports collection makefile for:	 asmail
-# Version required:	0.50
+# Version required:	0.54
 # Date created:		15 August 1997
 # Whom:			brett@peloton.physics.montana.edu
 #
 # $Id: Makefile,v 1.6 1999/01/18 06:38:07 asami Exp $
 #
 
-DISTNAME=	asmail-0.50
+DISTNAME=	asmail-0.54
 CATEGORIES=	mail afterstep
-MASTER_SITES=	ftp://afterstep.foo.net/pub/AfterStep/apps/asmail/ \
-		ftp://ftp.cs.tu-berlin.de/pub/X/afterstep/apps/asmail/
+MASTER_SITES=	http://www.tigr.net/afterstep/as-apps/download/asmail/ \
+		ftp://ftp.afterstep.org/apps/asmail/
 
 MAINTAINER=	brett@peloton.physics.montana.edu
 
 LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
-USE_IMAKE=	yes
+GNU_CONFIGURE=	yes
+USE_X_PREFIX=	yes
+CONFIGURE_ARGS=	--enable-shaping
 
-PIXMAPS=	e/e-no.xpm e/e0.xpm e/e1.xpm e/e10.xpm e/e11.xpm e/e2.xpm \
-		e/e3.xpm e/e4.xpm e/e5.xpm e/e6.xpm e/e7.xpm e/e8.xpm e/e9.xpm \
-		monitor-e/monitor-e0.xpm monitor-e/monitor-e1.xpm \
-		monitor-e/monitor-e10.xpm monitor-e/monitor-e11.xpm \
-		monitor-e/monitor-e2.xpm monitor-e/monitor-e3.xpm \
-		monitor-e/monitor-e4.xpm monitor-e/monitor-e5.xpm \
-		monitor-e/monitor-e6.xpm monitor-e/monitor-e7.xpm \
-		monitor-e/monitor-e8.xpm monitor-e/monitor-e9.xpm \
-		monitor-e/monitor-no.xpm std/newmail.xpm \
-		std/newmail_s.xpm std/nomail.xpm std/nomail_s.xpm \
-		std/oldmail.xpm std/oldmail_s.xpm
-
-MAN1=		asmail.1
+MAN1=	asmail.1
 
 post-install:
-.for pixmap in ${PIXMAPS}
-	${INSTALL_DATA} ${WRKSRC}/pixmaps/${pixmap} ${PREFIX}/include/X11/pixmaps
-.endfor
-	${MKDIR} ${PREFIX}/share/doc/asmail
-	${INSTALL_DATA} ${WRKSRC}/sample.asmailrc ${PREFIX}/share/doc/asmail
-	strip ${PREFIX}/bin/asmail
+	@${MKDIR} ${PREFIX}/include/X11/pixmaps/cloud-e
+	@${INSTALL_DATA} ${WRKSRC}/pixmaps/cloud-e/*.xpm ${PREFIX}/include/X11/pixmaps/cloud-e
+	@${INSTALL_DATA} ${WRKSRC}/pixmaps/*.xpm ${PREFIX}/include/X11/pixmaps
+	@${INSTALL_MAN} ${WRKSRC}/asmail.man ${PREFIX}/man/man1/asmail.1
+	@${MKDIR} ${PREFIX}/share/doc/asmail
+	@${INSTALL_DATA} ${WRKSRC}/sample.asmailrc ${PREFIX}/share/doc/asmail
+	@strip ${PREFIX}/bin/asmail
+.if !defined(NOPORTDOCS)
+	@${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/asmail
+	@${ECHO} "===>   README installed in ${PREFIX}/share/doc/asmail"
+.endif
 
 .include <bsd.port.mk>
diff -ruN /usr/ports/mail/asmail/files/md5 asmail/files/md5
--- /usr/ports/mail/asmail/files/md5	Tue Nov  4 19:08:47 1997
+++ asmail/files/md5	Sat Jul 17 13:33:35 1999
@@ -1 +1 @@
-MD5 (asmail-0.50.tar.gz) = 3f6f2aa9cf9d91ee77f2190b45ea6e94
+MD5 (asmail-0.54.tar.gz) = d8f9a18eba13d470785c85669b803969
diff -ruN /usr/ports/mail/asmail/patches/patch-aa asmail/patches/patch-aa
--- /usr/ports/mail/asmail/patches/patch-aa	Tue Nov  4 19:08:47 1997
+++ asmail/patches/patch-aa	Thu Jan  1 10:00:00 1970
@@ -1,13 +0,0 @@
-*** Imakefile	Sun Nov  3 11:54:27 1996
---- /home/brett/temp/work/asmail-0.50/Imakefile	Wed Aug 13 14:25:04 1997
-***************
-*** 1,4 ****
-! XPMLIB = -L/usr/lib/X11 -lXpm   
-  XTLIB = -lXt
-  DEPLIBS = $(DEPXLIB) $(DEPXTOOLLIB)
-  LOCAL_LIBRARIES = $(XPMLIB) $(XTLIB) $(XLIB) $(XTOOLLIB)
---- 1,4 ----
-! XPMLIB = -lXpm   
-  XTLIB = -lXt
-  DEPLIBS = $(DEPXLIB) $(DEPXTOOLLIB)
-  LOCAL_LIBRARIES = $(XPMLIB) $(XTLIB) $(XLIB) $(XTOOLLIB)
diff -ruN /usr/ports/mail/asmail/patches/patch-ab asmail/patches/patch-ab
--- /usr/ports/mail/asmail/patches/patch-ab	Sat Feb 28 16:19:53 1998
+++ asmail/patches/patch-ab	Sat Jul 17 14:10:27 1999
@@ -1,72 +1,47 @@
-*** sample.asmailrc.orig	Fri Feb 27 22:58:09 1998
---- sample.asmailrc	Fri Feb 27 22:59:21 1998
-***************
-*** 66,72 ****
-  #########################################################
-  # Truns off shaped window				#
-  #########################################################
-! #NoShape
-  
-  
-  #########################################################
---- 66,72 ----
-  #########################################################
-  # Truns off shaped window				#
-  #########################################################
-! NoShape
-  
-  
-  #########################################################
-***************
-*** 106,130 ****
-  # Assign icons/animations				#
-  #########################################################
-  NoMail  
-! 	/usr/include/X11/pixmaps/e-no.xpm
-  End
-  
-  OldMail  	
-! 	/usr/include/X11/pixmaps/e1.xpm
-  End
-  
-  NewMail  
-! 	/usr/include/X11/pixmaps/e1.xpm
-! 	/usr/include/X11/pixmaps/e2.xpm
-! 	/usr/include/X11/pixmaps/e3.xpm
-! 	/usr/include/X11/pixmaps/e4.xpm
-! 	/usr/include/X11/pixmaps/e5.xpm
-! 	/usr/include/X11/pixmaps/e6.xpm
-! 	/usr/include/X11/pixmaps/e7.xpm
-! 	/usr/include/X11/pixmaps/e8.xpm
-! 	/usr/include/X11/pixmaps/e9.xpm
-! 	/usr/include/X11/pixmaps/e10.xpm
-! 	/usr/include/X11/pixmaps/e11.xpm
-  End
-  
-  #########################################################
---- 106,130 ----
-  # Assign icons/animations				#
-  #########################################################
-  NoMail  
-! 	/usr/X11R6/include/X11/pixmaps/e-no.xpm
-  End
-  
-  OldMail  	
-! 	/usr/X11R6/include/X11/pixmaps/e1.xpm
-  End
-  
-  NewMail  
-! 	/usr/X11R6/include/X11/pixmaps/e1.xpm
-! 	/usr/X11R6/include/X11/pixmaps/e2.xpm
-! 	/usr/X11R6/include/X11/pixmaps/e3.xpm
-! 	/usr/X11R6/include/X11/pixmaps/e4.xpm
-! 	/usr/X11R6/include/X11/pixmaps/e5.xpm
-! 	/usr/X11R6/include/X11/pixmaps/e6.xpm
-! 	/usr/X11R6/include/X11/pixmaps/e7.xpm
-! 	/usr/X11R6/include/X11/pixmaps/e8.xpm
-! 	/usr/X11R6/include/X11/pixmaps/e9.xpm
-! 	/usr/X11R6/include/X11/pixmaps/e10.xpm
-! 	/usr/X11R6/include/X11/pixmaps/e11.xpm
-  End
-  
-  #########################################################
+--- sample.asmailrc.orig	Mon Jun 21 10:11:24 1999
++++ sample.asmailrc	Sat Jul 17 14:10:08 1999
+@@ -69,7 +69,7 @@
+ #########################################################
+ # Turns off shaped window				#
+ #########################################################
+-#NoShape
++NoShape
+ 
+ 
+ #########################################################
+@@ -115,25 +115,25 @@
+ #########################################################
+ # Assign frame if not shaped				#
+ #########################################################
+-#Frame ~/GNUstep/Library/AfterStep/desktop/icons/8bpp/frame.xpm
++#Frame /usr/X11R6/include/X11/pixmaps/frame.xpm
+ 
+ 
+ #########################################################
+ # Assign icons/animations				#
+ #########################################################
+-NoMail  
+-        /usr/local/share/afterstep/desktop/icons/common/Mail1.xpm
++NoMail
++	/usr/X11R6/include/X11/pixmaps/nomail_s.xpm
+ End
+ 
+-OldMail  	
+-        /usr/local/share/afterstep/desktop/icons/common/Mail2.xpm
++OldMail
++	/usr/X11R6/include/X11/pixmaps/oldmail_s.xpm
+ End
+ 
+-NewMail  
+-        /usr/local/share/afterstep/desktop/icons/common/Mail1.xpm
+-        /usr/local/share/afterstep/desktop/icons/common/Mail2.xpm
+-        /usr/local/share/afterstep/desktop/icons/common/Mail3.xpm
+-        /usr/local/share/afterstep/desktop/icons/common/Mail2.xpm
++NewMail
++	/usr/X11R6/include/X11/pixmaps/oldmail_s.xpm
++	/usr/X11R6/include/X11/pixmaps/newmail_s.xpm
++	/usr/X11R6/include/X11/pixmaps/oldmail_s.xpm
++	/usr/X11R6/include/X11/pixmaps/newmail_s.xpm
+ End
+ 
+ #########################################################
diff -ruN /usr/ports/mail/asmail/pkg/PLIST asmail/pkg/PLIST
--- /usr/ports/mail/asmail/pkg/PLIST	Fri Oct  2 11:59:10 1998
+++ asmail/pkg/PLIST	Sat Jul 17 14:05:57 1999
@@ -1,35 +1,78 @@
 bin/asmail
-include/X11/pixmaps/e-no.xpm
-include/X11/pixmaps/e0.xpm
-include/X11/pixmaps/e1.xpm
-include/X11/pixmaps/e10.xpm
-include/X11/pixmaps/e11.xpm
-include/X11/pixmaps/e2.xpm
-include/X11/pixmaps/e3.xpm
-include/X11/pixmaps/e4.xpm
-include/X11/pixmaps/e5.xpm
-include/X11/pixmaps/e6.xpm
-include/X11/pixmaps/e7.xpm
-include/X11/pixmaps/e8.xpm
-include/X11/pixmaps/e9.xpm
-include/X11/pixmaps/monitor-e0.xpm
-include/X11/pixmaps/monitor-e1.xpm
-include/X11/pixmaps/monitor-e10.xpm
-include/X11/pixmaps/monitor-e11.xpm
-include/X11/pixmaps/monitor-e2.xpm
-include/X11/pixmaps/monitor-e3.xpm
-include/X11/pixmaps/monitor-e4.xpm
-include/X11/pixmaps/monitor-e5.xpm
-include/X11/pixmaps/monitor-e6.xpm
-include/X11/pixmaps/monitor-e7.xpm
-include/X11/pixmaps/monitor-e8.xpm
-include/X11/pixmaps/monitor-e9.xpm
-include/X11/pixmaps/monitor-no.xpm
+include/X11/pixmaps/frame.xpm
+include/X11/pixmaps/m-newmail.xpm
+include/X11/pixmaps/m-newmail_s.xpm
+include/X11/pixmaps/m-oldmail.xpm
+include/X11/pixmaps/m-oldmail_s.xpm
 include/X11/pixmaps/newmail.xpm
 include/X11/pixmaps/newmail_s.xpm
 include/X11/pixmaps/nomail.xpm
 include/X11/pixmaps/nomail_s.xpm
 include/X11/pixmaps/oldmail.xpm
 include/X11/pixmaps/oldmail_s.xpm
+include/X11/pixmaps/cloud-e/e0.xpm
+include/X11/pixmaps/cloud-e/e1.xpm
+include/X11/pixmaps/cloud-e/e2.xpm
+include/X11/pixmaps/cloud-e/e3.xpm
+include/X11/pixmaps/cloud-e/e4.xpm
+include/X11/pixmaps/cloud-e/e5.xpm
+include/X11/pixmaps/cloud-e/e6.xpm
+include/X11/pixmaps/cloud-e/e7.xpm
+include/X11/pixmaps/cloud-e/e8.xpm
+include/X11/pixmaps/cloud-e/e9.xpm
+include/X11/pixmaps/cloud-e/e10.xpm
+include/X11/pixmaps/cloud-e/e11.xpm
+include/X11/pixmaps/cloud-e/e12.xpm
+include/X11/pixmaps/cloud-e/e13.xpm
+include/X11/pixmaps/cloud-e/e14.xpm
+include/X11/pixmaps/cloud-e/e15.xpm
+include/X11/pixmaps/cloud-e/e16.xpm
+include/X11/pixmaps/cloud-e/e17.xpm
+include/X11/pixmaps/cloud-e/e18.xpm
+include/X11/pixmaps/cloud-e/e19.xpm
+include/X11/pixmaps/cloud-e/e20.xpm
+include/X11/pixmaps/cloud-e/e21.xpm
+include/X11/pixmaps/cloud-e/e22.xpm
+include/X11/pixmaps/cloud-e/e23.xpm
+include/X11/pixmaps/cloud-e/e24.xpm
+include/X11/pixmaps/cloud-e/e25.xpm
+include/X11/pixmaps/cloud-e/e26.xpm
+include/X11/pixmaps/cloud-e/e27.xpm
+include/X11/pixmaps/cloud-e/e28.xpm
+include/X11/pixmaps/cloud-e/e29.xpm
+include/X11/pixmaps/cloud-e/e30.xpm
+include/X11/pixmaps/cloud-e/m-e0.xpm
+include/X11/pixmaps/cloud-e/m-e1.xpm
+include/X11/pixmaps/cloud-e/m-e2.xpm
+include/X11/pixmaps/cloud-e/m-e3.xpm
+include/X11/pixmaps/cloud-e/m-e4.xpm
+include/X11/pixmaps/cloud-e/m-e5.xpm
+include/X11/pixmaps/cloud-e/m-e6.xpm
+include/X11/pixmaps/cloud-e/m-e7.xpm
+include/X11/pixmaps/cloud-e/m-e8.xpm
+include/X11/pixmaps/cloud-e/m-e9.xpm
+include/X11/pixmaps/cloud-e/m-e10.xpm
+include/X11/pixmaps/cloud-e/m-e11.xpm
+include/X11/pixmaps/cloud-e/m-e12.xpm
+include/X11/pixmaps/cloud-e/m-e13.xpm
+include/X11/pixmaps/cloud-e/m-e14.xpm
+include/X11/pixmaps/cloud-e/m-e15.xpm
+include/X11/pixmaps/cloud-e/m-e16.xpm
+include/X11/pixmaps/cloud-e/m-e17.xpm
+include/X11/pixmaps/cloud-e/m-e18.xpm
+include/X11/pixmaps/cloud-e/m-e19.xpm
+include/X11/pixmaps/cloud-e/m-e20.xpm
+include/X11/pixmaps/cloud-e/m-e21.xpm
+include/X11/pixmaps/cloud-e/m-e22.xpm
+include/X11/pixmaps/cloud-e/m-e23.xpm
+include/X11/pixmaps/cloud-e/m-e24.xpm
+include/X11/pixmaps/cloud-e/m-e25.xpm
+include/X11/pixmaps/cloud-e/m-e26.xpm
+include/X11/pixmaps/cloud-e/m-e27.xpm
+include/X11/pixmaps/cloud-e/m-e28.xpm
+include/X11/pixmaps/cloud-e/m-e29.xpm
+include/X11/pixmaps/cloud-e/m-e30.xpm
 share/doc/asmail/sample.asmailrc
+share/doc/asmail/README
+@dirrm include/X11/pixmaps/cloud-e
 @dirrm share/doc/asmail

>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?199907170441.OAA82098>