Misc fixes:
Remove a dead MASTER_SITE. Use PLIST_SUBST instead of local hack. Create app-defaults dir if missing (solves pkg/13179). Don't hardwire incorrect app-defaults path in patch-at.
This commit is contained in:
wiz
parent
7a49acab77
commit
b17589064d
5 changed files with 19 additions and 21 deletions
|
|
@ -1,9 +1,8 @@
|
|||
# $NetBSD: Makefile,v 1.22 2001/07/24 17:04:27 tron Exp $
|
||||
# $NetBSD: Makefile,v 1.23 2001/11/29 18:00:31 wiz Exp $
|
||||
|
||||
DISTNAME= faces-1.6.1
|
||||
CATEGORIES= mail
|
||||
MASTER_SITES= ftp://ftp.cs.indiana.edu/pub/faces/faces/ \
|
||||
ftp://odie.physik2.uni-rostock.de/pub/
|
||||
MASTER_SITES= ftp://ftp.cs.indiana.edu/pub/faces/faces/
|
||||
EXTRACT_SUFX= .tar.Z
|
||||
|
||||
MAINTAINER= packages@netbsd.org
|
||||
|
|
@ -17,6 +16,8 @@ USE_X11= yes
|
|||
MAKE_ENV+= MKLINT=no
|
||||
WRKSRC= ${WRKDIR}/faces
|
||||
|
||||
PLIST_SUBST+= LOCALBASE="${LOCALBASE}" X11PREFIX="${X11PREFIX}"
|
||||
|
||||
do-configure:
|
||||
@cd ${WRKSRC}; \
|
||||
for f in Makefile faces.h x11.c compface/Makefile \
|
||||
|
|
@ -30,13 +31,9 @@ do-configure:
|
|||
# for OBJECT_FMT and OPSYS
|
||||
.include "../../mk/bsd.prefs.mk"
|
||||
|
||||
PLIST_SRC= ${WRKDIR}/.PLIST-src
|
||||
|
||||
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
|
||||
@${SED} -e 's|@localbase@|'${LOCALBASE}'|g' \
|
||||
-e 's|@x11prefix@|'${X11PREFIX}'|g' < ${PKGDIR}/PLIST > ${PLIST_SRC}
|
||||
.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
|
||||
|
|
|
|||
|
|
@ -1,19 +1,19 @@
|
|||
@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:02 zuntum Exp $
|
||||
@cwd @localbase@
|
||||
@comment $NetBSD: PLIST,v 1.2 2001/11/29 18:00:31 wiz Exp $
|
||||
@cwd ${LOCALBASE}
|
||||
share/faces/machine.tab
|
||||
share/faces/people.tab
|
||||
@dirrm share/faces
|
||||
bin/compface
|
||||
bin/uncompface
|
||||
man/man1/compface.1.gz
|
||||
man/man1/uncompface.1.gz
|
||||
man/man1/compface.1
|
||||
man/man1/uncompface.1
|
||||
lib/libcompface.a
|
||||
lib/libcompface.so
|
||||
lib/libcompface.so.1
|
||||
lib/libcompface.so.1.0
|
||||
include/compface.h
|
||||
man/man3/compface.3.gz
|
||||
man/man3/uncompface.3.gz
|
||||
man/man3/compface.3
|
||||
man/man3/uncompface.3
|
||||
bin/icon2ikon
|
||||
bin/ikon2icon
|
||||
bin/rs2icon
|
||||
|
|
@ -38,5 +38,5 @@ bin/face_update
|
|||
bin/faces.sendmail
|
||||
man/man1/faces.1.gz
|
||||
man/man1/face_update.1.gz
|
||||
@cwd @x11prefix@
|
||||
@cwd ${X11PREFIX}
|
||||
lib/X11/app-defaults/Faces
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
$NetBSD: distinfo,v 1.2 2001/04/20 13:09:56 agc Exp $
|
||||
$NetBSD: distinfo,v 1.3 2001/11/29 18:00:31 wiz Exp $
|
||||
|
||||
SHA1 (faces-1.6.1.tar.Z) = 8402a74e43e78345c23a975a417c2407322db65f
|
||||
Size (faces-1.6.1.tar.Z) = 249469 bytes
|
||||
SHA1 (patch-aa) = 99012a91d3ac39bdd0ad8b5ab454812ace346dbb
|
||||
SHA1 (patch-ab) = b9723f1fba86bfd858933ccab5f008b0fa1be580
|
||||
SHA1 (patch-ab) = 9b8c07c284e387dbccb32e0fee684497d481b20f
|
||||
SHA1 (patch-ac) = 42c14c50e46d2310ba3d1003606b4afe06c19bca
|
||||
SHA1 (patch-ad) = 8383d81ea922122c5fc1fa23fd44c4a45b376c68
|
||||
SHA1 (patch-ae) = 0a7e57277e0e8133c81997258ef7f7a656834088
|
||||
|
|
@ -21,7 +21,7 @@ SHA1 (patch-ap) = 620cd43e7f4b72371794bed1b701344d8bc41f56
|
|||
SHA1 (patch-aq) = 617c7d139198678b6e2e73dcd957ae66a01df80b
|
||||
SHA1 (patch-ar) = 09ef44371c76e24a10fb2f467c897a2a454d56d0
|
||||
SHA1 (patch-as) = fba3db3a03990af2a8091781e7e9ee52c570c646
|
||||
SHA1 (patch-at) = ba7ae9f285d07c2a974db3147791ef12efaab050
|
||||
SHA1 (patch-at) = abef0f35020fb8246ecef0dbe148f77da841ec44
|
||||
SHA1 (patch-au) = 582e9ad10b44e2e8af10c5c5e8682a7bfe508318
|
||||
SHA1 (patch-av) = 1ef88ca0a9b72d783f318242d152d23510f7949a
|
||||
SHA1 (patch-aw) = a53df4bc5b1eb696bc9416f7109d152d735b76f7
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
$NetBSD: patch-ab,v 1.8 2000/09/04 11:29:36 tron Exp $
|
||||
$NetBSD: patch-ab,v 1.9 2001/11/29 18:00:32 wiz Exp $
|
||||
|
||||
--- Makefile.orig Mon Sep 4 10:37:54 2000
|
||||
+++ Makefile Mon Sep 4 10:55:54 2000
|
||||
@@ -0,0 +1,475 @@
|
||||
@@ -0,0 +1,476 @@
|
||||
+#
|
||||
+# Makefile for faces, an icon face server, plus associated software.
|
||||
+#
|
||||
|
|
@ -428,6 +428,7 @@ $NetBSD: patch-ab,v 1.8 2000/09/04 11:29:36 tron Exp $
|
|||
+ $(MANDIR)/man$(MANSECT)/faces.$(MANSECT)
|
||||
+ install -c -m 444 face_update.1 \
|
||||
+ $(MANDIR)/man$(MANSECT)/face_update.$(MANSECT)
|
||||
+ install -d -m 444 @x11prefix@/lib/X11/app-defaults
|
||||
+ install -c -m 444 -o bin Faces.ad @x11prefix@/lib/X11/app-defaults/Faces
|
||||
+
|
||||
+clean:
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$NetBSD: patch-at,v 1.4 2001/02/03 01:53:03 dmcmahill Exp $
|
||||
$NetBSD: patch-at,v 1.5 2001/11/29 18:00:32 wiz Exp $
|
||||
|
||||
--- x11.c.orig Mon Nov 18 23:00:50 1991
|
||||
+++ x11.c Fri Feb 2 20:01:06 2001
|
||||
|
|
@ -55,7 +55,7 @@ $NetBSD: patch-at,v 1.4 2001/02/03 01:53:03 dmcmahill Exp $
|
|||
home = getenv("HOME") ;
|
||||
XrmInitialize() ;
|
||||
+#if (defined(BSD) && BSD >= 199306)
|
||||
+ STRCPY(name, "/usr/X11R6/lib/X11/app-defaults/Faces") ;
|
||||
+ STRCPY(name, "@x11prefix@/lib/X11/app-defaults/Faces") ;
|
||||
+#else
|
||||
STRCPY(name, "/usr/lib/X11/app-defaults/Faces") ;
|
||||
+#endif
|
||||
|
|
|
|||
Loading…
Reference in a new issue