diff -ruN --exclude=CVS /usr/ports/news/golded+/Makefile /home/golded+/Makefile
--- /usr/ports/news/golded+/Makefile Fri Sep 16 05:47:35 2005
+++ /home/golded+/Makefile Wed Nov 1 23:32:45 2006
@@ -6,13 +6,12 @@
#
PORTNAME= golded+
-PORTVERSION= 1.1.5.a${SNAPDATE}
-PORTREVISION= 1
+PORTVERSION= 1.1.5.200${SNAPDATE}
CATEGORIES= news mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=golded-plus
-DISTNAME= gps115-${SNAPDATE}
-SNAPDATE= 20050910
+DISTNAME= gps${SNAPDATE}
+EXTRACT_SUFX= .tb2
MAINTAINER= fjoe@FreeBSD.org
COMMENT= GoldEd+ (FTN message editor)
@@ -20,33 +19,56 @@
USE_BZIP2= yes
USE_GMAKE= yes
+SNAPDATE= 60703
WRKSRC= ${WRKDIR}/${PORTNAME}
MAN1= golded.1 goldnode.1 rddt.1
-DOCS= copying copying.lib license.txt notework.txt rusfaq.txt tips.txt
+DOCS= copying copying.lib license.txt notework.txt rusfaq.txt \
+ tips.txt notework.rus tokencfg.txt tokentpl.txt goldnode.txt
+PORTDOCS= ${DOCS} gold_ref.txt gold_usr.txt
+SUB_FILES= pkg-message
+.if !defined(NOPORTDOCS)
+SUB_LIST= NOTEWORK="Please read the ${DOCSDIR}/notework.txt before using ${PORTNAME}"
+.else
+SUB_LIST= NOTEWORK=""
+.endif
post-patch:
- @cp ${WRKSRC}/golded3/mygolded.__h ${WRKSRC}/golded3/mygolded.h
+ @${SED} \
+ -e 's,^\(#define __GVER_VENDOR_NAME__\).*,\1 "",' \
+ -e 's,\(#define __GVER_VENDOR_FIDO__\).*,\1 "",' \
+ -e 's,\(#define __GVER_VENDOR_EMAIL__\).*,\1 "",' \
+ -e 's,\(#define __GVER_RELEASENAME__\).*,\1 "Golded+ FreeBSD port",' \
+ -e 's,\(#define __GVER_POSTVERSION__\).*,\1 "-b200${SNAPDATE}",' \
+ <${WRKSRC}/golded3/mygolded.__h >${WRKSRC}/golded3/mygolded.h
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/bin/gedlnx ${PREFIX}/bin/golded
- @${INSTALL_PROGRAM} ${WRKSRC}/bin/gnlnx ${PREFIX}/bin/goldnode
- @${INSTALL_PROGRAM} ${WRKSRC}/bin/rddtlnx ${PREFIX}/bin/rddt
- @for i in ${MAN1}; do \
- ${INSTALL_MAN} ${WRKSRC}/docs/$$i ${PREFIX}/man/man1; \
- done
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/gedlnx ${PREFIX}/bin/golded
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/gnlnx ${PREFIX}/bin/goldnode
+ ${INSTALL_PROGRAM} ${WRKSRC}/bin/rddtlnx ${PREFIX}/bin/rddt
+.for i in ${MAN1}
+ ${INSTALL_MAN} ${WRKSRC}/docs/${i} ${MAN1PREFIX}/man/man1
+.endfor
@${MKDIR} ${EXAMPLESDIR}
- @for i in charset colorset config template; do \
- ${MKDIR} ${EXAMPLESDIR}/$$i; \
- ${FIND} ${WRKSRC}/cfgs/$$i -maxdepth 1 -type f | ${XARGS} -n 1 -J @ ${INSTALL_DATA} @ ${EXAMPLESDIR}/$$i; \
- done
+.for i in charset colorset config template
+ @${MKDIR} ${EXAMPLESDIR}/${i}
+ @${FIND} -E ${WRKSRC}/cfgs/${i} -maxdepth 1 -type f \
+ \! -regex ".*\.(files.bbs|bb1|pl)|.*files.bbs" | \
+ ${XARGS} -n 1 -J @ ${INSTALL_DATA} -p @ ${EXAMPLESDIR}/${i}
+.endfor
+.for i in charset config
+ @${INSTALL_SCRIPT} -p ${WRKSRC}/cfgs/${i}/*.pl ${EXAMPLESDIR}/${i}
+.endfor
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/manuals/gold_ref.txt ${DOCSDIR}
- @${INSTALL_DATA} ${WRKSRC}/manuals/gold_usr.txt ${DOCSDIR}
- @for i in ${DOCS}; do \
- ${INSTALL_DATA} ${WRKSRC}/docs/$$i ${DOCSDIR}; \
- done
+ @${INSTALL_DATA} -p ${WRKSRC}/manuals/gold_ref.txt ${DOCSDIR}
+ @${INSTALL_DATA} -p ${WRKSRC}/manuals/gold_usr.txt ${DOCSDIR}
+.for i in ${DOCS}
+ @${INSTALL_DATA} -p ${WRKSRC}/docs/${i} ${DOCSDIR}
+.endfor
.endif
+
+post-install:
+ @${CAT} ${PKGMESSAGE}
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/news/golded+/distinfo /home/golded+/distinfo
--- /usr/ports/news/golded+/distinfo Thu Nov 17 19:04:58 2005
+++ /home/golded+/distinfo Tue Oct 31 04:11:46 2006
@@ -1,3 +1,3 @@
-MD5 (gps115-20050910.tar.bz2) = 44f62ae23f14d835cce7369bcf1d4e0a
-SHA256 (gps115-20050910.tar.bz2) = ab461caa3d84837f2a9d32897255d9ebc984fdebe57912ffe8603c75b7cf82df
-SIZE (gps115-20050910.tar.bz2) = 1342647
+MD5 (gps60703.tb2) = 04cdcba1ad11c4b9b0a3897e207f68dc
+SHA256 (gps60703.tb2) = 368543246d11c81c6244c01960b1b0e6797d47b615e9bfb401aa85c2ea545cbb
+SIZE (gps60703.tb2) = 1492162
diff -ruN --exclude=CVS /usr/ports/news/golded+/files/patch-GNUmakef.def /home/golded+/files/patch-GNUmakef.def
--- /usr/ports/news/golded+/files/patch-GNUmakef.def Fri Dec 26 00:48:28 2003
+++ /home/golded+/files/patch-GNUmakef.def Tue Oct 31 23:29:39 2006
@@ -1,9 +1,9 @@
---- GNUmakef.def.orig Mon Dec 22 14:02:19 2003
-+++ GNUmakef.def Fri Dec 26 05:38:58 2003
-@@ -78,8 +78,8 @@
- LNKFLAGS+=-lbe -ltextencoding
- else
+--- GNUmakef.def.orig Mon May 15 16:54:00 2006
++++ GNUmakef.def Tue Oct 31 23:29:12 2006
+@@ -106,8 +106,8 @@
CAT=cat
+ SED=sed
+ GREP=grep
-CC=gcc
-CXX=g++
+#CC=gcc
@@ -11,14 +11,14 @@
AR=ar
RANLIB=ranlib
PLATFORM=lnx
-@@ -91,8 +91,8 @@
+@@ -119,8 +119,8 @@
endif
endif
endif
--CFLAGS+=-g -funsigned-char $(INCS) -Wall -Wno-sign-compare -pedantic -O2 -DPRAGMA_PACK # -fomit-frame-pointer
+-CFLAGS+=-funsigned-char -g $(INCS) -Wall -Wno-sign-compare -pedantic -O2 -DPRAGMA_PACK # -fomit-frame-pointer
-LNKFLAGS+=-g
-+CFLAGS+=-funsigned-char $(INCS) -Wall -Wno-sign-compare -O2 -DPRAGMA_PACK # -pedantic -fomit-frame-pointer
++CFLAGS+=-funsigned-char $(INCS) -Wall -Wno-sign-compare -O2 -DPRAGMA_PACK # -g -pedantic -fomit-frame-pointer
+#LNKFLAGS+=-g
- CPPFLAGS+=$(CFLAGS) -fno-exceptions -fno-rtti
+ CPPFLAGS+=$(CFLAGS) -fno-rtti # -fno-exceptions
# comment following lines if you dislike ncurses
diff -ruN --exclude=CVS /usr/ports/news/golded+/files/patch-geall.h /home/golded+/files/patch-geall.h
--- /usr/ports/news/golded+/files/patch-geall.h Thu Jan 1 00:00:00 1970
+++ /home/golded+/files/patch-geall.h Tue Oct 31 23:32:43 2006
@@ -0,0 +1,10 @@
+--- goldlib/gall/geall.h.orig Sun May 14 01:19:16 2006
++++ goldlib/gall/geall.h Tue Oct 31 23:32:29 2006
+@@ -27,6 +27,7 @@
+ #define __GEALL__H
+
+ #include <gdefs.h>
++#include <vector>
+
+
+ // ------------------------------------------------------------------
diff -ruN --exclude=CVS /usr/ports/news/golded+/files/patch-geinit.cpp /home/golded+/files/patch-geinit.cpp
--- /usr/ports/news/golded+/files/patch-geinit.cpp Thu Jan 1 00:00:00 1970
+++ /home/golded+/files/patch-geinit.cpp Wed Nov 1 02:49:39 2006
@@ -0,0 +1,36 @@
+--- golded3/geinit.cpp.orig Sun May 14 18:09:02 2006
++++ golded3/geinit.cpp Wed Nov 1 02:49:10 2006
+@@ -413,19 +413,22 @@
+ wcenters(12, C_BRAGW, "redistribute the program or any parts hereof under cer-");
+ wcenters(13, C_BRAGW, "tain conditions. See the LICENSE.TXT for more details.");
+
+- wcenters(MAXROW-10, C_BRAGW, "This executable is distributed by");
+- if (*__gver_vendor_fido__)
++ if (*__gver_vendor_name__)
+ {
+- gsprintf(PRINTF_DECLARE_BUFFER(buf), "%s (Fido: %s) - <%s>",
+- __gver_vendor_name__, __gver_vendor_fido__, __gver_vendor_email__);
++ wcenters(MAXROW-10, C_BRAGW, "This executable is distributed by");
++ if (*__gver_vendor_fido__)
++ {
++ gsprintf(PRINTF_DECLARE_BUFFER(buf), "%s (Fido: %s) - <%s>",
++ __gver_vendor_name__, __gver_vendor_fido__, __gver_vendor_email__);
++ }
++ else
++ {
++ gsprintf(PRINTF_DECLARE_BUFFER(buf), "%s <%s>",
++ __gver_vendor_name__, __gver_vendor_email__);
++ }
++
++ wcenters(MAXROW-9, C_BRAGW, buf);
+ }
+- else
+- {
+- gsprintf(PRINTF_DECLARE_BUFFER(buf), "%s <%s>",
+- __gver_vendor_name__, __gver_vendor_email__);
+- }
+-
+- wcenters(MAXROW-9, C_BRAGW, buf);
+ gsprintf(PRINTF_DECLARE_BUFFER(buf), "Compiled on %s %s", __gver_date__, __gver_time__);
+ wcenters(MAXROW-8, C_BRAGW, buf);
+ }
diff -ruN --exclude=CVS /usr/ports/news/golded+/files/pkg-message.in /home/golded+/files/pkg-message.in
--- /usr/ports/news/golded+/files/pkg-message.in Thu Jan 1 00:00:00 1970
+++ /home/golded+/files/pkg-message.in Wed Nov 1 10:39:08 2006
@@ -0,0 +1,5 @@
+******************************************************************************
+An example configuration files, templates and charset tables for golded+
+has been installed in %%EXAMPLESDIR%%.
+%%NOTEWORK%%
+******************************************************************************
diff -ruN --exclude=CVS /usr/ports/news/golded+/golded.diff /home/golded+/golded.diff
--- /usr/ports/news/golded+/golded.diff Thu Jan 1 00:00:00 1970
+++ /home/golded+/golded.diff Wed Nov 1 23:32:50 2006
@@ -0,0 +1 @@
+===> Generating patch
diff -ruN --exclude=CVS /usr/ports/news/golded+/pkg-plist /home/golded+/pkg-plist
--- /usr/ports/news/golded+/pkg-plist Fri Sep 16 05:47:35 2005
+++ /home/golded+/pkg-plist Wed Nov 1 09:50:40 2006
@@ -1,14 +1,8 @@
bin/golded
bin/goldnode
bin/rddt
-%%PORTDOCS%%%%DOCSDIR%%/copying
-%%PORTDOCS%%%%DOCSDIR%%/copying.lib
-%%PORTDOCS%%%%DOCSDIR%%/gold_ref.txt
-%%PORTDOCS%%%%DOCSDIR%%/gold_usr.txt
-%%PORTDOCS%%%%DOCSDIR%%/license.txt
-%%PORTDOCS%%%%DOCSDIR%%/notework.txt
-%%PORTDOCS%%%%DOCSDIR%%/rusfaq.txt
-%%PORTDOCS%%%%DOCSDIR%%/tips.txt
+%%EXAMPLESDIR%%/charset/1125_i-5.chs
+%%EXAMPLESDIR%%/charset/1125_u8.chs
%%EXAMPLESDIR%%/charset/12501250.chs
%%EXAMPLESDIR%%/charset/12501251.chs
%%EXAMPLESDIR%%/charset/12501252.chs
@@ -37,6 +31,7 @@
%%EXAMPLESDIR%%/charset/1251_859.chs
%%EXAMPLESDIR%%/charset/1251_asc.chs
%%EXAMPLESDIR%%/charset/1251_i-1.chs
+%%EXAMPLESDIR%%/charset/1251_i-5.chs
%%EXAMPLESDIR%%/charset/1251_i15.chs
%%EXAMPLESDIR%%/charset/1251_mac.chs
%%EXAMPLESDIR%%/charset/12521250.chs
@@ -129,6 +124,7 @@
%%EXAMPLESDIR%%/charset/437_i-1.chs
%%EXAMPLESDIR%%/charset/437_i15.chs
%%EXAMPLESDIR%%/charset/437_mac.chs
+%%EXAMPLESDIR%%/charset/437_u8.chs
%%EXAMPLESDIR%%/charset/850_1250.chs
%%EXAMPLESDIR%%/charset/850_1251.chs
%%EXAMPLESDIR%%/charset/850_1252.chs
@@ -140,12 +136,14 @@
%%EXAMPLESDIR%%/charset/850_850.chs
%%EXAMPLESDIR%%/charset/850_858.chs
%%EXAMPLESDIR%%/charset/850_859.chs
+%%EXAMPLESDIR%%/charset/850_866.chs
%%EXAMPLESDIR%%/charset/850_asc.chs
%%EXAMPLESDIR%%/charset/850_i-1.chs
%%EXAMPLESDIR%%/charset/850_i15.chs
%%EXAMPLESDIR%%/charset/850_iqp.chs
%%EXAMPLESDIR%%/charset/850_iso.chs
%%EXAMPLESDIR%%/charset/850_mac.chs
+%%EXAMPLESDIR%%/charset/850_u8.chs
%%EXAMPLESDIR%%/charset/858_1250.chs
%%EXAMPLESDIR%%/charset/858_1251.chs
%%EXAMPLESDIR%%/charset/858_1252.chs
@@ -177,10 +175,26 @@
%%EXAMPLESDIR%%/charset/859_i15.chs
%%EXAMPLESDIR%%/charset/859_mac.chs
%%EXAMPLESDIR%%/charset/865_iso.chs
+%%EXAMPLESDIR%%/charset/865_u8.chs
+%%EXAMPLESDIR%%/charset/866_850.chs
+%%EXAMPLESDIR%%/charset/866_866.chs
+%%EXAMPLESDIR%%/charset/866_ISO.chs
+%%EXAMPLESDIR%%/charset/866_i-5.chs
%%EXAMPLESDIR%%/charset/866_koi.chs
+%%EXAMPLESDIR%%/charset/866_koi7.chs
+%%EXAMPLESDIR%%/charset/866_koiX.chs
%%EXAMPLESDIR%%/charset/866_kou.chs
+%%EXAMPLESDIR%%/charset/866_mcyr.chs
+%%EXAMPLESDIR%%/charset/866_u8.chs
%%EXAMPLESDIR%%/charset/866_ukr.chs
%%EXAMPLESDIR%%/charset/866_win.chs
+%%EXAMPLESDIR%%/charset/DK1_866.chs
+%%EXAMPLESDIR%%/charset/DK2_866.chs
+%%EXAMPLESDIR%%/charset/Files.bbs
+%%EXAMPLESDIR%%/charset/IK1_866.chs
+%%EXAMPLESDIR%%/charset/IK2_866.chs
+%%EXAMPLESDIR%%/charset/WK1_866.chs
+%%EXAMPLESDIR%%/charset/WK2_866.chs
%%EXAMPLESDIR%%/charset/asc_1250.chs
%%EXAMPLESDIR%%/charset/asc_1251.chs
%%EXAMPLESDIR%%/charset/asc_1252.chs
@@ -201,11 +215,11 @@
%%EXAMPLESDIR%%/charset/cmp_ibm.esc
%%EXAMPLESDIR%%/charset/dut_asc.chs
%%EXAMPLESDIR%%/charset/dut_ibm.chs
-%%EXAMPLESDIR%%/charset/files.bbs
%%EXAMPLESDIR%%/charset/fin_asc.chs
%%EXAMPLESDIR%%/charset/fin_ibm.chs
%%EXAMPLESDIR%%/charset/frn_asc.chs
%%EXAMPLESDIR%%/charset/frn_ibm.chs
+%%EXAMPLESDIR%%/charset/genlist.pl
%%EXAMPLESDIR%%/charset/ger_asc.chs
%%EXAMPLESDIR%%/charset/ger_ibm.chs
%%EXAMPLESDIR%%/charset/i-1_1250.chs
@@ -223,6 +237,10 @@
%%EXAMPLESDIR%%/charset/i-1_i-1.chs
%%EXAMPLESDIR%%/charset/i-1_i15.chs
%%EXAMPLESDIR%%/charset/i-1_mac.chs
+%%EXAMPLESDIR%%/charset/i-5_1125.chs
+%%EXAMPLESDIR%%/charset/i-5_1251.chs
+%%EXAMPLESDIR%%/charset/i-5_866.chs
+%%EXAMPLESDIR%%/charset/i-5_koi8r.chs
%%EXAMPLESDIR%%/charset/i15_1250.chs
%%EXAMPLESDIR%%/charset/i15_1251.chs
%%EXAMPLESDIR%%/charset/i15_1252.chs
@@ -252,6 +270,7 @@
%%EXAMPLESDIR%%/charset/ibm_vt1.chs
%%EXAMPLESDIR%%/charset/iqp_850.chs
%%EXAMPLESDIR%%/charset/iqp_ibm.chs
+%%EXAMPLESDIR%%/charset/iso1_u8.chs
%%EXAMPLESDIR%%/charset/iso_850.chs
%%EXAMPLESDIR%%/charset/iso_asc.chs
%%EXAMPLESDIR%%/charset/iso_ibm.chs
@@ -260,6 +279,12 @@
%%EXAMPLESDIR%%/charset/iso_vt1.chs
%%EXAMPLESDIR%%/charset/ita_asc.chs
%%EXAMPLESDIR%%/charset/itl_ibm.chs
+%%EXAMPLESDIR%%/charset/k7_k7.chs
+%%EXAMPLESDIR%%/charset/k7_k8.chs
+%%EXAMPLESDIR%%/charset/k8_k7.chs
+%%EXAMPLESDIR%%/charset/koi7_866.chs
+%%EXAMPLESDIR%%/charset/koi8_u8.chs
+%%EXAMPLESDIR%%/charset/koi8r_i-5.chs
%%EXAMPLESDIR%%/charset/koi_866.chs
%%EXAMPLESDIR%%/charset/kou_866.chs
%%EXAMPLESDIR%%/charset/kou_ukr.chs
@@ -281,6 +306,7 @@
%%EXAMPLESDIR%%/charset/mac_iso.chs
%%EXAMPLESDIR%%/charset/mac_mac.chs
%%EXAMPLESDIR%%/charset/mac_vt1.chs
+%%EXAMPLESDIR%%/charset/mcyr_866.chs
%%EXAMPLESDIR%%/charset/mne_850.esc
%%EXAMPLESDIR%%/charset/mne_ibm.esc
%%EXAMPLESDIR%%/charset/nor_asc.chs
@@ -327,10 +353,12 @@
%%EXAMPLESDIR%%/colorset/gedmon00.cfg
%%EXAMPLESDIR%%/colorset/gedmon01.cfg
%%EXAMPLESDIR%%/colorset/gedmon02.cfg
+%%EXAMPLESDIR%%/config/GEDCOLOR.CFG
+%%EXAMPLESDIR%%/config/GEDCOLOR.RUS
%%EXAMPLESDIR%%/config/advanced.cfg
%%EXAMPLESDIR%%/config/advanced.rus
-%%EXAMPLESDIR%%/config/gedcolor.cfg
-%%EXAMPLESDIR%%/config/gedcolor.rus
+%%EXAMPLESDIR%%/config/aliasru.cfg
+%%EXAMPLESDIR%%/config/charsets.cfg
%%EXAMPLESDIR%%/config/gedlngdk.cfg
%%EXAMPLESDIR%%/config/gedlngit.cfg
%%EXAMPLESDIR%%/config/gedlngnl.cfg
@@ -348,15 +376,18 @@
%%EXAMPLESDIR%%/config/goldlang.rus
%%EXAMPLESDIR%%/config/goldlang.sv
%%EXAMPLESDIR%%/config/simple.cfg
+%%EXAMPLESDIR%%/config/xcharsets.cfg
+%%EXAMPLESDIR%%/config/xlatbbs.pl
+%%EXAMPLESDIR%%/config/xlatcfg.pl
%%EXAMPLESDIR%%/template/dansk.tpl
%%EXAMPLESDIR%%/template/default.tpl
%%EXAMPLESDIR%%/template/email.tpl
%%EXAMPLESDIR%%/template/golded.cfm
%%EXAMPLESDIR%%/template/golded.tpl
%%EXAMPLESDIR%%/template/newsgrps.tpl
-@dirrm %%EXAMPLESDIR%%/template
-@dirrm %%EXAMPLESDIR%%/config
-@dirrm %%EXAMPLESDIR%%/colorset
+%%EXAMPLESDIR%%/template/rusCP866.tpl
@dirrm %%EXAMPLESDIR%%/charset
+@dirrm %%EXAMPLESDIR%%/colorset
+@dirrm %%EXAMPLESDIR%%/config
+@dirrm %%EXAMPLESDIR%%/template
@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%