diff options
author | obache <obache@pkgsrc.org> | 2011-03-02 05:42:41 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2011-03-02 05:42:41 +0000 |
commit | ac8d8491710d2b0908eeca0416055268d502443a (patch) | |
tree | 36cf2d3ad098cbd1183023b7b3d012b734467ce7 /mail | |
parent | 3d8a1d3e6d30910dd21e7980ceb8297c16ff5a6a (diff) | |
download | pkgsrc-ac8d8491710d2b0908eeca0416055268d502443a.tar.gz |
* fixes to install libraries as BSD_INSTALL_LIB, not BSD_INSTALL_DATA (patch-ac)
* nearly 10 years forgotten to replace @x11prefix@ with @PREFIX@ in patch-at.
and no need to restrict to BSDs only in pkgsrc.
* regen patches with recent mkpatches(1).
* use SUBST to replace PREFIX.
* add user-destdir installation.
Bump PKGREVISION.
Diffstat (limited to 'mail')
-rw-r--r-- | mail/faces/Makefile | 30 | ||||
-rw-r--r-- | mail/faces/distinfo | 8 | ||||
-rw-r--r-- | mail/faces/patches/patch-ac | 15 | ||||
-rw-r--r-- | mail/faces/patches/patch-ae | 14 | ||||
-rw-r--r-- | mail/faces/patches/patch-at | 41 |
5 files changed, 60 insertions, 48 deletions
diff --git a/mail/faces/Makefile b/mail/faces/Makefile index 771499d6da4..cf8c8e5a41e 100644 --- a/mail/faces/Makefile +++ b/mail/faces/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.55 2009/05/19 08:59:21 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2011/03/02 05:42:41 obache Exp $ DISTNAME= faces-1.6.1 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= mail MASTER_SITES= ftp://ftp.cs.indiana.edu/pub/faces/faces/faces-1.6.1/ EXTRACT_SUFX= .tar.Z @@ -18,6 +18,8 @@ DEPENDS+= netpbm>=9.2:../../graphics/netpbm CONFLICTS= compface-[0-9]* +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR}/faces USE_X11BASE= YES USE_LIBTOOL= YES @@ -39,29 +41,27 @@ MAKE_ENV+= CPPFLAGS= MAKE_ENV+= NISLOOKUP=-DNISLOOKUP .endif +INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} + +INSTALLATION_DIRS+= bin lib include ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 + REPLACE_PERL= scripts/addxface scripts/deepen scripts/facesaddr \ scripts/facesall scripts/from.faces scripts/lpqall.faces \ scripts/mailq.faces scripts/mailqto scripts/mailqto.faces \ scripts/mkfacesindex scripts/newscheck.faces \ scripts/newsfrom.faces scripts/rotary.faces -do-configure: +post-extract: ${LN} -sf Makefile.dist ${WRKSRC}/${MAKE_FILE} - cd ${WRKSRC}; \ - files=" \ + +SUBST_CLASSES+= prefix +SUBST_STAGE.prefix= pre-configure +SUBST_FILES.prefix= \ 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 + scripts/mkfacesindex +SUBST_VARS.prefix= PREFIX .include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/faces/distinfo b/mail/faces/distinfo index 9646810aebb..d96456c1b4c 100644 --- a/mail/faces/distinfo +++ b/mail/faces/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.15 2009/10/07 17:41:35 joerg Exp $ +$NetBSD: distinfo,v 1.16 2011/03/02 05:42:41 obache Exp $ SHA1 (faces-1.6.1.tar.Z) = 8402a74e43e78345c23a975a417c2407322db65f RMD160 (faces-1.6.1.tar.Z) = fdf0d1eca4d094b0b50c00c627082c78ae5dd195 Size (faces-1.6.1.tar.Z) = 249469 bytes SHA1 (patch-aa) = 99012a91d3ac39bdd0ad8b5ab454812ace346dbb SHA1 (patch-ab) = 98836fea05bd250aab1497022dcf6515829e39ce -SHA1 (patch-ac) = df485059a726addb843c3fb650d52432f97f1571 +SHA1 (patch-ac) = 4d61574110437dd0ec3b2756608ce384ae3baaf4 SHA1 (patch-ad) = 8383d81ea922122c5fc1fa23fd44c4a45b376c68 -SHA1 (patch-ae) = 0a7e57277e0e8133c81997258ef7f7a656834088 +SHA1 (patch-ae) = 95d1df85d315926970a446490b42ee812ce4df43 SHA1 (patch-af) = 28eca0e38e04aef8b51d596d00f19d329f7570ec SHA1 (patch-ag) = df1e715582dd8f76fabed97ceb994d77d6d14ab7 SHA1 (patch-ah) = 0333bb755c9fb3f71bc17c963eaa9c0b1322a6d6 @@ -22,7 +22,7 @@ SHA1 (patch-ap) = 200bf4c20bc36d5f08505af69084a4de2283e07f SHA1 (patch-aq) = 57d3f14ae8229cc4d879fdca5f87f04bb5398edc SHA1 (patch-ar) = 0a21b5fa5e8f200e8873286a128aed62e1edd5b9 SHA1 (patch-as) = 3751bb0603637db885263d49a50769c7d6c39377 -SHA1 (patch-at) = ee84e7a191c0db0f278be753562ba086050a7f8c +SHA1 (patch-at) = 2972ee83bae66ca60fe34436c67869019b8c2be5 SHA1 (patch-au) = 582e9ad10b44e2e8af10c5c5e8682a7bfe508318 SHA1 (patch-av) = 0167d89f23dcc997af9a9b9ab78439d5840e0724 SHA1 (patch-aw) = 654de6c7e5e1164fad2bbd60606f50cb45ad8da3 diff --git a/mail/faces/patches/patch-ac b/mail/faces/patches/patch-ac index 058feecddf4..aff5d95656a 100644 --- a/mail/faces/patches/patch-ac +++ b/mail/faces/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.12 2009/10/07 17:41:35 joerg Exp $ +$NetBSD: patch-ac,v 1.13 2011/03/02 05:42:41 obache Exp $ ---- compface/Makefile.orig Wed Oct 23 22:28:06 1991 +--- compface/Makefile.orig 1991-10-24 02:28:06.000000000 +0000 +++ compface/Makefile @@ -22,20 +22,22 @@ # BINDIR, LIBDIR, and MANDIR are expected to be overridden by the @@ -30,7 +30,7 @@ $NetBSD: patch-ac,v 1.12 2009/10/07 17:41:35 joerg Exp $ cmain.c uncmain.c HDRS = compface.h data.h OTHERS = README $(NAME).1 $(NAME).3 Makefile -@@ -45,17 +47,16 @@ +@@ -45,17 +47,16 @@ CDEFS = $(SYSV) CCOMP = -g CFLAGS = $(CDEFS) $(CCOMP) @@ -53,7 +53,7 @@ $NetBSD: patch-ac,v 1.12 2009/10/07 17:41:35 joerg Exp $ lint : lint -abchx $(SOURCES) -@@ -64,21 +65,25 @@ +@@ -64,22 +65,26 @@ clean : rm -f *.o *.a *.sh core a.out $(NAME) $(UNNAME) install : $(NAME) $(UNNAME) $(LIBNAME) @@ -68,7 +68,7 @@ $NetBSD: patch-ac,v 1.12 2009/10/07 17:41:35 joerg Exp $ - -cp $(NAME).3 $(MAN3DIR) - rm -f $(MAN3DIR)/$(UNNAME).3 - -ln $(MAN3DIR)/$(NAME).3 $(MAN3DIR)/$(UNNAME).3 -+ $(LIBTOOL) --mode=install ${BSD_INSTALL_DATA} $(LIBNAME) $(LIBDIR) ++ $(LIBTOOL) --mode=install ${BSD_INSTALL_LIB} $(LIBNAME) $(LIBDIR) + $(LIBTOOL) --mode=install ${BSD_INSTALL_PROGRAM} $(NAME) $(EXECUTABLE) + $(LIBTOOL) --mode=install ${BSD_INSTALL_PROGRAM} $(UNNAME) $(UNEXECUTABLE) + ${BSD_INSTALL_MAN} $(NAME).1 $(MAN1DIR) @@ -82,11 +82,12 @@ $NetBSD: patch-ac,v 1.12 2009/10/07 17:41:35 joerg Exp $ shar : shar.script $(OTHERS) $(HDRS) $(SOURCES) > $(NAME).sh compress $(NAME).sh -+ + +.SUFFIXES: .lo + +.c.lo: + $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) -c $< - ++ arith.o: arith.c compface.h data.h cmain.o: cmain.c compface.h data.h + compface.o: compface.c compface.h data.h diff --git a/mail/faces/patches/patch-ae b/mail/faces/patches/patch-ae index d69328d5840..599b92259e0 100644 --- a/mail/faces/patches/patch-ae +++ b/mail/faces/patches/patch-ae @@ -1,7 +1,7 @@ -$NetBSD: patch-ae,v 1.5 2000/07/08 12:47:05 tron Exp $ +$NetBSD: patch-ae,v 1.6 2011/03/02 05:42:41 obache Exp $ ---- compface/file.c.orig Wed Jun 19 08:29:13 1991 -+++ compface/file.c Sat Jul 8 14:25:27 2000 +--- compface/file.c.orig 1991-06-19 06:29:13.000000000 +0000 ++++ compface/file.c @@ -15,6 +15,8 @@ #include "compface.h" @@ -11,7 +11,7 @@ $NetBSD: patch-ae,v 1.5 2000/07/08 12:47:05 tron Exp $ void BigRead(fbuf) register char *fbuf; -@@ -127,10 +129,19 @@ +@@ -127,10 +129,19 @@ char *fbuf; { register char *s, *t; register int i, bits, digits, words; @@ -31,7 +31,7 @@ $NetBSD: patch-ae,v 1.5 2000/07/08 12:47:05 tron Exp $ while (s < F + PIXELS) { if ((bits == 0) && (digits == 0)) -@@ -138,25 +149,43 @@ +@@ -138,25 +149,43 @@ char *fbuf; *(t++) = '0'; *(t++) = 'x'; } @@ -75,10 +75,10 @@ $NetBSD: patch-ae,v 1.5 2000/07/08 12:47:05 tron Exp $ } } } -+ } + } + if (xbitmap) { + sprintf(t, "}\n"); + while (*t) t++; - } ++ } *(t++) = '\0'; } diff --git a/mail/faces/patches/patch-at b/mail/faces/patches/patch-at index 590c2ae148e..749fe6a6b7f 100644 --- a/mail/faces/patches/patch-at +++ b/mail/faces/patches/patch-at @@ -1,8 +1,9 @@ -$NetBSD: patch-at,v 1.6 2005/03/12 12:53:56 schwarz Exp $ +$NetBSD: patch-at,v 1.7 2011/03/02 05:42:41 obache Exp $ ---- x11.c.orig Mon Nov 18 23:00:50 1991 -+++ x11.c Fri Feb 2 20:01:06 2001 -@@ -19,8 +19,9 @@ +--- x11.c.orig 1991-11-19 04:00:50.000000000 +0000 ++++ x11.c +@@ -18,10 +18,11 @@ + #include <stdio.h> #include <ctype.h> -#if ( !defined(mips) && !defined(TOPIX) ) || defined(ultrix) @@ -14,7 +15,9 @@ $NetBSD: patch-at,v 1.6 2005/03/12 12:53:56 schwarz Exp $ +#include <string.h> #else #ifdef SYSTYPE_BSD43 -@@ -31,13 +32,14 @@ + #include <sys/types.h> +@@ -30,15 +31,16 @@ + #ifndef TOPIX #include <bsd/sys/types.h> #include <bsd/sys/time.h> -#include <sys/param.h> @@ -31,13 +34,17 @@ $NetBSD: patch-at,v 1.6 2005/03/12 12:53:56 schwarz Exp $ + #ifdef HASPOLL #include <poll.h> -@@ -59,5 +61,4 @@ + #endif /*HASPOLL*/ +@@ -58,7 +60,6 @@ + #define F_ICON 0 /* Icon index to frame array. */ #define F_WINDOW 1 /* Window index to frame array. */ -#define FACES_BORDER_WIDTH 2 #define FRAME_MASK (ButtonPressMask | ExposureMask | \ ButtonMotionMask | KeyPressMask) -@@ -365,9 +366,11 @@ + #define ICON_MASK ExposureMask +@@ -364,11 +365,13 @@ char *argv[] ; + init_font() ; gc_mask = GCFont | GCForeground | GCBackground | GCGraphicsExposures ; gc_val.font = sfont->fid ; - gc_val.foreground = foregnd ; @@ -51,33 +58,37 @@ $NetBSD: patch-at,v 1.6 2005/03/12 12:53:56 schwarz Exp $ + gc_val.background = backgnd ; tilegc = XCreateGC(dpy, root, gc_mask, &gc_val) ; if (depth == 1) XSetFillStyle(dpy, tilegc, FillOpaqueStippled) ; -@@ -460,5 +463,9 @@ + else XSetFillStyle(dpy, tilegc, FillTiled) ; +@@ -459,6 +462,7 @@ load_resources() + home = getenv("HOME") ; XrmInitialize() ; -+#if (defined(BSD) && BSD >= 199306) -+ STRCPY(name, "@x11prefix@/lib/X11/app-defaults/Faces") ; -+#else ++ STRCPY(name, "@PREFIX@/lib/X11/app-defaults/Faces") ; STRCPY(name, "/usr/lib/X11/app-defaults/Faces") ; -+#endif /* Get applications defaults file, if any. */ -@@ -577,5 +584,5 @@ +@@ -576,14 +580,14 @@ char *argv[] ; + winattrs.event_mask = FRAME_MASK ; frame[F_WINDOW] = XCreateWindow(dpy, root, size.x, size.y, - size.width, size.height, FACES_BORDER_WIDTH, + size.width, size.height, border_width, CopyFromParent, InputOutput, CopyFromParent, CWBackPixel | CWBorderPixel | CWEventMask, &winattrs) ; -@@ -584,5 +591,5 @@ + + winattrs.event_mask = ICON_MASK ; frame[F_ICON] = XCreateWindow(dpy, root, - ix, iy, imagewidth, imageheight, FACES_BORDER_WIDTH, + ix, iy, imagewidth, imageheight, border_width, CopyFromParent, InputOutput, CopyFromParent, CWBackPixel | CWBorderPixel | CWEventMask, &winattrs) ; -@@ -857,4 +864,5 @@ + +@@ -856,6 +860,7 @@ char *str ; + XFillRectangle(dpy, pr[(int) dtype], gc, x, y-9, (unsigned int) textwidth+2, 13) ; XSetFunction(dpy, gc, GXxor) ; + XSetForeground(dpy, gc, WhitePixel(dpy, screen)); XDrawImageString(dpy, pr[(int) dtype], gc, x, y, str, len) ; XSetFunction(dpy, gc, GXcopy) ; + } |