- Unbreak parallel builds (sf.net ticket #116)

- Cleanup Makefile a bit while here
- Kill EOL space, correctly spell FidoNet

Reported by:	marino
Approved by:	miwi, bapt (portmgr, implicit)

5 files changed, 172 insertions, 4 deletions

diff --git a/news/husky-msged/Makefile b/news/husky-msged/Makefile
index 2047a01fb5e..dd35d578c10 100644
--- a/news/husky-msged/Makefile
+++ b/news/husky-msged/Makefile
@@ -1,4 +1,4 @@
-# Created by: Max Khon
+# Created by: Max Khon <fjoe@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	msged
@@ -12,14 +12,16 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	fjoe@FreeBSD.org
 COMMENT=	Msged/TE (full-featured FTN mail reader)
 
-LIB_DEPENDS=	fidoconfig.0:${PORTSDIR}/news/husky-fidoconf
+LIB_DEPENDS=	libfidoconfig.so:${PORTSDIR}/news/husky-fidoconf
 
 MAKE_ARGS=	MSGEDCFG="\\\"~/.msged\\\""
 
 INFO=		msged
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,html info,info,' -e 's,install-html install-info,install-info,' ${WRKSRC}/doc/manual/makefile.husky
+	@${REINPLACE_CMD} -e 's,html info,info,' \
+		-e 's,install-html install-info,install-info,' \
+		${WRKSRC}/doc/manual/makefile.husky
 
 .include "${.CURDIR}/../husky-base/Makefile.inc"
 .include <bsd.port.mk>
diff --git a/news/husky-msged/files/patch-Makefile b/news/husky-msged/files/patch-Makefile
index 0bbab4c16fd..dec342acd9c 100644
--- a/news/husky-msged/files/patch-Makefile
+++ b/news/husky-msged/files/patch-Makefile
@@ -32,3 +32,12 @@
  endif
  
  TARGET=	msged$(EXE)
+@@ -127,7 +127,7 @@
+ 	$(CC) $(LFLAGS) -o testcons$(EXE) testcons$(OBJ) $(LIBS) $(OSLIBS)
+ endif
+ 
+-msghelp.dat: msghelp.src
++msghelp.dat: msghelp.src $(TARGET)
+ 	.$(DIRSEP)$(TARGET) -hc msghelp.src msghelp.dat
+ 
+ clean:
diff --git a/news/husky-msged/files/patch-maps-makefile.husky b/news/husky-msged/files/patch-maps-makefile.husky
new file mode 100644
index 00000000000..49f8450781f
--- /dev/null
+++ b/news/husky-msged/files/patch-maps-makefile.husky
@@ -0,0 +1,101 @@
+--- maps/makefile.husky.orig	2006-02-18 02:58:00.000000000 +0800
++++ maps/makefile.husky	2013-08-21 17:45:36.000000000 +0800
+@@ -28,7 +28,7 @@
+ 
+ .PHONY: maps
+ 
+-default: makemaps$(EXE) maps
++default: maps
+ 
+ CDEFS=$(ADDCDEFS)
+ 
+@@ -38,65 +38,32 @@
+ makemaps$(EXE): makemaps$(OBJ)
+ 	$(CC) $(LFLAGS) -o makemaps$(EXE) makemaps$(OBJ)
+ 
+-maps: 	makemaps$(EXE) readmaps.437 readmaps.850 readmaps.866 readmaps.koi readmaps.ukr \
++maps:	readmaps.437 readmaps.850 readmaps.866 readmaps.koi readmaps.ukr \
+ 	readmaps.is1 readmaps.is5 readmaps.865
+ 
+-readmaps.437:
+-	-echo "DO NOT WORRY ABOUT WARNINGS ABOUT no matching charset!"
+-	./makemaps$(EXE) CP437 $(allmaps)
+-	-$(RM) writmaps.437
+-	-$(RM) readmaps.437
+-	$(MV) writmaps.dat writmaps.437
+-	$(MV) readmaps.dat readmaps.437
+-
+-readmaps.850:
+-	./makemaps$(EXE) CP850 $(allmaps)
+-	-$(RM) writmaps.850
+-	-$(RM) readmaps.850
+-	$(MV) writmaps.dat writmaps.850
+-	$(MV) readmaps.dat readmaps.850
+-
+-readmaps.865:
+-	./makemaps$(EXE) CP865 $(allmaps)
+-	-$(RM) writmaps.865
+-	-$(RM) readmaps.865
+-	$(MV) writmaps.dat writmaps.865
+-	$(MV) readmaps.dat readmaps.865
+-
+-readmaps.866:
+-	./makemaps$(EXE) CP866 $(allmaps)
+-	-$(RM) writmaps.866
+-	-$(RM) readmaps.866
+-	$(MV) writmaps.dat writmaps.866
+-	$(MV) readmaps.dat readmaps.866
+-
+-readmaps.koi:
+-	./makemaps$(EXE) KOI8-R $(allmaps)
+-	-$(RM) writmaps.koi
+-	-$(RM) readmaps.koi
+-	$(MV) writmaps.dat writmaps.koi
+-	$(MV) readmaps.dat readmaps.koi
+-
+-readmaps.ukr:
+-	./makemaps$(EXE) CP1125 $(allmaps)
+-	-$(RM) writmaps.ukr
+-	-$(RM) readmaps.ukr
+-	$(MV) writmaps.dat writmaps.ukr
+-	$(MV) readmaps.dat readmaps.ukr
+-
+-readmaps.is1:
+-	./makemaps$(EXE) LATIN-1 $(allmaps)
+-	-$(RM) writmaps.is1
+-	-$(RM) readmaps.is1
+-	$(MV) writmaps.dat writmaps.is1
+-	$(MV) readmaps.dat readmaps.is1
+-
+-readmaps.is5:
+-	./makemaps$(EXE) ISO-5 $(allmaps)
+-	-$(RM) writmaps.is5
+-	-$(RM) readmaps.is5
+-	$(MV) writmaps.dat writmaps.is5
+-	$(MV) readmaps.dat readmaps.is5
++readmaps.437:	makemaps$(EXE)
++	MAKEMAPS_SAVEFILE_SUFFIX=$(suffix $@) ./makemaps$(EXE) CP437 $(allmaps)
++
++readmaps.850:	makemaps$(EXE)
++	MAKEMAPS_SAVEFILE_SUFFIX=$(suffix $@) ./makemaps$(EXE) CP850 $(allmaps)
++
++readmaps.865:	makemaps$(EXE)
++	MAKEMAPS_SAVEFILE_SUFFIX=$(suffix $@) ./makemaps$(EXE) CP865 $(allmaps)
++
++readmaps.866:	makemaps$(EXE)
++	MAKEMAPS_SAVEFILE_SUFFIX=$(suffix $@) ./makemaps$(EXE) CP866 $(allmaps)
++
++readmaps.koi:	makemaps$(EXE)
++	MAKEMAPS_SAVEFILE_SUFFIX=$(suffix $@) ./makemaps$(EXE) KOI8-R $(allmaps)
++
++readmaps.ukr:	makemaps$(EXE)
++	MAKEMAPS_SAVEFILE_SUFFIX=$(suffix $@) ./makemaps$(EXE) CP1125 $(allmaps)
++
++readmaps.is1:	makemaps$(EXE)
++	MAKEMAPS_SAVEFILE_SUFFIX=$(suffix $@) ./makemaps$(EXE) LATIN-1 $(allmaps)
++
++readmaps.is5:	makemaps$(EXE)
++	MAKEMAPS_SAVEFILE_SUFFIX=$(suffix $@) ./makemaps$(EXE) ISO-5 $(allmaps)
+ 
+ clean:
+ 	-$(RM) makemaps$(OBJ)
diff --git a/news/husky-msged/files/patch-maps-makemaps.c b/news/husky-msged/files/patch-maps-makemaps.c
new file mode 100644
index 00000000000..4c704718f65
--- /dev/null
+++ b/news/husky-msged/files/patch-maps-makemaps.c
@@ -0,0 +1,56 @@
+--- maps/makemaps.c.orig	1999-10-15 05:24:42.000000000 +0800
++++ maps/makemaps.c	2013-08-21 18:13:36.000000000 +0800
+@@ -13,6 +13,7 @@
+ 
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <limits.h>
+ #include <ctype.h>
+ #include <string.h>
+ 
+@@ -527,19 +528,30 @@
+ 
+ int save(void)
+ {
+-    FILE *fr = fopen("readmaps.dat","wb");
+-    FILE *fw = fopen("writmaps.dat","wb");
++    char saveread[PATH_MAX], savewrit[PATH_MAX];
++    char *suffix;
++    FILE *fr, *fw;
+     unsigned char header[12];
+     int i;
+ 
++    suffix = getenv("MAKEMAPS_SAVEFILE_SUFFIX");
++    if (suffix == NULL)
++        suffix = ".dat";
++
++    snprintf(saveread, sizeof(saveread), "readmaps%s", suffix);
++    snprintf(savewrit, sizeof(savewrit), "writmaps%s", suffix);
++
++    fr = fopen(saveread, "wb");
++    fw = fopen(savewrit, "wb");
++
+     if (fr == NULL)
+     {
+-        fprintf (stderr, "Cannot write readmaps.dat.\n");
++        fprintf (stderr, "Cannot write %s.\n", saveread);
+         goto erro;
+     }
+     if (fw == NULL)
+     {
+-        fprintf (stderr, "Cannot write writmaps.dat.\n");
++        fprintf (stderr, "Cannot write %s.\n", savewrit);
+         goto erro;
+     }
+ 
+@@ -595,8 +607,8 @@
+             fclose(fr);
+         }
+     }
+-    unlink("readmaps.dat");
+-    unlink("writmaps.dat");
++    unlink(saveread);
++    unlink(savewrit);
+     return 0;
+ }
+ 
diff --git a/news/husky-msged/pkg-descr b/news/husky-msged/pkg-descr
index a8a5c306df8..20a6103fb32 100644
--- a/news/husky-msged/pkg-descr
+++ b/news/husky-msged/pkg-descr
@@ -1,6 +1,6 @@
 Msged/TE (full-featured FTN mail reader)
 
 Msged/TE is a part of Husky Fidosoft Project.
-Husky is complete freeware suite of Fidonet applications. 
+Husky is complete freeware suite of FidoNet applications.
 
 WWW: http://husky.sourceforge.net/