Date: Mon, 21 Feb 2000 06:09:49 -0800 (PST) From: tkato@prontomail.ne.jp To: freebsd-gnats-submit@FreeBSD.org Subject: ports/16875: Update port: mail/pine3 Message-ID: <200002211409.GAA19773@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 16875 >Category: ports >Synopsis: Update port: mail/pine3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Mon Feb 21 06:10:05 PST 2000 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 3.4-RELEASE i386 >Organization: >Environment: >Description: - Support PREFIX/LOCALBASE properly - Support install macros - Merge scripts/configure into Makefile - Fix pkg/PLIST Remove file: scripts/configure >How-To-Repeat: >Fix: diff -urN /usr/ports/mail/pine3/Makefile mail/pine3/Makefile --- /usr/ports/mail/pine3/Makefile Wed Aug 25 19:19:25 1999 +++ mail/pine3/Makefile Mon Feb 21 21:35:09 2000 @@ -1,31 +1,40 @@ # New ports collection makefile for: pine -# http://www.washington.edu/pine/ -# Version required: 3.96 +# Version required: 3.96 # Date created: 03 September 1994 # Whom: mr # # $FreeBSD: ports/mail/pine3/Makefile,v 1.32 1999/08/25 06:50:39 obrien Exp $ # -DISTNAME= pine3.96 -PKGNAME= pine-3.96 -CATEGORIES= mail news -MASTER_SITES= ftp://ftp.cac.washington.edu/pine/old/ -EXTRACT_SUFX= .tar.Z +DISTNAME= pine3.96 +PKGNAME= pine-3.96 +CATEGORIES= mail news +MASTER_SITES= ftp://ftp.cac.washington.edu/pine/old/ +EXTRACT_SUFX= .tar.Z MAINTAINER= ports@FreeBSD.org Y2K= http://www.washington.edu/pine/QandA/sysadmins.html#Millenium -MAN1= pine.1 pico.1 pilot.1 +NO_LATEST_LINK= yes + MAKE_ENV= FILESDIR=${FILESDIR} +MAN1= pico.1 pilot.1 pine.1 + +post-patch: + @${PERL} -pi.in \ + -e "s|%%PREFIX%%|${PREFIX}|g;" \ + -e "s|%%LOCALBASE%%|${LOCALBASE}|g;" \ + ${WRKSRC}/pine/osdep/os-bsf.h -NO_LATEST_LINK= yes +do-configure: + @${CP} ${FILESDIR}/Makefile ${WRKSRC}/Makefile post-install: - ${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 755 \ - ${PREFIX}/share/doc/pine - cd ${WRKSRC} && \ - ${INSTALL_DATA} doc/tech-notes.txt ${PREFIX}/share/doc/pine + ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib +.if !defined(NOPORTDOCS) + @${MKDIR} ${PREFIX}/share/doc/pine + ${INSTALL_DATA} ${WRKSRC}/doc/tech-notes.txt ${PREFIX}/share/doc/pine +.endif .include <bsd.port.mk> diff -urN /usr/ports/mail/pine3/files/Makefile mail/pine3/files/Makefile --- /usr/ports/mail/pine3/files/Makefile Tue Dec 1 20:26:50 1998 +++ mail/pine3/files/Makefile Sat Feb 19 05:22:48 2000 @@ -7,16 +7,15 @@ all: ./build bsf install: - install -c -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} pico/$(SHLIB) ${PREFIX}/lib - ln -sf $(SHLIB) ${PREFIX}/lib/libpico.so - /sbin/ldconfig -m ${PREFIX}/lib - install -c -s -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} bin/pico ${PREFIX}/bin/pico - install -c -s -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} bin/pilot ${PREFIX}/bin/pilot - install -c -s -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} bin/pine ${PREFIX}/bin/pine - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${FILESDIR}/pgpencrypt ${PREFIX}/bin/pgpencrypt - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${FILESDIR}/pgpdecode ${PREFIX}/bin/pgpdecode - install -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${FILESDIR}/pgpsign ${PREFIX}/bin/pgpsign - install -c -o ${SHAREOWN} -g ${SHAREGRP} -m ${SHAREMODE} ${FILESDIR}/dot.pinerc.pgp.sample ${PREFIX}/etc/dot.pinerc.pgp.sample - install -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} doc/pico.1 ${PREFIX}/man/man1/pico.1 - install -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} doc/pilot.1 ${PREFIX}/man/man1/pilot.1 - install -c -o ${MANOWN} -g ${MANGRP} -m ${MANMODE} doc/pine.1 ${PREFIX}/man/man1/pine.1 + ${BSD_INSTALL_PROGRAM} bin/pico ${PREFIX}/bin + ${BSD_INSTALL_PROGRAM} bin/pilot ${PREFIX}/bin + ${BSD_INSTALL_PROGRAM} bin/pine ${PREFIX}/bin + ${BSD_INSTALL_DATA} pico/${SHLIB} ${PREFIX}/lib + ln -sf ${SHLIB} ${PREFIX}/lib/libpico.so + ${BSD_INSTALL_SCRIPT} ${FILESDIR}/pgpencrypt ${PREFIX}/bin + ${BSD_INSTALL_SCRIPT} ${FILESDIR}/pgpdecode ${PREFIX}/bin + ${BSD_INSTALL_SCRIPT} ${FILESDIR}/pgpsign ${PREFIX}/bin + ${BSD_INSTALL_DATA} ${FILESDIR}/dot.pinerc.pgp.sample ${PREFIX}/etc + ${BSD_INSTALL_MAN} doc/pico.1 ${PREFIX}/man/man1 + ${BSD_INSTALL_MAN} doc/pilot.1 ${PREFIX}/man/man1 + ${BSD_INSTALL_MAN} doc/pine.1 ${PREFIX}/man/man1 diff -urN /usr/ports/mail/pine3/patches/patch-aa mail/pine3/patches/patch-aa --- /usr/ports/mail/pine3/patches/patch-aa Tue Oct 13 19:33:47 1998 +++ mail/pine3/patches/patch-aa Sat Feb 19 03:25:42 2000 @@ -84,7 +84,7 @@ + +$(SOLIB): osdep.c osdep.h $(SOFILES) +.if $(PORTOBJFORMAT) == "elf" -+ ld -Bshareable -x -soname $(SOLIB) -o $(SOLIB) $(SOFILES) ++ $(CC) -shared -Wl,-x -Wl,-soname,$(SOLIB) -o $(SOLIB) $(SOFILES) + ln -sf $(SOLIB) libpico.so +.else + ld -Bshareable -x -o $(SOLIB) $(SOFILES) @@ -105,4 +105,4 @@ +$(SOFILES): $(HFILES) + +clean: -+ rm -f *.a *.so.1.3 *.o *.so *~ osdep.c osdep.h pico pilot ++ rm -f *.a *.so.* *.o *.so *~ osdep.c osdep.h pico pilot diff -urN /usr/ports/mail/pine3/patches/patch-ac mail/pine3/patches/patch-ac --- /usr/ports/mail/pine3/patches/patch-ac Wed Feb 5 02:15:22 1997 +++ mail/pine3/patches/patch-ac Mon Feb 21 21:34:28 2000 @@ -1,5 +1,5 @@ *** pine/osdep/os-bsf.h.orig Tue Dec 3 16:36:18 1996 ---- pine/osdep/os-bsf.h Tue Dec 3 17:46:48 1996 +--- pine/osdep/os-bsf.h Sat Feb 19 03:26:48 2000 *************** *** 0 **** --- 1,406 ---- @@ -157,8 +157,8 @@ + + + /*----- System-wide config file ----------------------------------------*/ -+ #define SYSTEM_PINERC "/usr/local/etc/pine.conf" -+ #define SYSTEM_PINERC_FIXED "/usr/local/etc/pine.conf.fixed" ++ #define SYSTEM_PINERC "%%PREFIX%%/etc/pine.conf" ++ #define SYSTEM_PINERC_FIXED "%%PREFIX%%/etc/pine.conf.fixed" + + + @@ -336,7 +336,7 @@ + /*---------------------------------------------------------------------- + If no nntp-servers are defined, this program will be used to post news. + ----*/ -+ #define SENDNEWS "/usr/local/news/lib/inews -h" /* news posting cmd */ ++ #define SENDNEWS "%%LOCALBASE%%/news/lib/inews -h" /* news posting cmd */ + + + /*--------- Program employed by users to change their password ---------*/ diff -urN /usr/ports/mail/pine3/patches/patch-af mail/pine3/patches/patch-af --- /usr/ports/mail/pine3/patches/patch-af Mon Jan 13 02:35:02 1997 +++ mail/pine3/patches/patch-af Sat Feb 19 03:29:31 2000 @@ -1,5 +1,5 @@ *** imap/ANSI/c-client/Makefile.orig Sat Jun 22 01:25:45 1996 ---- imap/ANSI/c-client/Makefile Sun Jan 12 19:41:38 1997 +--- imap/ANSI/c-client/Makefile Sat Feb 19 02:08:01 1997 *************** *** 36,43 **** BINARIES=mail.o bezerk.o mtx.o tenex2.o mbox.o mh.o mmdf.o imap2.o pop3.o \ @@ -29,7 +29,7 @@ + bsf: # FreeBSD + $(MAKE) $(ARCHIVE) OS=bsi EXTRADRIVERS="$(EXTRADRIVERS)" \ + STDPROTO=bezerkproto MAILSPOOL=/var/mail \ -+ ACTIVEFILE=/usr/local/news/lib/active NEWSSPOOL=/var/news \ ++ ACTIVEFILE=${PREFIX}/news/lib/active NEWSSPOOL=/var/news \ + RSHPATH=/usr/bin/rsh CFLAGS="${CFLAGS} -DNFSKLUDGE $(EXTRACFLAGS)" \ + LDFLAGS="-lcrypt" diff -urN /usr/ports/mail/pine3/patches/patch-al mail/pine3/patches/patch-al --- /usr/ports/mail/pine3/patches/patch-al Mon Jan 13 02:35:05 1997 +++ mail/pine3/patches/patch-al Sat Feb 19 03:49:27 2000 @@ -1,5 +1,5 @@ -*** build.orig Tue May 14 23:22:47 1996 ---- build Sun Jan 12 20:18:50 1997 +*** build.orig Wed May 15 04:22:47 1996 +--- build Sat Feb 19 03:40:30 2000 *************** *** 167,180 **** cd $PHOME/bin @@ -16,20 +16,7 @@ echo "Done" ;; ---- 167,179 ---- - cd $PHOME/bin - rm -f pine mtest imapd pico pilot - if [ -s ../pine/pine ] ; then ln ../pine/pine pine ; fi - if [ -s ../pico/pico ] ; then ln ../pico/pico pico ; fi - if [ -s ../pico/pilot ] ; then ln ../pico/pilot pilot ; fi -+ if [ -s ../pico/libpico.so.1.3 ] ; -+ then ln ../pico/libpico.so.1.3 libpico.so.1.3 ; fi - cd $PHOME - echo '' - echo "Links to executables are in bin directory:" - echo "Done" - ;; - +--- 167,177 ---- *************** *** 185,194 **** make clean @@ -42,7 +29,7 @@ echo "Done" cd $PHOME ;; ---- 184,193 ---- +--- 182,191 ---- make clean echo "Cleaning Pine" cd $PHOME/pine diff -urN /usr/ports/mail/pine3/scripts/configure mail/pine3/scripts/configure --- /usr/ports/mail/pine3/scripts/configure Tue Aug 31 07:15:25 1999 +++ mail/pine3/scripts/configure Thu Jan 1 09:00:00 1970 @@ -1,7 +0,0 @@ -#!/bin/sh -# -# $FreeBSD: ports/mail/pine3/scripts/configure,v 1.4 1999/08/30 12:06:25 peter Exp $ -# - -rm -f ${WRKSRC}/makefile -cp ${FILESDIR}/Makefile ${WRKSRC}/Makefile >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200002211409.GAA19773>