From owner-freebsd-ports Thu Apr 16 23:40:11 1998 Return-Path: Received: (from majordom@localhost) by hub.freebsd.org (8.8.8/8.8.8) id XAA11861 for freebsd-ports-outgoing; Thu, 16 Apr 1998 23:40:11 -0700 (PDT) (envelope-from owner-freebsd-ports@FreeBSD.ORG) Received: (from gnats@localhost) by hub.freebsd.org (8.8.8/8.8.8) id XAA11789; Thu, 16 Apr 1998 23:40:06 -0700 (PDT) (envelope-from gnats) Date: Thu, 16 Apr 1998 23:40:06 -0700 (PDT) Message-Id: <199804170640.XAA11789@hub.freebsd.org> To: freebsd-ports Cc: From: Matthew Hunt Subject: ports/5605 Reply-To: Matthew Hunt Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk X-Loop: FreeBSD.org The following reply was made to PR ports/5605; it has been noted by GNATS. From: Matthew Hunt To: freebsd-gnats-submit@freebsd.org Cc: Subject: ports/5605 Date: Fri, 17 Apr 1998 02:37:04 -0400 Tim Vanderhoek suggested that the ports committers could use the input of reviewers. A bout of insomnia has prodded me to review. The BitchX port by griffin@blackhole.iceworld.org looks like the work of someone new to the game. The enclosed patch makes it pass portlint and respect PREFIX. diff -urN BitchX.orig/Makefile BitchX/Makefile --- BitchX.orig/Makefile Tue Jan 27 00:07:51 1998 +++ BitchX/Makefile Fri Apr 17 02:35:06 1998 @@ -3,12 +3,11 @@ # Date created: 26 Jan 1998 # Whom: griffin # -# $Id: Makefile,v 1.15 1998/01/25 20:40:00 torstenb Exp $ +# $Id$ # -PKGNAME= BitchX-74p2 DISTNAME= ircii-pana-74p2 - +PKGNAME= bitchx-74p2 CATEGORIES= net MASTER_SITES= ftp://ftp.bitchx.com/pub/BitchX/source/ @@ -17,13 +16,15 @@ GNU_CONFIGURE= yes WRKSRC= ${WRKDIR}/BitchX -NOMAN= NO MAN PAGES INCLUDED +post-patch: + ${SED} -e s,__PREFIX__,$(PREFIX), $(WRKSRC)/include/config.h > $(WRKSRC)/include/config.h.new + ${MV} $(WRKSRC)/include/config.h.new $(WRKSRC)/include/config.h do-install: ${MKDIR} ${PREFIX}/lib/BitchX ${INSTALL_PROGRAM} ${WRKSRC}/source/BitchX ${PREFIX}/bin ${INSTALL_PROGRAM} ${WRKSRC}/source/wserv ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/BitchX.help ${PREFIX}/lib/BitchX + ${INSTALL_DATA} ${WRKSRC}/BitchX.help ${PREFIX}/lib/BitchX .include diff -urN BitchX.orig/patches/patch-aa BitchX/patches/patch-aa --- BitchX.orig/patches/patch-aa Tue Jan 27 00:01:56 1998 +++ BitchX/patches/patch-aa Fri Apr 17 02:18:33 1998 @@ -1,11 +1,20 @@ ---- include/config.h.orig Fri Dec 26 19:24:15 1997 -+++ include/config.h Mon Jan 26 22:18:12 1998 +--- include/config.h.orig Fri Dec 26 20:24:15 1997 ++++ include/config.h Fri Apr 17 02:15:40 1998 +@@ -249,7 +249,7 @@ + */ + + #undef TRANSLATE +-#define TRANSLATION_PATH "/usr/local/lib/irc/translation" ++#define TRANSLATION_PATH "__PREFIX__/lib/irc/translation" + + /* + * Below are the IRCII variable defaults. For boolean variables, use 1 for @@ -432,7 +432,7 @@ #define DEFAULT_SCRIPT_HELP_FILE DEFAULT_CTOOLZ_DIR"/BitchX.hlp" #define DEFAULT_BITCHX_HELP_FILE DEFAULT_CTOOLZ_DIR"/BitchX.hlp" #else -#define DEFAULT_CTOOLZ_DIR "~/.BitchX" -+#define DEFAULT_CTOOLZ_DIR "/usr/local/lib/BitchX" ++#define DEFAULT_CTOOLZ_DIR "__PREFIX__/lib/BitchX" #define DEFAULT_SCRIPT_HELP_FILE DEFAULT_CTOOLZ_DIR"/BitchX.help" #define DEFAULT_BITCHX_HELP_FILE DEFAULT_CTOOLZ_DIR"/BitchX.help" #endif diff -urN BitchX.orig/pkg/PLIST BitchX/pkg/PLIST --- BitchX.orig/pkg/PLIST Tue Jan 27 00:07:31 1998 +++ BitchX/pkg/PLIST Fri Apr 17 02:34:26 1998 @@ -1,4 +1,4 @@ bin/BitchX bin/wserv lib/BitchX/BitchX.help - +@dirrm lib/BitchX -- Matthew Hunt * Stay close to the Vorlon. http://mph124.rh.psu.edu/~mph/pgp.key for PGP public key 0x67203349. To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message