Switch to using USE_X_PREFIX, respect CC and CFLAGS, and sort and fix

plist.

5 files changed, 61 insertions, 62 deletions

diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index cbedfcf43532..9a82c225d92e 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	rplay:${PORTSDIR}/audio/rplay
 SED_REPL=rplay
 .endif
 
-USE_XLIB=	yes
+USE_X_PREFIX=	yes
 INSTALLS_SHLIB=	yes
 WRKSRC=		${WRKDIR}/faces
 MAN1=		compface.1 faces.1 face_update.1
diff --git a/mail/faces/files/patch-ab b/mail/faces/files/patch-ab
index 4b0acea11034..cebafaaac163 100644
--- a/mail/faces/files/patch-ab
+++ b/mail/faces/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.dist	Sun Nov 24 17:55:28 1991
-+++ Makefile	Fri Sep 18 18:40:51 1998
+--- Makefile.dist	Sun Nov 24 15:55:28 1991
++++ Makefile	Sat Mar 10 15:34:48 2001
 @@ -22,15 +22,18 @@
  #  uncommented and set accordingly, if needed.
  #
@@ -102,16 +102,24 @@
  			    NOINDEX=$(NOINDEX) SYSV=$(SYSV)
  
  #
-@@ -302,7 +306,7 @@
+@@ -302,8 +306,8 @@
  		  $(SELTYPE) $(SGIDEF) $(SPOOLDIR) $(SPOOLFILE) $(SYSV) \
  		  $(TTEXT) $(TOPIX) $(UPDATE) $(USE_BZERO) $(USE_GETWD) \
  		  $(X11R3) $(X11INCDIR) $(XVIEWINCDIR) $(DEBUG)
 -CCOMP		= -O
-+CCOMP		= -pipe -O2 -fwritable-strings
- CFLAGS		= $(CCOMP) $(CDEFS)
+-CFLAGS		= $(CCOMP) $(CDEFS)
++CCOMP		= -pipe -fwritable-strings 
++CFLAGS		+= $(CCOMP) $(CDEFS)
  #
  #=======================================================================
-@@ -316,7 +320,7 @@
+ 
+@@ -311,12 +315,12 @@
+ 
+ BINARIES	= psfaces svfaces xfaces xvfaces
+ 
+-CC		= cc
++CC		?= cc
+ MAKE		= make
  
  STDSRCS		= address.c get.c main.c mon.c parsefrom.c rec.c
  STDOBJS		= address.o get.o main.o mon.o parsefrom.o rec.o
diff --git a/mail/faces/files/patch-ba b/mail/faces/files/patch-ba
index b1a4b5649f89..0826f0ff4694 100644
--- a/mail/faces/files/patch-ba
+++ b/mail/faces/files/patch-ba
@@ -1,6 +1,6 @@
---- compface/Makefile.orig	Wed Oct 23 21:28:06 1991
-+++ compface/Makefile	Fri Sep 18 19:17:01 1998
-@@ -19,62 +19,70 @@
+--- compface/Makefile.orig	Wed Oct 23 19:28:06 1991
++++ compface/Makefile	Sat Mar 10 15:38:13 2001
+@@ -19,62 +19,69 @@
  #
  #SYSV           = -DSYSV32
  #--------------------------------------------------------------------------
@@ -39,11 +39,12 @@
  HDRS		= compface.h data.h
  OTHERS		= README $(NAME).1 $(NAME).3 Makefile
  
- CC		= cc
+-CC		= cc
++CC		?= cc
  CDEFS		= $(SYSV)
 -CCOMP		= -g
-+CCOMP		= -pipe -O2
- CFLAGS		= $(CDEFS) $(CCOMP)
+-CFLAGS		= $(CDEFS) $(CCOMP)
++CFLAGS		+= $(CDEFS) $(CCOMP)
  
 -all:		$(NAME) $(UNNAME)
 +all:		lib$(NAME).a $(SOLIB) $(NAME) $(UNNAME) 
@@ -95,7 +96,7 @@
  
  shar :
  		shar.script $(OTHERS) $(HDRS) $(SOURCES) > $(NAME).sh
-@@ -88,3 +96,5 @@
+@@ -88,3 +95,5 @@
  gen.o:		gen.c compface.h data.h
  uncmain.o:	uncmain.c compface.h data.h
  uncompface.o:	uncompface.c compface.h data.h
diff --git a/mail/faces/files/patch-ca b/mail/faces/files/patch-ca
index ca53e1827b2a..2491ed818d9b 100644
--- a/mail/faces/files/patch-ca
+++ b/mail/faces/files/patch-ca
@@ -1,47 +1,37 @@
-diff -c -N ../faces/filters/Makefile ./filters/Makefile
-*** ../faces/filters/Makefile	Thu Oct 24 03:26:14 1991
---- ./filters/Makefile	Tue Dec 10 17:17:50 1996
-***************
-*** 34,40 ****
-  
-  CC		= cc
-  CDEFS		= $(NOINDEX) $(SYSV)
-! CCOMP		= -g
-  CFLAGS		= $(CCOMP) $(CDEFS)
-  
-  all:		$(BINARIES)
---- 34,40 ----
-  
-  CC		= cc
-  CDEFS		= $(NOINDEX) $(SYSV)
-! CCOMP		= -pipe -O2
-  CFLAGS		= $(CCOMP) $(CDEFS)
-  
-  all:		$(BINARIES)
-***************
-*** 55,66 ****
-  		rm -f *.o $(BINARIES)
-  
-  install:	$(BINARIES)
-! 		install -s -m 751 icon2ikon $(BINDIR)
-! 		install -s -m 751 ikon2icon $(BINDIR)
-! 		install -s -m 751 rs2icon $(BINDIR)
-! 		install -c -m 755 fs2ikon $(BINDIR)
-! 		install -c -m 755 fs2xbm $(BINDIR)
-! 		install -c -m 755 ikon2xbm $(BINDIR)
-! 		install -c -m 755 xbm2ikon $(BINDIR)
-! 		install -c -m 755 xbmcut48 $(BINDIR)
-! 		install -c -m 755 xbmsize48 $(BINDIR)
---- 55,66 ----
-  		rm -f *.o $(BINARIES)
-  
-  install:	$(BINARIES)
-! 		install -s -o bin -m 751 icon2ikon $(BINDIR)
-! 		install -s -o bin -m 751 ikon2icon $(BINDIR)
-! 		install -s -o bin -m 751 rs2icon $(BINDIR)
-! 		install -c -o bin -m 755 fs2ikon $(BINDIR)
-! 		install -c -o bin -m 755 fs2xbm $(BINDIR)
-! 		install -c -o bin -m 755 ikon2xbm $(BINDIR)
-! 		install -c -o bin -m 755 xbm2ikon $(BINDIR)
-! 		install -c -o bin -m 755 xbmcut48 $(BINDIR)
-! 		install -c -o bin -m 755 xbmsize48 $(BINDIR)
+--- filters/Makefile.orig	Wed Oct 23 19:26:14 1991
++++ filters/Makefile	Sat Mar 10 15:37:37 2001
+@@ -32,10 +32,9 @@
+ 
+ BINARIES	= icon2ikon ikon2icon rs2icon
+ 
+-CC		= cc
++CC		?= cc
+ CDEFS		= $(NOINDEX) $(SYSV)
+-CCOMP		= -g
+-CFLAGS		= $(CCOMP) $(CDEFS)
++CFLAGS		+= $(CCOMP) $(CDEFS)
+ 
+ all:		$(BINARIES)
+ 
+@@ -55,12 +54,12 @@
+ 		rm -f *.o $(BINARIES)
+ 
+ install:	$(BINARIES)
+-		install -s -m 751 icon2ikon $(BINDIR)
+-		install -s -m 751 ikon2icon $(BINDIR)
+-		install -s -m 751 rs2icon $(BINDIR)
+-		install -c -m 755 fs2ikon $(BINDIR)
+-		install -c -m 755 fs2xbm $(BINDIR)
+-		install -c -m 755 ikon2xbm $(BINDIR)
+-		install -c -m 755 xbm2ikon $(BINDIR)
+-		install -c -m 755 xbmcut48 $(BINDIR)
+-		install -c -m 755 xbmsize48 $(BINDIR)
++		install -s -o bin -m 751 icon2ikon $(BINDIR)
++		install -s -o bin -m 751 ikon2icon $(BINDIR)
++		install -s -o bin -m 751 rs2icon $(BINDIR)
++		install -c -o bin -m 755 fs2ikon $(BINDIR)
++		install -c -o bin -m 755 fs2xbm $(BINDIR)
++		install -c -o bin -m 755 ikon2xbm $(BINDIR)
++		install -c -o bin -m 755 xbm2ikon $(BINDIR)
++		install -c -o bin -m 755 xbmcut48 $(BINDIR)
++		install -c -o bin -m 755 xbmsize48 $(BINDIR)
diff --git a/mail/faces/pkg-plist b/mail/faces/pkg-plist
index af907a89f4f4..c7a6294c6cad 100644
--- a/mail/faces/pkg-plist
+++ b/mail/faces/pkg-plist
@@ -32,8 +32,8 @@ share/faces/lib/allrc
 share/doc/faces/README
 share/doc/faces/README.kinzler
 share/doc/faces/from.allrc-eg
-@dirrm share/faces
 @dirrm share/faces/lib
+@dirrm share/faces
 @dirrm share/doc/faces
 @cwd /usr/X11R6
 lib/X11/app-defaults/Faces