- Fix MASTER_SITES
- Sort pkg/PLIST

New file:
patches/patch-af  patches/patch-ag

Remove file:
patches/patch-ad

Fix: +--- 50,54 ----


Sent by Japanese ProntoMail--6on3RgIdbsFMdyaG87EHfGMJFvFbw1zzLyoZY4ssEk8xGOJ4
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

diff -urN /usr/ports/editors/sam/Makefile editors/sam/Makefile
--- /usr/ports/editors/sam/Makefile	Wed Aug 25 19:14:41 1999
+++ editors/sam/Makefile	Fri Feb 11 11:03:30 2000
@@ -9,22 +9,22 @@
 DISTNAME=	sam
 PKGNAME=	sam-4.3
 CATEGORIES=	editors plan9
-MASTER_SITES=	ftp://ftp.ecf.toronto.edu/pub/plan9/matty/
+MASTER_SITES=	ftp://ftp.cs.usyd.edu.au/matty/unicode/
 EXTRACT_SUFX=	.msg.gz
 
 MAINTAINER=	erich@FreeBSD.org
 
-USE_XLIB=	yes
+EXTRACT_CMD=		${GZCAT}
+EXTRACT_BEFORE_ARGS=	# empty
+EXTRACT_AFTER_ARGS=	| ${SH}
+
 NO_WRKSUBDIR=	yes
-EXTRACT_CMD=		zcat
-EXTRACT_BEFORE_ARGS=
-EXTRACT_AFTER_ARGS=	|sh
+USE_X_PREFIX=	yes
 
 MAN1=		sam.1
 MAN3=		add.3 balloc.3 bitblt.3 cachechars.3 event.3 frame.3 \
 		graphics.3 rgbpix.3 rune.3
 MAN4=		font.4 keyboard.4 utf.4
 MAN6=		bitmap.6 regexp.6
-MANCOMPRESSED=	yes
 
 .include <bsd.port.mk>
diff -urN /usr/ports/editors/sam/patches/patch-aa editors/sam/patches/patch-aa
--- /usr/ports/editors/sam/patches/patch-aa	Mon Aug 14 13:08:00 1995
+++ editors/sam/patches/patch-aa	Fri Feb 11 11:07:58 2000
@@ -1,15 +1,8 @@
-*** libXg/Makefile.orig	Fri Jul 28 14:02:17 1995
---- libXg/Makefile	Fri Jul 21 15:03:43 1995
+*** libXg/Makefile.orig	Fri Feb 11 11:04:17 2000
+--- libXg/Makefile	Fri Feb 11 11:07:47 2000
 ***************
-*** 1,24 ****
-  #	Copyright (c) 1992 AT&T - All rights reserved.
-  #
-! #	Prototype Makefile for libXg
-  #
-- #	define operating system.  ONE of:
-- #		-DIRIX -DSUNOS -DUMIPS -DSYSVR3 -DAIX -DOSF1
-- #		-DHPUX -DAPOLLO -DCONVEX -DDYNIX
-- #	
+*** 8,24 ****
+  #	
   #	Additionally, -D_POSIX_SOURCE (or its equivalent) may be specified
   #	if your compiler supports posix-compatible compilation
 ! OS=-DIRIX -ansiposix
@@ -26,24 +19,18 @@
   
   #	add name of librarian
   AR=ar
---- 1,23 ----
-  #	Copyright (c) 1992 AT&T - All rights reserved.
-  #
-! #	Prototype BSDi Makefile for libXg
-! #	Courtesy of Boyd Roberts
-! #
-! #	Define operating system type: -DBSDi
-  #
+--- 8,24 ----
+  #	
   #	Additionally, -D_POSIX_SOURCE (or its equivalent) may be specified
   #	if your compiler supports posix-compatible compilation
-! OS=-O2 -DBSDi
+! OS=-DBSDi
   
   #	add -Iincludedir for any include directories that need to be searched
-! INCS=-I../include -I/usr/X11R6/include
+! INCS=-I../include -I${X11BASE}/include
   
   #	set this if your X libraries are in different locations
   #	or if you need extra libraries to load with X11 applications
-! XLIBS=/usr/X11/lib/libXt.a /usr/X11/lib/libX11.a
+! XLIBS=-lXt -lX11 -L${X11BASE}/lib
   
   #	add name of library orderer - use ":" if none
 ! RANLIB=ranlib
@@ -51,6 +38,25 @@
   #	add name of librarian
   AR=ar
 ***************
+*** 26,33 ****
+  #	the name of the library
+  LIB=libXg.a
+  
+! CFLAGS=$(OS) -D_LIBXG_EXTENSION $(INCS)
+! CC=cc
+  
+  OBJS=	arc.o arith.o balloc.o bitblt.o bitbltclip.o border.o bscreenrect.o\
+  	circle.o clipline.o clipr.o copymasked.o cursorset.o cursorswitch.o\
+--- 26,33 ----
+  #	the name of the library
+  LIB=libXg.a
+  
+! CFLAGS+=$(OS) -D_LIBXG_EXTENSION $(INCS)
+! CC?=cc
+  
+  OBJS=	arc.o arith.o balloc.o bitblt.o bitbltclip.o border.o bscreenrect.o\
+  	circle.o clipline.o clipr.o copymasked.o cursorset.o cursorswitch.o\
+***************
 *** 50,56 ****
   $(LIB):	$(OBJS)
   	$(AR) rv $(LIB) $(OBJS)
@@ -59,4 +65,4 @@
 - $(LIB)(%.o): %.o
   
   $(OBJS):	../include/libg.h libgint.h ../include/libc.h
---- 49,53 ----