Index: head/mail/sonicmail/Makefile
===================================================================
--- head/mail/sonicmail/Makefile	(revision 33764)
+++ head/mail/sonicmail/Makefile	(revision 33765)
@@ -1,25 +1,18 @@
 # New ports collection makefile for:   sonicmail
 # Date created:        13 September 2000
 # Whom:                Yukihiro Nakai <nakai@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	sonicmail
 PORTVERSION=	0.1.2
 CATEGORIES=	mail
 MASTER_SITES=	http://download.sourceforge.net/sonicmail/
 
 MAINTAINER=	nakai@FreeBSD.org
 
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
 
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|-pthread|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
-
 .include <bsd.port.mk>

Property changes on: head/mail/sonicmail/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/mail/sonicmail/files/patch-aa
===================================================================
--- head/mail/sonicmail/files/patch-aa	(revision 33764)
+++ head/mail/sonicmail/files/patch-aa	(revision 33765)
@@ -1,22 +1,22 @@
 --- Makefile.orig	Wed Aug 30 22:27:11 2000
 +++ Makefile	Wed Sep 13 13:57:45 2000
 @@ -2,8 +2,8 @@
  # Copyright (C) 2000 Cameron Edwards
  
  # Change these to the default location of the pixmaps/wav files:
 -XPMSPATH = /usr/share/pixmaps/sonicmail
 -WAVSPATH = /usr/share/sound/sonicmail
-+XPMSPATH = ${PREFIX}/share/pixmaps/sonicmail
-+WAVSPATH = ${PREFIX}/share/sound/sonicmail
++XPMSPATH = ${PREFIX}/share/gnome/pixmaps/sonicmail
++WAVSPATH = ${PREFIX}/share/gnome/sounds/sonicmail
  
  # Change to 1 to activate debug mode:
  SONICMAIL_DEBUG = 0
 @@ -43,7 +43,7 @@
  # Common compile options/link options here:
  CFLAGS = -Wall $($(OSTYPE)_Flags) -O2 `gnome-config --cflags applets` $(DEFINES)
  
 -LFLAGS = `gnome-config --libs applets` `gtk-config --libs gthread` -lpthread
 +LFLAGS = `gnome-config --libs applets` `${GTK_CONFIG} --libs gthread`
  
  # Define platform specific flags/libraries below:
  Linux_Flags = -DLINUX

Property changes on: head/mail/sonicmail/files/patch-aa
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.2
\ No newline at end of property
+1.3
\ No newline at end of property
Index: head/mail/sonicmail/pkg-plist
===================================================================
--- head/mail/sonicmail/pkg-plist	(revision 33764)
+++ head/mail/sonicmail/pkg-plist	(revision 33765)
@@ -1,18 +1,18 @@
 bin/sonicmail
 etc/CORBA/servers/sonicmail.gnorba
 share/gnome/applets/Network/sonicmail.desktop
-share/pixmaps/sonicmail/Mail.xpm
-share/pixmaps/sonicmail/MailboxEmpty.xpm
-share/pixmaps/sonicmail/MailboxFull.xpm
-share/pixmaps/sonicmail/MailboxUnknown.xpm
-share/pixmaps/sonicmail/netscape-mailfull.xpm
-share/pixmaps/sonicmail/netscape-nomail.xpm
-share/pixmaps/sonicmail/ultrafina-back.xpm
-share/pixmaps/sonicmail/ultrafina-newmail.xpm
-share/pixmaps/sonicmail/ultrafina-nomail.xpm
-share/pixmaps/sonicmail/ultrafina-offline.xpm
-share/sound/sonicmail/Wooeep.wav
-share/sound/sonicmail/buzz.wav
-share/sound/sonicmail/default.wav
-@dirrm share/pixmaps/sonicmail
-@dirrm share/sound/sonicmail
+share/gnome/pixmaps/sonicmail/Mail.xpm
+share/gnome/pixmaps/sonicmail/MailboxEmpty.xpm
+share/gnome/pixmaps/sonicmail/MailboxFull.xpm
+share/gnome/pixmaps/sonicmail/MailboxUnknown.xpm
+share/gnome/pixmaps/sonicmail/netscape-mailfull.xpm
+share/gnome/pixmaps/sonicmail/netscape-nomail.xpm
+share/gnome/pixmaps/sonicmail/ultrafina-back.xpm
+share/gnome/pixmaps/sonicmail/ultrafina-newmail.xpm
+share/gnome/pixmaps/sonicmail/ultrafina-nomail.xpm
+share/gnome/pixmaps/sonicmail/ultrafina-offline.xpm
+share/gnome/sounds/sonicmail/Wooeep.wav
+share/gnome/sounds/sonicmail/buzz.wav
+share/gnome/sounds/sonicmail/default.wav
+@dirrm share/gnome/pixmaps/sonicmail
+@dirrm share/gnome/sounds/sonicmail

Property changes on: head/mail/sonicmail/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.1.1.1
\ No newline at end of property
+1.2
\ No newline at end of property