- Update to gcal 3.6

- Claim maintainership
- Fix installation of gcal-* binaries
- Check NLS knob

3 files changed, 82 insertions, 56 deletions

diff --git a/deskutils/gcal/Makefile b/deskutils/gcal/Makefile
index 4f992206d69e..0d3ead6929b5 100644
--- a/deskutils/gcal/Makefile
+++ b/deskutils/gcal/Makefile
@@ -6,32 +6,45 @@
 #
 
 PORTNAME=		gcal
-PORTVERSION=		3.01
-PORTREVISION=	7
+PORTVERSION=		3.6
 CATEGORIES=		deskutils
 MASTER_SITES=		${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	johans@FreeBSD.org
 COMMENT=	The GNU Gregorian calendar program
 
-# Global variables
-#
-
 USE_GETTEXT=	yes
-# required to rebuild info files if needed.
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 
 INFO=		gcal
-MAN1=		gcal.1 gcal2txt.1 tcal.1 txt2gcal.1
+#MAN1=		gcal.1 gcal2txt.1 tcal.1 txt2gcal.1
 
-# Post-extract
-#
-
-# it's not so simple to get rid of splitted *.info-* files
-# w/ hacking doc/Makefile.in. so, do nothing and left them.
-# post-extract:
-# 	@${RM} -f ${WRKSRC}/doc/*/${PORTNAME}.info*
+.if defined(WITHOUT_NLS)
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.else
+USE_GETTEXT=	yes
+PLIST_SUB+=	NLS=""
+.endif
+
+GCAL_SCRIPTS=	daily/daily ddiff/ddiff ddiff/ddiffdrv dst/dst gcalltx/gcalltx \
+		gcalltx/gcalltxp moon/moon mrms/mrms srss/srss wloc/wlocdrv
+
+post-patch:
+.for p in ${GCAL_SCRIPTS}
+	@${REINPLACE_CMD} -e '/^ThisGcal=/s:=.*:=${PREFIX}/bin/gcal:' \
+		-e '/^packagedatamiscdir=/s:=.*:=${DATADIR}/misc/${p:H}:' \
+		${WRKSRC}/misc/${p}.in
+.endfor
+
+post-install:
+	@${TAR} -cf - -C ${WRKSRC} --exclude '*.in' --exclude '*.in.bak' \
+		--exclude '*.alias' misc | ${TAR} -xpf - -C ${DATADIR}
+.for p in ${GCAL_SCRIPTS}
+	@${CHMOD} +x ${DATADIR}/misc/${p}
+	@${LN} -s ${DATADIR}/misc/${p} ${PREFIX}/bin/gcal-${p:T}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/deskutils/gcal/distinfo b/deskutils/gcal/distinfo
index 2b1ae5fd6bc5..c8a091a25ae8 100644
--- a/deskutils/gcal/distinfo
+++ b/deskutils/gcal/distinfo
@@ -1,3 +1,3 @@
-MD5 (gcal-3.01.tar.gz) = 65f3394653829fd77f6862045112ad4f
-SHA256 (gcal-3.01.tar.gz) = e2bb8162cb5d6ce1abd27ea19e7a8f333409ac1060f8c1693416b544d4cb32d9
-SIZE (gcal-3.01.tar.gz) = 2371244
+MD5 (gcal-3.6.tar.gz) = 9c3819ca118d6e3adb6a716858cba7d6
+SHA256 (gcal-3.6.tar.gz) = c6df9a6c236fec6e0388a200aef27876a93377cf8a9674f2d2be30b5217eff1f
+SIZE (gcal-3.6.tar.gz) = 2672720
diff --git a/deskutils/gcal/pkg-plist b/deskutils/gcal/pkg-plist
index 5a1546f75ff0..bf6e72bb3b39 100644
--- a/deskutils/gcal/pkg-plist
+++ b/deskutils/gcal/pkg-plist
@@ -1,14 +1,26 @@
 bin/gcal
+bin/gcal-daily
+bin/gcal-ddiff
+bin/gcal-ddiffdrv
+bin/gcal-dst
+bin/gcal-gcalltx
+bin/gcal-gcalltxp
+bin/gcal-moon
+bin/gcal-mrms
+bin/gcal-srss
+bin/gcal-wlocdrv
 bin/gcal2txt
 bin/tcal
 bin/txt2gcal
-%%DATADIR%%/CREDITS.dates
+%%DATADIR%%/CREDITS
+%%DATADIR%%/Makefile.in
 %%DATADIR%%/README
-%%DATADIR%%/README.dates
 %%DATADIR%%/ancient
 %%DATADIR%%/ansipic.rc
 %%DATADIR%%/birthday.rc
 %%DATADIR%%/bkk.rc
+%%DATADIR%%/cal2gcal.awk
+%%DATADIR%%/cal2gcal.pl
 %%DATADIR%%/calendar.birth
 %%DATADIR%%/calendar.chris
 %%DATADIR%%/calendar.compu
@@ -20,6 +32,8 @@ bin/txt2gcal
 %%DATADIR%%/can_holiday
 %%DATADIR%%/celtic
 %%DATADIR%%/computing
+%%DATADIR%%/ct2gcal.awk
+%%DATADIR%%/ct2gcal.pl
 %%DATADIR%%/de-mdata.rc
 %%DATADIR%%/de-sdata.rc
 %%DATADIR%%/events
@@ -29,6 +43,7 @@ bin/txt2gcal
 %%DATADIR%%/events4
 %%DATADIR%%/events5
 %%DATADIR%%/events6
+%%DATADIR%%/gcalrc
 %%DATADIR%%/gdead
 %%DATADIR%%/hawaii
 %%DATADIR%%/literature
@@ -42,57 +57,52 @@ bin/txt2gcal
 %%DATADIR%%/lotr
 %%DATADIR%%/mdata.rc
 %%DATADIR%%/meteoric.rc
+%%DATADIR%%/misc/Makefile
+%%DATADIR%%/misc/Makefile.am
 %%DATADIR%%/misc/README
 %%DATADIR%%/misc/daily/daily
-@exec ln -fs ../%F %D/bin/gcal-%f
-@rmtry bin/gcal-%f
 %%DATADIR%%/misc/daily/daily.awk
+%%DATADIR%%/misc/daily/daily.bat
 %%DATADIR%%/misc/daily/daily.pl
 %%DATADIR%%/misc/daily/daily.rc
 %%DATADIR%%/misc/ddiff/ddiff
-@exec ln -fs ../%F %D/bin/gcal-%f
-@rmtry bin/gcal-%f
+%%DATADIR%%/misc/ddiff/ddiff.@
+%%DATADIR%%/misc/ddiff/ddiff.bat
 %%DATADIR%%/misc/ddiff/ddiff1.awk
 %%DATADIR%%/misc/ddiff/ddiff1.pl
 %%DATADIR%%/misc/ddiff/ddiff2.awk
 %%DATADIR%%/misc/ddiff/ddiff2.pl
 %%DATADIR%%/misc/ddiff/ddiffdrv
-@exec ln -fs ../%F %D/bin/gcal-%f
-@rmtry bin/gcal-%f
 %%DATADIR%%/misc/ddiff/ddiffdrv.awk
+%%DATADIR%%/misc/ddiff/ddiffdrv.bat
 %%DATADIR%%/misc/ddiff/ddiffdrv.pl
 %%DATADIR%%/misc/ddiff/zone.tab
 %%DATADIR%%/misc/dst/dst
-@exec ln -fs ../%F %D/bin/gcal-%f
-@rmtry bin/gcal-%f
 %%DATADIR%%/misc/dst/dst.awk
 %%DATADIR%%/misc/dst/dst.pl
 %%DATADIR%%/misc/gcalltx/gcalltx
-@exec ln -fs ../%F %D/bin/gcal-%f
-@rmtry bin/gcal-%f
+%%DATADIR%%/misc/gcalltx/gcalltx.bat
 %%DATADIR%%/misc/gcalltx/gcalltx.pl
-@exec ln -fs ../%F %D/bin/gcal-%f
-@rmtry bin/gcal-%f
 %%DATADIR%%/misc/gcalltx/gcalltx.sed
+%%DATADIR%%/misc/gcalltx/gcalltxp
 %%DATADIR%%/misc/gcalmagic.add
+%%DATADIR%%/misc/magic.add
 %%DATADIR%%/misc/moon/moon
-@exec ln -fs ../%F %D/bin/gcal-%f
-@rmtry bin/gcal-%f
+%%DATADIR%%/misc/moon/moon.bat
+%%DATADIR%%/misc/moon/moon1.awk
+%%DATADIR%%/misc/moon/moon2.awk
 %%DATADIR%%/misc/mrms/mrms
-@exec ln -fs ../%F %D/bin/gcal-%f
-@rmtry bin/gcal-%f
 %%DATADIR%%/misc/mrms/mrms.awk
+%%DATADIR%%/misc/mrms/mrms.bat
 %%DATADIR%%/misc/mrms/mrms.pl
 %%DATADIR%%/misc/mrms/mrms.rc
 %%DATADIR%%/misc/srss/srss
-@exec ln -fs ../%F %D/bin/gcal-%f
-@rmtry bin/gcal-%f
 %%DATADIR%%/misc/srss/srss.awk
+%%DATADIR%%/misc/srss/srss.bat
 %%DATADIR%%/misc/srss/srss.pl
 %%DATADIR%%/misc/srss/srss.rc
 %%DATADIR%%/misc/wloc/wlocdrv
-@exec ln -fs ../%F %D/bin/gcal-%f
-@rmtry bin/gcal-%f
+%%DATADIR%%/misc/wloc/wlocdrv.bat
 %%DATADIR%%/misc/wloc/wlocdrv1.awk
 %%DATADIR%%/misc/wloc/wlocdrv1.pl
 %%DATADIR%%/misc/wloc/wlocdrv2.awk
@@ -101,15 +111,9 @@ bin/txt2gcal
 %%DATADIR%%/movies
 %%DATADIR%%/ms.rc
 %%DATADIR%%/music
+%%DATADIR%%/old2v220.awk
+%%DATADIR%%/old2v220.pl
 %%DATADIR%%/radio
-%%DATADIR%%/scripts/cal2gcal.awk
-%%DATADIR%%/scripts/cal2gcal.pl
-%%DATADIR%%/scripts/ct2gcal.awk
-%%DATADIR%%/scripts/ct2gcal.pl
-%%DATADIR%%/scripts/old2v220.awk
-%%DATADIR%%/scripts/old2v220.pl
-%%DATADIR%%/scripts/v2x2v300.awk
-%%DATADIR%%/scripts/v2x2v300.pl
 %%DATADIR%%/sdata.rc
 %%DATADIR%%/sfo
 %%DATADIR%%/space
@@ -120,19 +124,14 @@ bin/txt2gcal
 %%DATADIR%%/usa_holiday
 %%DATADIR%%/usa_other
 %%DATADIR%%/usa_states
+%%DATADIR%%/v2x2v300.awk
+%%DATADIR%%/v2x2v300.pl
 %%DATADIR%%/witchcraft
 %%DATADIR%%/wloc.rc
 %%DATADIR%%/world
 %%DATADIR%%/wtt1.rc
 %%DATADIR%%/wtt2.rc
 %%DATADIR%%/wtt3.rc
-share/locale/de/LC_MESSAGES/gcal.mo
-share/locale/fr/LC_MESSAGES/gcal.mo
-share/locale/nl/LC_MESSAGES/gcal.mo
-share/locale/pl/LC_MESSAGES/gcal.mo
-share/locale/ru/LC_MESSAGES/gcal.mo
-share/locale/sv/LC_MESSAGES/gcal.mo
-@dirrm %%DATADIR%%/scripts
 @dirrm %%DATADIR%%/misc/wloc
 @dirrm %%DATADIR%%/misc/srss
 @dirrm %%DATADIR%%/misc/mrms
@@ -143,3 +142,17 @@ share/locale/sv/LC_MESSAGES/gcal.mo
 @dirrm %%DATADIR%%/misc/daily
 @dirrm %%DATADIR%%/misc
 @dirrm %%DATADIR%%
+%%NLS%%share/locale/ca/LC_MESSAGES/gcal.mo
+%%NLS%%share/locale/da/LC_MESSAGES/gcal.mo
+%%NLS%%share/locale/de/LC_MESSAGES/gcal.mo
+%%NLS%%share/locale/es/LC_MESSAGES/gcal.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gcal.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/gcal.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/gcal.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/gcal.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/gcal.mo
+%%NLS%%share/locale/rw/LC_MESSAGES/gcal.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/gcal.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/gcal.mo
+%%NLS%%@dirrmtry share/locale/rw/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/rw