Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Apr 2000 22:02:54 -0700 (PDT)
From:      tkato@prontomail.ne.jp
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/17853: Update port: mail/xmailbox
Message-ID:  <200004080502.WAA34564@freefall.freebsd.org>

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

>Number:         17853
>Category:       ports
>Synopsis:       Update port: mail/xmailbox
>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 Apr  7 22:10:03 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.0-RELEASE i386
>Organization:
>Environment:
>Description:
- Support PREFIX properly

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/mail/xmailbox/Makefile mail/xmailbox/Makefile
--- /usr/ports/mail/xmailbox/Makefile	Wed Mar 29 20:04:07 2000
+++ mail/xmailbox/Makefile	Sat Apr  8 07:21:55 2000
@@ -6,30 +6,29 @@
 # $FreeBSD: ports/mail/xmailbox/Makefile,v 1.7 2000/03/29 07:18:36 kris Exp $
 #
 
-DISTNAME=		xmailbox-2.5
-CATEGORIES=		mail
-MASTER_SITES=		${MASTER_SITE_XCONTRIB}
+DISTNAME=	xmailbox-2.5
+CATEGORIES=	mail
+MASTER_SITES=	${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	applications
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=		Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
-USE_IMAKE=		yes
-MAN1=			xmailbox.1
-MANCOMPRESSED=		no
+USE_IMAKE=	yes
+MAN1=		xmailbox.1
 
-do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/xmailbox ${PREFIX}/bin
-	@ ${INSTALL_MAN} ${WRKSRC}/xmailbox.man ${PREFIX}/man/man1/xmailbox.1
-	@ ${INSTALL_DATA} ${WRKSRC}/XMailbox.ad ${PREFIX}/lib/X11/app-defaults/XMailbox
-	@ ${MKDIR} ${PREFIX}/share/xmailbox
-	@ ${INSTALL_DATA} ${WRKSRC}/dingdong.au ${PREFIX}/share/xmailbox
-	@ ${INSTALL_DATA} ${WRKSRC}/ugotmail.au ${PREFIX}/share/xmailbox
+post-patch:
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/XMailbox.ad
+
+post-install:
+	@${MKDIR} ${PREFIX}/share/xmailbox
+	${INSTALL_DATA} ${WRKSRC}/dingdong.au ${PREFIX}/share/xmailbox
+	${INSTALL_DATA} ${WRKSRC}/ugotmail.au ${PREFIX}/share/xmailbox
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/xmailbox
-	@ ${INSTALL_DATA} ${WRKSRC}/DISCLAIMER ${PREFIX}/share/doc/xmailbox
-	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xmailbox
+	@${MKDIR} ${PREFIX}/share/doc/xmailbox
+	${INSTALL_DATA} ${WRKSRC}/DISCLAIMER ${PREFIX}/share/doc/xmailbox
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xmailbox
 .endif
 
 .include <bsd.port.mk>
diff -urN /usr/ports/mail/xmailbox/patches/patch-aa mail/xmailbox/patches/patch-aa
--- /usr/ports/mail/xmailbox/patches/patch-aa	Wed Jun 23 02:40:16 1999
+++ mail/xmailbox/patches/patch-aa	Sat Apr  8 07:14:16 2000
@@ -1,14 +1,16 @@
---- Imakefile.orig	Wed Jul 16 11:36:17 1997
-+++ Imakefile	Sun Jun 20 10:50:43 1999
-@@ -5,7 +5,7 @@
+--- Imakefile.orig	Thu Jul 17 01:36:17 1997
++++ Imakefile	Sat Apr  8 07:13:59 2000
+@@ -5,8 +5,8 @@
  # Note: you need to have XPM 3.4 or higher!
  #------------------------------------------
  #
 -XPMINCDIR = /usr/include/X11
-+XPMINCDIR = $(X11BASE)/include/X11
- XPMLIBDIR = /usr/X11/lib
+-XPMLIBDIR = /usr/X11/lib
++XPMINCDIR = $(INCDIR)/X11
++XPMLIBDIR = $(USRLIBDIR)
     XPMLIB = -L$(XPMLIBDIR) -lXpm
  
+ #-------------------------------
 @@ -20,7 +20,9 @@
  # Comment the following define if you
  # want audio support
@@ -30,3 +32,12 @@
  
  #------------------------------------------
  # Uncomment the following define if you
+@@ -84,7 +88,7 @@
+   EXTRA_DEFINES = -DCOM_AUDIO 
+ #else
+          SNDLIB = 
+-       INCLUDES = -I$(XPMINCDIR) -I/usr/public/include
++       INCLUDES = -I$(XPMINCDIR)
+   EXTRA_DEFINES = $(SUN_AUDIO)
+ #endif /* COM_AUDIO */
+ #endif /* RPLAY_AUDIO */
diff -urN /usr/ports/mail/xmailbox/patches/patch-ac mail/xmailbox/patches/patch-ac
--- /usr/ports/mail/xmailbox/patches/patch-ac	Sun Jul  5 04:42:45 1998
+++ mail/xmailbox/patches/patch-ac	Sat Apr  8 07:06:34 2000
@@ -1,11 +1,11 @@
---- XMailbox.ad	Wed Jul 16 16:13:32 1997
-+++ /home/andy/tmp/wrk/XMailbox.ad	Sat May 23 23:30:34 1998
+--- XMailbox.ad.orig	Thu Jul 17 01:13:32 1997
++++ XMailbox.ad	Sat Apr  8 07:03:20 2000
 @@ -9,7 +9,7 @@
  xmailbox*mailAnimOnce:		true
  ! xmailbox*mailAnimUpdate:	1000
  ! xmailbox*mailapp:		echo 'setenv LINES 25; setenv COLUMNS 80; xterm -n Elm -e elm' | /bin/csh -f -s
 -! xmailbox*mailSndFile:		/usr/public/lib/sounds/bong.au
-+xmailbox*mailSndFile:		/usr/X11R6/share/xmailbox/ugotmail.au
++xmailbox*mailSndFile:		%%PREFIX%%/share/xmailbox/ugotmail.au
  ! xmailbox*mailSndComm:		/usr/public/bin/play %s
  ! xmailbox*nomailXpmFile:	/usr/X11/include/X11/pixmaps/mail0.xpm
  ! xmailbox*mailXpmFile:		/usr/X11/include/X11/pixmaps/mail1.xpm


>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?200004080502.WAA34564>