diff options
-rw-r--r-- | archivers/hpack.non-usa.only/Makefile | 5 | ||||
-rw-r--r-- | archivers/hpack.non-usa.only/files/patch-ab | 29 | ||||
-rw-r--r-- | archivers/hpack.non-usa.only/files/patch-ac | 32 | ||||
-rw-r--r-- | archivers/hpack.non-usa.only/files/patch-ad | 75 | ||||
-rw-r--r-- | archivers/hpack.non-usa.only/files/patch-ae | 31 | ||||
-rw-r--r-- | archivers/hpack.non-usa.only/files/patch-af | 38 | ||||
-rw-r--r-- | archivers/hpack.non-usa.only/files/patch-ag | 11 | ||||
-rw-r--r-- | archivers/hpack.non-usa.only/files/patch-ah | 17 | ||||
-rw-r--r-- | archivers/hpack.non-usa.only/files/patch-ai | 38 | ||||
-rw-r--r-- | archivers/hpack.non-usa.only/files/patch-aj | 41 | ||||
-rw-r--r-- | archivers/hpack.non-usa.only/files/patch-ak | 23 | ||||
-rw-r--r-- | archivers/hpack.non-usa.only/files/patch-al | 25 |
12 files changed, 365 insertions, 0 deletions
diff --git a/archivers/hpack.non-usa.only/Makefile b/archivers/hpack.non-usa.only/Makefile index 492f62a1212c..cdf4d099e1a0 100644 --- a/archivers/hpack.non-usa.only/Makefile +++ b/archivers/hpack.non-usa.only/Makefile @@ -20,4 +20,9 @@ ALL_TARGET= freebsd INSTALL_TARGET= freebsd.install MAN1= hpack.1 +post-patch: +.for f in language/language.c cli.c + @${PERL} -pi -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/${f} +.endfor + .include <bsd.port.mk> diff --git a/archivers/hpack.non-usa.only/files/patch-ab b/archivers/hpack.non-usa.only/files/patch-ab new file mode 100644 index 000000000000..689ba37f6b94 --- /dev/null +++ b/archivers/hpack.non-usa.only/files/patch-ab @@ -0,0 +1,29 @@ +--- crypt/keymgmt.c.orig Tue Aug 17 16:56:14 1993 ++++ crypt/keymgmt.c Tue Dec 28 20:01:38 1999 +@@ -495,11 +495,24 @@ + FD keyFileFD, savedInFD = getInputFD(); + BOOLEAN matched, firstTime = TRUE; + char *matchID, firstChar; +- char *keyFilePath; ++ char *keyFilePath, *s; + int userIDlength, i; ++#ifdef __UNIX__ ++ char *h, buf[ MAX_PATH ]; ++#endif + ++ if ((s = getenv( PGPPATH )) == NULL) ++#ifdef __UNIX__ ++ if ((h = getenv( "HOME" )) != NULL) { ++ strcpy(buf, h); ++ strcat(buf, "/.pgp"); ++ s = buf; ++ } ++#else ++ ; ++#endif + /* Use the keyID to get the public key from a key file */ +- keyFilePath = getFirstKeyPath( getenv( PGPPATH ), keyFileName ); ++ keyFilePath = getFirstKeyPath( s, keyFileName ); + while( keyFilePath != NULL ) + { + /* Open key file */ diff --git a/archivers/hpack.non-usa.only/files/patch-ac b/archivers/hpack.non-usa.only/files/patch-ac new file mode 100644 index 000000000000..ea8ec3eadb4b --- /dev/null +++ b/archivers/hpack.non-usa.only/files/patch-ac @@ -0,0 +1,32 @@ +--- keycvt/makefile.orig Mon May 17 16:43:30 1993 ++++ keycvt/makefile Tue Dec 28 20:01:38 1999 +@@ -60,6 +60,7 @@ + LS = ls -l # Directory command + ECHO = echo # Echo to screen command + MAKE = make # The make command ++PREFIX ?= /usr/local + + #**************************************************************************** + #* * +@@ -71,7 +72,7 @@ + @$(ECHO) + @$(ECHO) "To create KEYCVT you have to enter the Unix system type you want to build" + @$(ECHO) "KEYCVT for. Possible options are: aix (RS6000), aix370, aix386, convex," +- @$(ECHO) "irix, hpux, isc, linux, mint, next, qnx, sun, svr4, ultrix, ultrix_old" ++ @$(ECHO) "freebsd, irix, hpux, isc, linux, mint, next, qnx, sun, svr4, ultrix, ultrix_old" + @$(ECHO) "(Ultrix 3.x or earlier), and uts4. If none of the above fit, try" + @$(ECHO) "'make generic', and send a copy of any changes necessary to the author," + @$(ECHO) "pgut1@cs.aukuni.ac.nz" +@@ -128,6 +129,12 @@ + + convex: + @$(MAKE) keycvt CC="cc" ++ ++freebsd: ++ @$(MAKE) $(PROJ) CMDC="-O2" ++ ++freebsd.install: ++ $(INSTALL) $(COPY) $(STRIP) -o $(BINOWN) -g $(BINGRP) $(PROJ) $(PREFIX)/bin + + # Generic: Generic BSD-ish system running gcc. Can't continue, we really + # need user intervention here. diff --git a/archivers/hpack.non-usa.only/files/patch-ad b/archivers/hpack.non-usa.only/files/patch-ad new file mode 100644 index 000000000000..2ef0a9d78471 --- /dev/null +++ b/archivers/hpack.non-usa.only/files/patch-ad @@ -0,0 +1,75 @@ +--- keycvt/keycvt.c.orig Fri Aug 13 15:06:28 1993 ++++ keycvt/keycvt.c Tue Dec 28 20:01:38 1999 +@@ -582,11 +582,21 @@ + + static void getPassword( void ) + { ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++ int len; ++#endif + puts( "Please enter password for this private key." ); + puts( "Warning: Password will be echoed to screen!" ); + printf( "Password: " ); + fflush( stdout ); ++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) + gets( password ); ++#else /* gets depricated in FreeBSD */ ++ fgets( password, sizeof(password), stdin); ++ len = strlen(password); ++ if (password[len - 1] == '\n') ++ password[len - 1] = '\0'; ++#endif + } + + void initCrypt( void ) +@@ -1020,27 +1030,46 @@ + + /* Try and find the PGP seed file */ + if( ( pgpPath = getenv( "PGPPATH" ) ) == NULL ) ++#ifdef __UNIX__ ++ if( ( pgpPath = getenv( "HOME" ) ) != NULL ) { ++ strcpy( tempFileName, pgpPath ); ++ strcat( tempFileName, "/.pgp"); ++ pgpPath = tempFileName; ++ } ++ else ++#endif + pgpPath = ""; + pathLen = strlen( pgpPath ); ++#ifdef __UNIX__ ++ if (pgpPath != tempFileName) ++#endif + strcpy( tempFileName, pgpPath ); + #if defined( __ARC__ ) +- if( pathLen && tempFileName[ pathLen - 1 ] != '.' ) ++ if( pathLen && tempFileName[ pathLen - 1 ] != '.' ) { + /* Add directory seperator if necessary */ + tempFileName[ pathLen++ ] = '.'; ++ tempFileName[ pathLen ] = '\0'; ++ } + strcat( tempFileName, "randseed" ); + #elif defined( __AMIGA__ ) +- if( pathLen && ( ch = tempFileName[ pathLen - 1 ] ) != ':' && ch != '/' ) ++ if( pathLen && ( ch = tempFileName[ pathLen - 1 ] ) != ':' && ch != '/' ) { + /* Add directory seperator if necessary */ + tempFileName[ pathLen++ ] = '/'; ++ tempFileName[ pathLen ] = '\0'; ++ } + strcat( tempFileName, "randseed.bin" ); + #else +- if( pathLen && ( ch = tempFileName[ pathLen - 1 ] ) != '\\' && ch != '/' ) ++ if( pathLen && ( ch = tempFileName[ pathLen - 1 ] ) != '\\' && ch != '/' ) { + /* Add directory seperator if necessary */ + tempFileName[ pathLen++ ] = '/'; ++ tempFileName[ pathLen ] = '\0'; ++ } + strcat( tempFileName, "randseed.bin" ); + #endif /* __ARC__ */ +- if( ( inFilePtr = fopen( tempFileName, "rb" ) ) == NULL ) ++ if( ( inFilePtr = fopen( tempFileName, "rb" ) ) == NULL ) { ++ perror( tempFileName ); + puts( "Cannot find PGP seed file, HPACK seed file not created" ); ++ } + else + { + /* See if the output file exists */ diff --git a/archivers/hpack.non-usa.only/files/patch-ae b/archivers/hpack.non-usa.only/files/patch-ae new file mode 100644 index 000000000000..c4d33be961a9 --- /dev/null +++ b/archivers/hpack.non-usa.only/files/patch-ae @@ -0,0 +1,31 @@ +--- language/language.c.orig Wed Sep 22 21:23:20 1993 ++++ language/language.c Tue Dec 28 20:01:38 1999 +@@ -188,7 +188,7 @@ + /* Process user response */ + response = hgetch(); + response = toupper( response ); /* Damn macros */ +- blankLine( screenWidth ); ++ blankLine( screenWidth - 1 ); + if( response == RESPONSE_QUIT ) + return; + lineNo -= ( response == ' ' ) ? screenHeight : 1; +@@ -268,6 +268,9 @@ + if( ( inFD = hopen( fileNamePtr, O_RDONLY | S_DENYWR | A_RANDSEQ ) ) == ERROR ) + return( ERROR ); + #elif defined( __UNIX__ ) ++ fileNamePtr = getFirstKeyPath( "%%PREFIX%%/lib/hpack", DATA_FILENAME ); ++ if( ( inFD = hopen( fileNamePtr, O_RDONLY | S_DENYWR | A_RANDSEQ ) ) != ERROR ) ++ goto found; + /* Build path to language file and try and process it */ + fileNamePtr = getFirstKeyPath( getenv( "PATH" ), DATA_FILENAME ); + while( fileNamePtr != NULL ) +@@ -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__) ++found: ++#endif + setInputFD( inFD ); + resetFastIn(); + diff --git a/archivers/hpack.non-usa.only/files/patch-af b/archivers/hpack.non-usa.only/files/patch-af new file mode 100644 index 000000000000..0e67e42e5cb6 --- /dev/null +++ b/archivers/hpack.non-usa.only/files/patch-af @@ -0,0 +1,38 @@ +--- system/unix.c.orig Fri Aug 27 12:20:56 1993 ++++ system/unix.c Tue Dec 28 20:01:38 1999 +@@ -123,7 +123,7 @@ + + #if defined( BSD386 ) || defined( CONVEX ) || defined( HPUX ) || \ + defined( IRIX ) || defined( LINUX ) || defined( POSIX ) || \ +- defined( SVR4 ) || defined( UTS4 ) ++ defined( SVR4 ) || defined( UTS4 ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) + + #include <termios.h> + +@@ -144,7 +144,7 @@ + tcgetattr( ttyFD, &ttyInfo ); + #if defined( BSD386 ) || defined( CONVEX ) || defined( HPUX ) || \ + defined( IRIX ) || defined( LINUX ) || defined( POSIX ) || \ +- defined( UTS4 ) ++ defined( UTS4 ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) + ttyInfo.c_lflag &= ~ECHO; + ttyInfo.c_lflag &= ~ICANON; + #else +@@ -183,7 +183,7 @@ + tcgetattr( ttyFD, &ttyInfo ); + #if defined( BSD386 ) || defined( CONVEX ) || defined( HPUX ) || \ + defined( IRIX ) || defined( LINUX ) || defined( POSIX ) || \ +- defined( UTS4 ) ++ defined( UTS4 ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) + ttyInfo.c_lflag |= ECHO; + ttyInfo.c_lflag |= ICANON; + #else +@@ -728,7 +728,7 @@ + defined( HPUX ) || defined( IRIX ) || defined( LINUX ) || \ + defined( NEXT ) || defined( OSF1 ) || defined( SUNOS ) || \ + defined( SVR4 ) || defined( ULTRIX ) || defined( ULTRIX_OLD ) || \ +- defined( UTS4 ) ++ defined( UTS4 ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) + + int htruncate( const FD theFD ) + { diff --git a/archivers/hpack.non-usa.only/files/patch-ag b/archivers/hpack.non-usa.only/files/patch-ag new file mode 100644 index 000000000000..c993b1058dba --- /dev/null +++ b/archivers/hpack.non-usa.only/files/patch-ag @@ -0,0 +1,11 @@ +--- defs.h.orig Mon May 31 10:17:00 1993 ++++ defs.h Tue Dec 28 20:01:38 1999 +@@ -43,7 +43,7 @@ + + /* 'inline' patch for compilers which can't handle this */ + +-#if !( defined( __CPLUSPLUS__ ) || defined( __cplusplus ) ) || defined( __TSC__ ) ++#if !( defined( __GNUC__ ) || defined( __CPLUSPLUS__ ) || defined( __cplusplus ) ) || defined( __TSC__ ) + #define inline + #endif /* !( __CPLUSPLUS__ || __cplusplus ) */ + diff --git a/archivers/hpack.non-usa.only/files/patch-ah b/archivers/hpack.non-usa.only/files/patch-ah new file mode 100644 index 000000000000..cc178b89f5d3 --- /dev/null +++ b/archivers/hpack.non-usa.only/files/patch-ah @@ -0,0 +1,17 @@ +--- hpacklib.h.orig Thu Aug 5 04:10:40 1993 ++++ hpacklib.h Tue Dec 28 20:01:38 1999 +@@ -26,12 +26,12 @@ + + #include <stdio.h> /* Prototypes for generic functions */ + #if defined( __UNIX__ ) && !( defined( BSD386 ) || defined( CONVEX ) || \ +- defined( NEXT ) || defined( ULTRIX_OLD ) ) ++ defined( NEXT ) || defined( ULTRIX_OLD ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ )) + #include <malloc.h> /* Needed for mem.functions on some systems */ + #endif /* __UNIX__ && !( BSD386 || CONVEX || NEXT || ULTRIX_OLD ) */ + #if defined( AIX386 ) || ( defined( __AMIGA__ ) && !defined( LATTICE ) ) || \ + defined( __ARC__ ) || defined( __ATARI__ ) || defined( __MSDOS16__ ) || \ +- defined( __MSDOS32__ ) ++ defined( __MSDOS32__ ) || defined( __FreeBSD__ ) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) + #include <stdlib.h> /* Needed for mem.functions */ + #endif /* AIX386 || ( __AMIGA__ && !LATTICE ) || __ARC__ || __ATARI__ || __MSDOS16__ || __MSDOS32__ */ + #if defined( __ATARI__ ) || ( defined( __OS2__ ) && !defined( __GCC__ ) ) diff --git a/archivers/hpack.non-usa.only/files/patch-ai b/archivers/hpack.non-usa.only/files/patch-ai new file mode 100644 index 000000000000..5988653572d8 --- /dev/null +++ b/archivers/hpack.non-usa.only/files/patch-ai @@ -0,0 +1,38 @@ +--- system.h.orig Fri Aug 27 12:16:40 1993 ++++ system.h Tue Dec 28 20:01:38 1999 +@@ -788,7 +788,10 @@ + #elif defined( CONVEX ) + #define MAX_PATH ( _POSIX_PATH_MAX + 1 ) + #define MAX_FILENAME ( 254 + 1 ) +-#elif defined( POSIX ) ++#elif defined( POSIX ) || defined(__FreeBSD__) || defined( __OpenBSD__ ) || defined( __NetBSD__ ) ++ #if defined( __FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++ #include <limits.h> ++ #endif + #define MAX_PATH ( _POSIX_PATH_MAX + 1 ) + #define MAX_FILENAME ( NAME_MAX + 1 ) + #elif defined( SVR4 ) +@@ -875,7 +878,8 @@ + #if defined( AIX ) || defined( AIX386 ) || defined( AIX370 ) || \ + defined( BSD386 ) || defined( GENERIC ) || defined( HPUX ) || \ + defined( IRIX ) || defined( NEXT ) || defined( OSF1 ) || \ +- defined( ULTRIX ) || defined( ULTRIX_OLD ) || defined( UTS4 ) ++ defined( ULTRIX ) || defined( ULTRIX_OLD ) || defined( UTS4 ) || \ ++ defined( __FreeBSD__ ) || defined(__OpenBSD__) || defined(__NetBSD__) + #define SPACE_OK TRUE + #else + #define SPACE_OK FALSE +@@ -948,6 +952,13 @@ + #elif defined( UTS4 ) /* Amdahl UTS4 */ + #define NEED_STRLWR + #define NEED_STRICMP ++#elif defined( __FreeBSD__ ) || defined(__OpenBSD__) || defined(__NetBSD__) /* Amdahl UTS4 */ ++ #include <unistd.h> ++ #define tell(fd) lseek((fd),(off_t)0,SEEK_CUR) ++ #define NEED_STRLWR ++ #define stricmp strcasecmp ++ #define strnicmp strncasecmp ++ #define USE_TERMCAP + #elif defined( ESIX ) /* Esix */ + #define NEED_HELP + #endif /* Various mutation-specific defines */ diff --git a/archivers/hpack.non-usa.only/files/patch-aj b/archivers/hpack.non-usa.only/files/patch-aj new file mode 100644 index 000000000000..6e632e5cb315 --- /dev/null +++ b/archivers/hpack.non-usa.only/files/patch-aj @@ -0,0 +1,41 @@ +--- makefile.orig Tue Aug 10 10:47:06 1993 ++++ makefile Tue Dec 28 20:01:38 1999 +@@ -55,6 +55,7 @@ + ECHO = echo # Echo to screen command + MAKE = make # The make command + MV = mv # Rename command ++PREFIX ?= /usr/local + + #**************************************************************************** + #* * +@@ -68,7 +69,7 @@ + @$(ECHO) + @$(ECHO) "To create HPACK, you have to enter the Unix system type you want to build it" + @$(ECHO) "for. Possible options are: aix (RS6000), aix370, aix386, bsd386, convex," +- @$(ECHO) "irix, hpux, hpux-gcc, isc, linux, mint, next, osf1, qnx, sun, svr4, ultrix," ++ @$(ECHO) "freebsd, irix, hpux, hpux-gcc, isc, linux, mint, next, osf1, qnx, sun, svr4, ultrix," + @$(ECHO) "ultrix_old (Ultrix 3.x or earlier), and uts4. If none of the above fit," + @$(ECHO) "try 'make generic', and send a copy of any changes necessary to the author," + @$(ECHO) "pgut1@cs.aukuni.ac.nz" +@@ -317,6 +318,21 @@ + + convex: + @$(MAKE) hpack CMDC="-DCONVEX" CC="cc" ++ ++freebsd: ++ @$(MAKE) $(PROJ) CMDC="-O2" LFLAGS="-o $(PROJ) -ltermcap" ++ cd keycvt; $(MAKE) freebsd ++ ++freebsd.install: ++ -@mkdir -p ${PREFIX}/bin ++ -@mkdir -p ${PREFIX}/etc ++ -@mkdir -p ${PREFIX}/lib/hpack ++ -@mkdir -p ${PREFIX}/man/man1 ++ $(INSTALL) $(COPY) $(STRIP) -o $(BINOWN) -g $(BINGRP) -m $(BINMODE) $(PROJ) $(PREFIX)/bin ++ $(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m 444 language.dat $(PREFIX)/lib/hpack ++ $(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m 444 docs/$(PROJ).1 $(PREFIX)/man/man1 ++ -[ ! -f $(PREFIX)/etc/hpack.cfg ] && $(INSTALL) $(COPY) -o $(BINOWN) -g $(BINGRP) -m 644 docs/hpack.cfg $(PREFIX)/etc ++ cd keycvt; $(MAKE) freebsd.install + + # Generic: Generic BSD-ish system running gcc + diff --git a/archivers/hpack.non-usa.only/files/patch-ak b/archivers/hpack.non-usa.only/files/patch-ak new file mode 100644 index 000000000000..92f804937070 --- /dev/null +++ b/archivers/hpack.non-usa.only/files/patch-ak @@ -0,0 +1,23 @@ +--- cli.c.orig Sat Sep 4 22:23:48 1993 ++++ cli.c Tue Dec 28 20:01:38 1999 +@@ -724,12 +724,18 @@ + + void doConfigFile( void ) + { +- char *configFileName; ++ char *configFileName, *s; + FD configFileFD; + WORD oldFlags = flags; + ++ if (( s = getenv( HPACKPATH )) == NULL) ++#ifdef __UNIX__ ++ s = "%%PREFIX%%/etc:%%PREFIX%%/lib/hpack"; ++#else ++ ; ++#endif + /* Build path to config file and try and process it */ +- configFileName = getFirstKeyPath( getenv( HPACKPATH ), CONFIGFILENAME ); ++ configFileName = getFirstKeyPath( s, CONFIGFILENAME ); + while( configFileName != NULL ) + { + /* Try and read the seed from the seedfile */ diff --git a/archivers/hpack.non-usa.only/files/patch-al b/archivers/hpack.non-usa.only/files/patch-al new file mode 100644 index 000000000000..31c668f04727 --- /dev/null +++ b/archivers/hpack.non-usa.only/files/patch-al @@ -0,0 +1,25 @@ +--- archive.c.orig Tue Jun 29 05:27:52 1993 ++++ archive.c Tue Dec 28 20:01:38 1999 +@@ -326,12 +326,22 @@ + + void getFileName( char *fileName ) + { ++#if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) ++ int len; ++#endif + hprintf( MESG_s_ALREADY_EXISTS_ENTER_NEW_NAME, fileName ); + + /* Nasty input routine - should check for illegal chars and suchlike. + Will also overflow if anyone enters more than 16K chars */ + hflush( stdout ); ++#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__) + hgets( ( char * ) mrglBuffer ); ++#else /* gets depricated in FreeBSD */ ++ fgets( mrglBuffer, MAX_PATH, stdin ); ++ len = strlen(mrglBuffer); ++ if (mrglBuffer[len - 1] == '\n') ++ mrglBuffer[len - 1] = '\0'; ++#endif + mrglBuffer[ MAX_PATH - 1 ] = '\0'; + strcpy( fileName, ( char * ) mrglBuffer ); + |