o) Fix some install problems due to X11 non-X11 version

o) Install faces.1.gz not faces.man
o) Avoid package building due to various sound options, X11/non-X11 build
o) Give maintainership to ports
o) Bump PORTREVISION

4 files changed, 43 insertions, 22 deletions

diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index 7bd3a8d368f4..2d1a2f46d0dc 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -8,18 +8,20 @@
 
 PORTNAME=	faces
 PORTVERSION=	1.7.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/faces/faces/
 
-MAINTAINER=	Lars.Koeller@Uni-Bielefeld.DE
+MAINTAINER=	ports@freebsd.org
 
 LIB_DEPENDS=    intl.4:${PORTSDIR}/devel/gettext
 
+NO_PACKAGE=	"Too many configuration options available to set usefull defaults"
+
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS= --prefix=${PREFIX} --enable-imap --enable-pop \
+CONFIGURE_ARGS= --prefix=${LOCALBASE} --enable-imap --enable-pop \
 		--enable-name-unknown --with-spooldir=/var/mail \
-		--with-facedir=${PREFIX}/share/faces
+		--with-facedir=${LOCALBASE}/share/faces
 
 .if defined(WITHOUT_X11)
 CONFIGURE_ARGS+=--without-x
@@ -79,8 +81,9 @@ pre-everything:
 post-configure:
 	${CP} ${FILESDIR}/Makefile.compface ${WRKSRC}/compface/Makefile
 	${CP} -pf ${WRKSRC}/faces/faces.man ${WRKSRC}/faces/faces.man.orig
-	${SED} -e "s%/usr/local/faces%${PREFIX}/share/faces%" \
+	${SED} -e "s%/usr/local/faces%${LOCALBASE}/share/faces%" \
 	       -e "s%/var/spool/mail%/var/mail%" < ${WRKSRC}/faces/faces.man.orig > ${WRKSRC}/faces/faces.man
+	${LN} ${WRKSRC}/faces/faces.man ${WRKSRC}/faces/faces.1
 	${CP} -pf ${WRKSRC}/faces/Faces.ad ${WRKSRC}/faces/Faces.ad.orig
 .if !defined(WITHOUT_AUDIO)
 .if defined(USE_NAS)
@@ -96,17 +99,17 @@ post-configure:
 
 post-install:
 .if !defined(WITHOUT_X11)
-	${CP} -f ${WRKSRC}/faces/Faces.ad ${PREFIX}/lib/X11/app-defaults/Faces
+	${CP} -f ${WRKSRC}/faces/Faces.ad ${X11BASE}/lib/X11/app-defaults/Faces
 .endif
 .if !defined(NOPORTDOCS)
-	if [ ! -e ${PREFIX}/share/doc/${PORTNAME} ]; then \
-		${MKDIR} ${PREFIX}/share/doc/${PORTNAME}; \
-	       	${CP} -f ${WRKSRC}/README ${PREFIX}/share/doc/${PORTNAME}; \
+	if [ ! -e ${LOCALBASE}/share/doc/${PORTNAME} ]; then \
+		${MKDIR} ${LOCALBASE}/share/doc/${PORTNAME}; \
+	       	${CP} -f ${WRKSRC}/README ${LOCALBASE}/share/doc/${PORTNAME}; \
 	fi
 .endif
-	${INSTALL_SCRIPT} ${FILESDIR}/ikon2xbm ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${FILESDIR}/xbm2ikon ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${FILESDIR}/xbmcut48 ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${FILESDIR}/xbmsize48 ${PREFIX}/bin
+	${INSTALL_SCRIPT} ${FILESDIR}/ikon2xbm ${LOCALBASE}/bin
+	${INSTALL_SCRIPT} ${FILESDIR}/xbm2ikon ${LOCALBASE}/bin
+	${INSTALL_SCRIPT} ${FILESDIR}/xbmcut48 ${LOCALBASE}/bin
+	${INSTALL_SCRIPT} ${FILESDIR}/xbmsize48 ${LOCALBASE}/bin
 
 .include <bsd.port.mk>
diff --git a/mail/faces/files/Makefile.compface b/mail/faces/files/Makefile.compface
index 272a04daa7fd..684a4cf7fc1e 100644
--- a/mail/faces/files/Makefile.compface
+++ b/mail/faces/files/Makefile.compface
@@ -6,7 +6,7 @@
 #  Written 11th November 1989.
 #
 #  Permission is given to distribute these sources, as long as the
-#  copyright messages are not removed, and no monies are exchanged. 
+#  copyright messages are not removed, and no monies are exchanged.
 #
 #  No responsibility is taken for any errors on inaccuracies inherent
 #  either to the comments or the code of this program, but if reported
@@ -22,10 +22,10 @@
 # BINDIR, LIBDIR, INCDIR and MANDIR are expected to be overridden by the
 # calling Makefile
 
-BINDIR		= /usr/local/bin
-LIBDIR		= /usr/local/lib
-INCDIR		= /usr/local/include
-MANDIR		= /usr/local/man
+BINDIR		= ${PREFIX}/bin
+LIBDIR		= ${PREFIX}/lib
+INCDIR		= ${PREFIX}/include
+MANDIR		= ${PREFIX}/man
 
 NAME		= compface
 UNNAME		= uncompface
@@ -55,7 +55,7 @@ CC		?= cc
 CDEFS		= $(SYSV)
 CFLAGS		+= $(CDEFS) $(CCOMP)
 
-all:		lib$(NAME).a $(SOLIB) $(NAME) $(UNNAME) 
+all:		lib$(NAME).a $(SOLIB) $(NAME) $(UNNAME)
 
 $(NAME) :	cmain.o compface.o
 		$(CC) $(CFLAGS) -o $(NAME) cmain.o compface.o -L./ -lcompface
diff --git a/mail/faces/files/patch-aa b/mail/faces/files/patch-aa
index a8d6ce91cf1b..ac19236ce061 100644
--- a/mail/faces/files/patch-aa
+++ b/mail/faces/files/patch-aa
@@ -1,5 +1,5 @@
-*** faces/Makefile.in.orig	Tue Mar  5 21:07:46 2002
---- faces/Makefile.in	Tue Mar  5 21:08:06 2002
+*** faces/Makefile.in.orig	Tue Apr  9 03:52:16 2002
+--- faces/Makefile.in	Tue Jan 21 20:03:50 2003
 ***************
 *** 116,122 ****
   
@@ -17,3 +17,20 @@
   faces_LDADD = @GTK_LIBS@ $(INTLLIBS) @X_LIBS@ \
   	-lX11 -L../compface -lcompface $(resolv)
   
+***************
+*** 152,158 ****
+  	dialog_warning.xpm
+  
+  
+! man1_MANS = faces.man
+  EXTRA_DIST = $(man1_MANS) Faces.ad faces.sendmail
+  subdir = faces
+  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+--- 152,158 ----
+  	dialog_warning.xpm
+  
+  
+! man1_MANS = faces.1
+  EXTRA_DIST = $(man1_MANS) Faces.ad faces.sendmail
+  subdir = faces
+  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/mail/faces/pkg-plist b/mail/faces/pkg-plist
index a1814a732fec..7b1a02647340 100644
--- a/mail/faces/pkg-plist
+++ b/mail/faces/pkg-plist
@@ -1,5 +1,4 @@
 bin/faces
-lib/X11/app-defaults/Faces
 bin/compface
 bin/uncompface
 bin/ikon2xbm
@@ -10,6 +9,8 @@ include/compface.h
 lib/libcompface.a
 lib/libcompface.so
 lib/libcompface.so.1.0
+%%APPDEF%%@cwd %%X11BASE%%
 %%APPDEF%%lib/X11/app-defaults/Faces
+%%APPDEF%%@cwd %%LOCALBASE%%
 share/doc/faces/README
 @dirrm share/doc/faces