Update mail/faces to 1.6.1nb1. Changes from version 1.6.1 are moving the

package under ${X11PREFIX} instead of trying to dual-install under both
${LOCALBASE} and ${X11BASE}, and strongly buildlink'fiying.

1 files changed, 31 insertions, 27 deletions

diff --git a/mail/faces/Makefile b/mail/faces/Makefile
index ec7cb8edf6f..045b2c910d4 100644
--- a/mail/faces/Makefile
+++ b/mail/faces/Makefile
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2001/11/29 18:00:31 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2001/11/30 16:29:28 jlam Exp $
 
 DISTNAME=	faces-1.6.1
+PKGREVISION=	1
+WRKSRC=		${WRKDIR}/faces
 CATEGORIES=	mail
 MASTER_SITES=	ftp://ftp.cs.indiana.edu/pub/faces/faces/
 EXTRACT_SUFX=	.tar.Z
@@ -11,37 +13,39 @@ COMMENT=	visual mail, user and print face server
 LICENSE=	limited-redistribution
 RESTRICTED=	"Distribution not allowed if money exchanged"
 
-USE_X11=	yes
-
-MAKE_ENV+=	MKLINT=no
-WRKSRC=		${WRKDIR}/faces
-
-PLIST_SUBST+=	LOCALBASE="${LOCALBASE}" X11PREFIX="${X11PREFIX}"
+USE_BUILDLINK_ONLY=	YES
+USE_X11BASE=		YES
+USE_LIBTOOL=		YES
 
-do-configure:
-	@cd ${WRKSRC}; \
-	for f in Makefile faces.h x11.c compface/Makefile 		\
-		scripts/addxface scripts/facesall scripts/mkfacesindex; do \
-		${MV} $$f $$f.in;					\
-		${SED} -e 's|@localbase@|'${LOCALBASE}'|g' 		\
-			-e 's|@x11prefix@|'${X11PREFIX}'|g'		\
-			-e 's|@x11base@|'${X11BASE}'|g' < $$f.in > $$f;	\
-	done
+MAKE_FLAGS+=	PREFIX="${PREFIX}"
+MAKE_FLAGS+=	CCOMP="${CFLAGS}"
 
-# for OBJECT_FMT and OPSYS
 .include "../../mk/bsd.prefs.mk"
 
-post-install:
-	${LN} -f ${PREFIX}/man/man1/compface.1 ${PREFIX}/man/man1/uncompface.1
-	${LN} -f ${PREFIX}/man/man3/compface.3 ${PREFIX}/man/man3/uncompface.3
-.if (${OBJECT_FMT} == "ELF")
-	${LN} -fs ${LOCALBASE}/lib/libcompface.so.1.0 ${LOCALBASE}/lib/libcompface.so.1
-	${LN} -fs ${LOCALBASE}/lib/libcompface.so.1.0 ${LOCALBASE}/lib/libcompface.so
-.endif
-
 .if ${OPSYS} == "SunOS"
-MAKE_ENV+=	SVR4LIBS="-lnsl -lsocket -lgen" SYSV=-DSYSV32 CC=gcc CPPFLAGS=
-PATH:=		/usr/ucb:${PATH}
+MAKE_ENV+=	SVR4LIBS="-lnsl -lsocket -lgen"
+MAKE_ENV+=	SYSV=-DSYSV32
+MAKE_ENV+=	CC=gcc
+MAKE_ENV+=	CPPFLAGS=
 .endif
 
+do-configure:
+	${LN} -sf Makefile.dist ${WRKSRC}/${MAKEFILE}
+	cd ${WRKSRC};							\
+	files="								\
+		x11.c							\
+		scripts/addxface					\
+		scripts/facesall					\
+		scripts/mkfacesindex					\
+	";								\
+	for file in $${files}; do					\
+		${SED}	-e "s|@PREFIX@|${PREFIX}|g"			\
+			$${file} > $${file}.fixed;			\
+		if [ -x $${file} ]; then				\
+			${CHMOD} +x $${file}.fixed;			\
+		fi;							\
+		${MV} -f $${file}.fixed $${file};			\
+	done
+
+.include "../../mk/x11.buildlink.mk"
 .include "../../mk/bsd.pkg.mk"