pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/textproc/helpdeco Update helpdeco to version 2.1.1. N...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ec4ab478722d
branches:  trunk
changeset: 494131:ec4ab478722d
user:      ben <ben%pkgsrc.org@localhost>
date:      Thu May 19 18:34:34 2005 +0000

description:
Update helpdeco to version 2.1.1.  Notable changes:
* moved to sourceforge
* put under GPL instead of non-commercial license, with permission from
  original author
* portability fixes

diffstat:

 textproc/helpdeco/Makefile              |   66 +----
 textproc/helpdeco/PLIST                 |    9 +-
 textproc/helpdeco/distinfo              |   14 +-
 textproc/helpdeco/files/compat.c        |  121 ---------
 textproc/helpdeco/files/compat.h        |   35 --
 textproc/helpdeco/files/helpdeco-de.txt |  237 ------------------
 textproc/helpdeco/files/helpdeco-en.txt |  222 -----------------
 textproc/helpdeco/patches/patch-aa      |  102 --------
 textproc/helpdeco/patches/patch-ab      |   34 --
 textproc/helpdeco/patches/patch-ac      |   37 --
 textproc/helpdeco/patches/patch-ad      |  401 --------------------------------
 textproc/helpdeco/patches/patch-ae      |   28 --
 textproc/helpdeco/patches/patch-af      |   19 -
 13 files changed, 22 insertions(+), 1303 deletions(-)

diffs (truncated from 1397 to 300 lines):

diff -r 94fcc35d9277 -r ec4ab478722d textproc/helpdeco/Makefile
--- a/textproc/helpdeco/Makefile        Thu May 19 17:29:30 2005 +0000
+++ b/textproc/helpdeco/Makefile        Thu May 19 18:34:34 2005 +0000
@@ -1,68 +1,28 @@
-# $NetBSD: Makefile,v 1.13 2004/09/22 17:38:30 ben Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/19 18:34:34 ben Exp $
 #
 
-DISTNAME=              helpdc21
-PKGNAME=               helpdeco-21
-PKGREVISION=           1
+DISTNAME=              helpdeco-2.1.1
 CATEGORIES=            textproc
-MASTER_SITES=          ${MASTER_SITE_SIMTEL:=win95/winhelp/}
-EXTRACT_SUFX=          .zip
+MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=helpdeco/}
 
 MAINTAINER=            ben%NetBSD.org@localhost
-HOMEPAGE=              http://www.simtel.net/pub/pd/23694.shtml
+HOMEPAGE=              http://sourceforge.net/projects/helpdeco/
 COMMENT=               Windows .hlp to .rtf converter
 
-LICENSE=               no-commercial-use
-
-WRKSRC=                        ${WRKDIR}
-
-# from ftp://ftp.simtel.net/pub/simtelnet/MIRRORS.TXT
-MASTER_SITE_SIMTEL+=   ftp://ftp.cdrom.com/pub/simtelnet/ \
-                       ftp://ftp.datacanyon.com/pub/simtelnet/ \
-                       ftp://ftp.digital.com/pub/micro/pc/simtelnet/ \
-                       ftp://ftp.usg.edu/pub/mirrors/simtelnet/ \
-                       ftp://uiarchive.cso.uiuc.edu/pub/systems/pc/simtelnet/ \
-                       ftp://ftp.bu.edu/pub/mirrors/simtelnet/ \
-                       ftp://simtel.klondyke.net/simtel/ \
-                       ftp://simtelnet.galilei.com/pub/simtelnet/ \
-                       ftp://ftp.rge.com/pub/systems/simtelnet/ \
-                       ftp://ftp.ou.edu/pub/simtelnet/ \
-                       ftp://ftp.orst.edu/pub/simtelnet/ \
-                       ftp://ftphost.simtel.net/pub/simtelnet/ \
-                       ftp://mirrors.aol.com/pub/simtelnet/ \
-                       ftp://ftp.simtel.net/pub/simtelnet/ \
-                       ftp://ftp.telusplanet.net/pub/simtelnet/ \
-                       ftp://ftp.crc.ca/pub/systems/ibmpc/simtelnet/ \
-                       ftp://ftp.direct.ca/pub/simtelnet/
-
 .include "../../mk/bsd.prefs.mk"
 
-.if ${OPSYS} == "Linux"
-CFLAGS+=               -Dstrlcpy=strncpy
+.if ${OPSYS} == "NetBSD"
+CFLAGS+=               -DHAVE_STRLCPY
 .endif
 
 MAKE_ENV+=             CFLAGS="${CFLAGS}"
+BUILD_TARGET=          build
+USE_GNU_TOOLS+=                make
 
-post-extract:
-       ${RM} -f ${WRKSRC}/*exe
-       ${CP} ${FILESDIR}/helpdeco-de.txt \
-               ${FILESDIR}/helpdeco-en.txt \
-               ${FILESDIR}/compat.h \
-               ${FILESDIR}/compat.c \
-               ${WRKSRC}
-       ${SED} "s|PREFIX|${PREFIX}|" \
-               <${FILESDIR}/Makefile \
-               >${WRKSRC}/Makefile
-
-do-install:
-       ${CP} ${WRKSRC}/splitmrb \
-               ${WRKSRC}/zapres \
-               ${WRKSRC}/helpdeco \
-               ${PREFIX}/bin
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/helpdeco
-       ${CP} ${WRKSRC}/helpdeco-de.txt \
-               ${WRKSRC}/helpdeco-en.txt \
-               ${WRKSRC}/helpfile.txt \
-               ${PREFIX}/share/doc/helpdeco
+SUBST_CLASSES+=                prefix
+SUBST_MESSAGE.prefix=  "Configuring to use PREFIX."
+SUBST_STAGE.prefix=    post-patch
+SUBST_FILES.prefix=    Makefile
+SUBST_SED.prefix=      -e "s,/usr/local,${PREFIX},g"
 
 .include "../../mk/bsd.pkg.mk"
diff -r 94fcc35d9277 -r ec4ab478722d textproc/helpdeco/PLIST
--- a/textproc/helpdeco/PLIST   Thu May 19 17:29:30 2005 +0000
+++ b/textproc/helpdeco/PLIST   Thu May 19 18:34:34 2005 +0000
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:56:47 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2005/05/19 18:34:34 ben Exp $
 bin/helpdeco
+bin/splitmrb
 bin/zapres
-bin/splitmrb
-share/doc/helpdeco/helpdeco-de.txt
-share/doc/helpdeco/helpdeco-en.txt
+share/doc/helpdeco/NEWS
+share/doc/helpdeco/README
+share/doc/helpdeco/README.de
 share/doc/helpdeco/helpfile.txt
 @dirrm share/doc/helpdeco
diff -r 94fcc35d9277 -r ec4ab478722d textproc/helpdeco/distinfo
--- a/textproc/helpdeco/distinfo        Thu May 19 17:29:30 2005 +0000
+++ b/textproc/helpdeco/distinfo        Thu May 19 18:34:34 2005 +0000
@@ -1,11 +1,5 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 14:48:42 agc Exp $
+$NetBSD: distinfo,v 1.4 2005/05/19 18:34:34 ben Exp $
 
-SHA1 (helpdc21.zip) = 1a6ca50acb3783674a225764066cd90307806552
-RMD160 (helpdc21.zip) = 1942ba29b7ba1ae1e12be0f77e5f4b03da251767
-Size (helpdc21.zip) = 222217 bytes
-SHA1 (patch-aa) = 3af5ad63eb624420bcde21fd0bfabf5ff5c911b3
-SHA1 (patch-ab) = 6d1c9da92c9eb46007280544da8a75eb695c4137
-SHA1 (patch-ac) = a40ce0a49631ea0d03f4f51f5c12d253d19cd282
-SHA1 (patch-ad) = 7416d09c01df45b8b5fa903d69e77e1b3f204e95
-SHA1 (patch-ae) = 2dd709c96ae22671cfc38892c093f544544ce810
-SHA1 (patch-af) = 4fee85e274fdba16a760782b828a0cd7478a1243
+SHA1 (helpdeco-2.1.1.tar.gz) = bd1dfe9a22b9a966b889b5c2693496e3dfe618ac
+RMD160 (helpdeco-2.1.1.tar.gz) = 2777a0d1c8925ceb08ef86e73e80dc08fe2b1a25
+Size (helpdeco-2.1.1.tar.gz) = 80041 bytes
diff -r 94fcc35d9277 -r ec4ab478722d textproc/helpdeco/files/compat.c
--- a/textproc/helpdeco/files/compat.c  Thu May 19 17:29:30 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-#include <ctype.h>
-#include <libgen.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <termios.h>
-#include "compat.h"
-
-void _splitpath(
-       const char *path,
-       char *drive,
-       char *dir,
-       char *file,
-       char *ext)
-{
-       char *p;
-       char *t;
-
-       if (path == NULL)
-               return;
-
-       if (drive != NULL)
-               strcpy(drive, "");
-
-       if (dir != NULL) {
-               p = strdup(path);
-               strncpy(dir, strdup(dirname(p)), _MAX_DIR);
-               free(p);
-       }
-
-       if (ext != NULL) {
-               p = strdup(path);
-               t = strrchr(basename(p), '.');
-               if (t == NULL) {
-                       strcpy(ext, "");
-               } else {
-                       strncpy(ext, strdup(t), _MAX_EXT);
-               }
-               free(p);
-       }
-
-       if (file != NULL) {
-               p = strdup(path);
-               t = strrchr(p, '.');
-               if (t != NULL && strchr(t, '/') == NULL) {
-                       *t = '\000';
-               }
-               strncpy(file, strdup(basename(p)), _MAX_FNAME);
-               free(p);
-       }
-
-       return;
-}
-
-void _makepath(
-       char *path,
-       const char *drive,
-       const char *dir,
-       const char *file,
-       const char *ext)
-{
-       snprintf(path, _MAX_PATH, "%s%s/%s%s",
-               drive,
-               dir,
-               file,
-               ext);
-       return;
-}
-
-int getch(void)
-{
-       int retval;
-        struct termios stored_settings;
-        struct termios new_settings;
-        
-        tcgetattr(0, &stored_settings);
-        new_settings = stored_settings;
-        new_settings.c_lflag &= (~(ECHO|ICANON));
-        new_settings.c_cc[VTIME] = 0;
-        new_settings.c_cc[VMIN] = 1;
-        tcsetattr(0, TCSANOW, &new_settings);
-
-       retval = getchar();
-
-        tcsetattr(0, TCSANOW, &stored_settings);
-
-       return retval;
-}
-
-int memcmpi(
-       const void *s1,
-       const void *s2,
-       size_t len)
-{
-       char *p1 = strdup(s1);
-       char *p2 = strdup(s2);
-       int i;
-
-       for (i = 0; i < len; i++) {
-               if (p1[i] == '\000') p1[i] = ' ';
-               if (p2[i] == '\000') p2[i] = ' ';
-       }
-       i = strncasecmp(p1, p2, len);
-       free(p1);
-       free(p2);
-       return i;
-}
-
-char *strupr(char *s)
-{
-       char *p;
-       while (*p != '\000') *p = toupper(*p++);
-       return s;
-}
-
-char *strlwr(char *s)
-{
-       char *p;
-       while (*p != '\000') *p = tolower(*p++);
-       return s;
-}
diff -r 94fcc35d9277 -r ec4ab478722d textproc/helpdeco/files/compat.h
--- a/textproc/helpdeco/files/compat.h  Thu May 19 17:29:30 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-#ifndef __compat_h__
-#define __compat_h__
-
-#include <strings.h>
-
-#define stricmp strcasecmp
-#define strcmpi strcasecmp
-#define memicmp memcmpi
-
-#ifndef _MAX_DIR
-#define _MAX_DIR 256
-#endif
-#ifndef _MAX_EXT
-#define _MAX_EXT 256
-#endif
-#ifndef _MAX_DRIVE
-#define _MAX_DRIVE 3
-#endif
-#ifndef _MAX_FNAME
-#define _MAX_FNAME 256
-#endif
-#ifndef _MAX_PATH
-#define _MAX_PATH 260
-#endif
-#ifndef MAX_PATH
-#define MAX_PATH _MAX_PATH
-#endif
-
-void _splitpath(const char *, char *, char *, char *, char *);
-void _makepath(char *, const char *, const char *, const char *, const char *);
-int getch(void);
-int memcmpi(const void *, const void *, size_t);
-char *strupr(char *);
-char *strlwr(char *);
-#endif
diff -r 94fcc35d9277 -r ec4ab478722d textproc/helpdeco/files/helpdeco-de.txt
--- a/textproc/helpdeco/files/helpdeco-de.txt   Thu May 19 17:29:30 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,237 +0,0 @@
-HELPDECO - Utility-Programm zum Zerlegen von Windows Hilfedateien
-
-HELPDECO zerlegt HLP-Hilfedateien von Windows 3.0, 3.1, 3.11 und '95 und
-viele MVB-Dateien des Multimedia-Viewers in alle f?r den jeweiligen
-Hilfecompiler HC30, HC31, HCP, HCW, HCRTF, WMVC, MMVC oder MVC zum
-erneuten Zusammenbau erforderlichen Dateien. Dazu geh?ren:
-HPJ - die Projektdatei, als Parameter f?r den Hilfecompiler anzugeben
-MVP - die Multimediaprojektdatei, als Parameter f?r den MM-Compiler
-RTF - die Textdatei mit dem gesamten Hilfetext und allen Fuánoten
-PH  - die Phrasen-Datei (wie sie auch vom Hilfecompiler erzeugt wird)
-ICO - ein eventuell der Hilfedatei zugeordnetes Icon



Home | Main Index | Thread Index | Old Index