From 307c1dd6794a36010c4d5606184b95783e3a135b Mon Sep 17 00:00:00 2001 From: yyamano Date: Sat, 9 Mar 2002 03:27:51 +0000 Subject: Make it build on Darwin. * Use curses. Darwin doesn't have termcap. * Add __APPLE__ to system.h to define necessary macros. * Replace __{Free,Open,Net}BSD__ with __UNIX__ in language/language.c. It worked on *BSD, but not correct logically. XXX -no-cpp-precomp issue isn't fixed yet. I think we should fix it in XXX generic way. --- archivers/hpack/Makefile | 10 ++++++++-- archivers/hpack/distinfo | 7 +++---- archivers/hpack/patches/patch-ad | 14 +++++++------- archivers/hpack/patches/patch-ae | 10 +++++----- 4 files changed, 23 insertions(+), 18 deletions(-) (limited to 'archivers') diff --git a/archivers/hpack/Makefile b/archivers/hpack/Makefile index 7d1c65ec726..5adf10a765b 100644 --- a/archivers/hpack/Makefile +++ b/archivers/hpack/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2001/09/09 20:36:10 agc Exp $ +# $NetBSD: Makefile,v 1.10 2002/03/09 03:27:51 yyamano Exp $ DISTNAME= hpack79${USE_RSAREF2:S/YES/u/:C/[^u]*//g}src PKGNAME= hpack-0.79 @@ -15,10 +15,16 @@ USE_RSAREF2= NO MAKEFILE= makefile ALL_TARGET= hpack + +.include "../../mk/bsd.prefs.mk" +.if ${OPSYS} == "Darwin" +MAKE_FLAGS= CFLAGS="-c -DBSD386 -D__UNIX__ -DPREFIX=\\\"${PREFIX}\\\" -I. ${CFLAGS} -Icrypt" \ + CMDL="${LDFLAGS} -lcurses" +.else MAKE_FLAGS= CFLAGS="-c -DBSD386 -D__UNIX__ -DPREFIX=\\\"${PREFIX}\\\" -I. ${CFLAGS} -Icrypt" \ CMDL="${LDFLAGS} -ltermcap" +.endif -.include "../../mk/bsd.prefs.mk" .if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES DEPENDS+= rsaref-2.0p3:../../security/rsaref LDFLAGS+= -L${LOCALBASE}/lib -lrsaref diff --git a/archivers/hpack/distinfo b/archivers/hpack/distinfo index a7bd081175b..4400573b338 100644 --- a/archivers/hpack/distinfo +++ b/archivers/hpack/distinfo @@ -1,13 +1,12 @@ -$NetBSD: distinfo,v 1.4 2001/09/14 15:03:10 wiz Exp $ +$NetBSD: distinfo,v 1.5 2002/03/09 03:27:51 yyamano Exp $ SHA1 (hpack79src.tar.gz) = 5fb85346724e5d972ae809311d6571a9034ee5d5 Size (hpack79src.tar.gz) = 545648 bytes SHA1 (patch-aa) = d39d13ee6f99eb71ac3129c24942bf02d2527e1f SHA1 (patch-ab) = 48fa56d17725d2b3de87955f09d82624d14e2f56 SHA1 (patch-ac) = cf399b72c990fc2a6583ab0abbb252075c2ceceb -SHA1 (patch-ad) = 9d51a5e62c89953ba97bcb7642a4a23f544690b4 -SHA1 (patch-ae) = 2677c4aa0899ecfbc1a274461bcb153a58ef2b51 +SHA1 (patch-ad) = c07f5d0ec7e2dd18d518d5eafe64ff0ef9e81a91 +SHA1 (patch-ae) = 2dc6e6be6d70bf46315707eab7c00f49b80332db SHA1 (patch-af) = 7809e665e108152689036c150afe3865a3848d31 SHA1 (patch-ag) = fd04724f6ab2bf1fa4f206d18c7235574a357c36 SHA1 (patch-ah) = 30e7a7e11b10ccb3510199c5e6b86eb77a8ec98d -SHA1 (patch-rsaref) = 55be181d088b5f3af9321981964565104f036a3a diff --git a/archivers/hpack/patches/patch-ad b/archivers/hpack/patches/patch-ad index 1c726ff8036..5a05914ab59 100644 --- a/archivers/hpack/patches/patch-ad +++ b/archivers/hpack/patches/patch-ad @@ -1,8 +1,8 @@ -$NetBSD: patch-ad,v 1.1.1.1 1999/05/23 22:41:21 tv Exp $ +$NetBSD: patch-ad,v 1.2 2002/03/09 03:27:51 yyamano Exp $ ---- language/language.c.orig Fri Aug 27 05:52:10 1993 -+++ language/language.c Sun May 23 17:26:17 1999 -@@ -187,7 +187,7 @@ +--- language/language.c.orig Thu Sep 23 11:23:20 1993 ++++ language/language.c +@@ -188,7 +188,7 @@ /* Process user response */ response = hgetch(); response = toupper( response ); /* Damn macros */ @@ -11,7 +11,7 @@ $NetBSD: patch-ad,v 1.1.1.1 1999/05/23 22:41:21 tv Exp $ if( response == RESPONSE_QUIT ) return; lineNo -= ( response == ' ' ) ? screenHeight : 1; -@@ -267,6 +267,9 @@ +@@ -268,6 +268,9 @@ if( ( inFD = hopen( fileNamePtr, O_RDONLY | S_DENYWR | A_RANDSEQ ) ) == ERROR ) return( ERROR ); #elif defined( __UNIX__ ) @@ -21,11 +21,11 @@ $NetBSD: patch-ad,v 1.1.1.1 1999/05/23 22:41:21 tv Exp $ /* Build path to language file and try and process it */ fileNamePtr = getFirstKeyPath( getenv( "PATH" ), DATA_FILENAME ); while( fileNamePtr != NULL ) -@@ -289,6 +292,9 @@ +@@ -290,6 +293,9 @@ return( ERROR ); /* Couldn't find/open input file */ } #endif /* System-specific handling of how to find language defn.file */ -+#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++#if defined(__UNIX__) +found: +#endif setInputFD( inFD ); diff --git a/archivers/hpack/patches/patch-ae b/archivers/hpack/patches/patch-ae index 7f04188518b..cc3a050b802 100644 --- a/archivers/hpack/patches/patch-ae +++ b/archivers/hpack/patches/patch-ae @@ -1,12 +1,12 @@ -$NetBSD: patch-ae,v 1.1.1.1 1999/05/23 22:41:21 tv Exp $ +$NetBSD: patch-ae,v 1.2 2002/03/09 03:27:52 yyamano Exp $ ---- system.h.orig Fri Aug 27 13:16:40 1993 -+++ system.h Sun May 23 17:43:15 1999 +--- system.h.orig Sat Aug 28 02:16:40 1993 ++++ system.h @@ -779,6 +779,10 @@ #if defined( AIX ) || defined( AIX370 ) || defined( AIX386 ) #define MAX_PATH ( 1023 + 1 ) #define MAX_FILENAME ( 254 + 1 ) -+#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) + #include + #define MAX_PATH ( _POSIX_PATH_MAX + 1 ) + #define MAX_FILENAME ( NAME_MAX + 1 ) @@ -17,7 +17,7 @@ $NetBSD: patch-ae,v 1.1.1.1 1999/05/23 22:41:21 tv Exp $ #if defined( AIX ) || defined( AIX370 ) #define NEED_STRLWR /* AIX RS6000, AIX 370 */ #define NEED_STRICMP -+#elif defined( __FreeBSD__ ) || defined(__OpenBSD__) || defined(__NetBSD__) /* Amdahl UTS4 */ ++#elif defined( __FreeBSD__ ) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__APPLE__) /* Amdahl UTS4 */ + #include + #define tell(fd) lseek((fd),(off_t)0,SEEK_CUR) + #define NEED_STRLWR -- cgit v1.2.3