Update to gcal-3.6.3.

This commit is contained in:
ajacoutot 2013-06-01 20:48:00 +00:00
parent 14e0710d8d
commit 3b72b4afb0
7 changed files with 47 additions and 198 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.4 2013/03/10 22:28:05 espie Exp $
# $OpenBSD: Makefile,v 1.5 2013/06/01 20:48:00 ajacoutot Exp $
COMMENT = calculate and print calendars
DISTNAME = gcal-3.01
DISTNAME = gcal-3.6.3
CATEGORIES = astro
HOMEPAGE = http://www.gnu.org/software/gcal/gcal.html
@ -18,18 +18,15 @@ MODULES = devel/gettext
WANTLIB = c m ncurses
CONFIGURE_STYLE = gnu dest
CONFIGURE_ARGS = --enable-easc \
--without-included-gettext
USE_GROFF = Yes
CONFIGURE_STYLE = gnu
CONFIGURE_ARGS = --enable-easc
CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
INTLLIBS="-L${LOCALBASE}/lib -lintl -liconv"
LDFLAGS="-L${LOCALBASE}/lib"
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gcal
${INSTALL_DATA} ${WRKBUILD}/data/gcalrc ${PREFIX}/share/examples/gcal
${INSTALL_DATA} ${WRKBUILD}/data/*.rc ${PREFIX}/share/examples/gcal
rm ${PREFIX}/lib/charset.alias
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (gcal-3.01.tar.gz) = 4ruBYstdbOGr0n6hnnqPMzQJrBBg+MFpNBa1RNTLMtk=
SIZE (gcal-3.01.tar.gz) = 2371244
SHA256 (gcal-3.6.3.tar.gz) = nZvmCEEVClxg4n/F4PLAbAZjWsRMGGmNakjve7R7qG0=
SIZE (gcal-3.6.3.tar.gz) = 2994182

View File

@ -1,75 +0,0 @@
$OpenBSD: patch-configure,v 1.1.1.1 2009/10/17 08:39:34 bernd Exp $
--- configure.orig Wed Jun 14 14:58:07 2000
+++ configure Mon Apr 2 10:04:52 2007
@@ -2632,7 +2632,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 2638 "configure"
#include "confdefs.h"
@@ -2666,7 +2666,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = ye
#define $ac_tr_lib 1
EOF
- LIBS="-lintl $LIBS"
+ LIBS="-lintl -liconv $LIBS"
else
echo "$ac_t""no" 1>&6
@@ -4334,7 +4334,7 @@ rm -f conftest*
fi
echo "$ac_t""$ac_cv_objext" 1>&6
-OBJEXT=$ac_cv_objext
+OBJEXT=".$ac_cv_objext"
ac_objext=$ac_cv_objext
# Pull the hash mark out of the macro call to avoid m4 problems.
@@ -5305,7 +5305,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 5311 "configure"
#include "confdefs.h"
@@ -5345,7 +5345,7 @@ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set
echo $ac_n "(cached) $ac_c" 1>&6
else
ac_save_LIBS="$LIBS"
-LIBS="-lintl $LIBS"
+LIBS="-lintl -liconv $LIBS"
cat > conftest.$ac_ext <<EOF
#line 5351 "configure"
#include "confdefs.h"
@@ -6125,7 +6125,7 @@ fi
if test "$need_sys_lintl_for_regcmp" = yes; then
if test -z "`echo $LIBS | grep '\-lintl'`"; then
- LIBS="$LIBS -lintl"
+ LIBS="$LIBS -lintl -liconv"
fi
fi
@@ -6316,7 +6316,7 @@ s%@CP@%$CP%g
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
s%@INSTALL_DATA@%$INSTALL_DATA%g
-s%@LN_S@%$LN_S%g
+s%@LN_S@%%g
s%@CC@%$CC%g
s%@CPP@%$CPP%g
s%@LIBM@%$LIBM%g
@@ -6332,7 +6332,7 @@ s%@GENCAT@%$GENCAT%g
s%@USE_INCLUDED_LIBINTL@%$USE_INCLUDED_LIBINTL%g
s%@CATALOGS@%$CATALOGS%g
s%@CATOBJEXT@%$CATOBJEXT%g
-s%@DATADIRNAME@%$DATADIRNAME%g
+s%@DATADIRNAME@%share%g
s%@GMOFILES@%$GMOFILES%g
s%@INSTOBJEXT@%$INSTOBJEXT%g
s%@INTLDEPS@%$INTLDEPS%g

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-data_Makefile_in,v 1.1.1.1 2009/10/17 08:39:34 bernd Exp $
--- data/Makefile.in.orig Wed Jun 14 00:03:09 2000
+++ data/Makefile.in Mon Apr 2 09:36:40 2007
@@ -180,12 +180,11 @@ default check installbin install-strip id ID tags TAGS
#### Start of install section. ####
-install: installdirs installdates installdata
+install: installdirs installdates
@echo "All installs in $(subdir) done"
installdirs: $(top_srcdir)/mkinstalldirs
$(NORMAL_INSTALL)
- $(SHELL) $(top_srcdir)/mkinstalldirs $(homedir)
$(SHELL) $(top_srcdir)/mkinstalldirs $(packagedatadir)
if test -n "$(AWK)" || test -n "$(PERL)"; \
then \

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-misc_Makefile_in,v 1.1.1.1 2009/10/17 08:39:34 bernd Exp $
--- misc/Makefile.in.orig Mon Apr 2 10:11:49 2007
+++ misc/Makefile.in Mon Apr 2 10:12:01 2007
@@ -252,7 +252,7 @@ installaliasdirs: $(top_srcdir)/mkinstalldirs
$(NORMAL_INSTALL)
$(SHELL) $(top_srcdir)/mkinstalldirs $(localedir)
-installalias: installalias-@USE_NLS@
+installalias:
installalias-yes: $(srcdir)/locale.alias installaliasdirs
$(NORMAL_INSTALL)
@if test ! -f "$(localedir)/locale.alias"; \

View File

@ -1,12 +0,0 @@
$OpenBSD: patch-src_Makefile_in,v 1.1.1.1 2009/10/17 08:39:34 bernd Exp $
--- src/Makefile.in.orig Wed Jun 14 00:04:06 2000
+++ src/Makefile.in Mon Apr 2 09:32:46 2007
@@ -136,7 +136,7 @@ MISC_LIBS = @LIBM@ @LIBS@
LIBS = $(INTL_LIBS) $(MISC_LIBS)
CFLAGS = @CFLAGS@
-CPPFLAGS = -I$(srcdir) -I.. -I../intl -I$(top_srcdir)/intl -I$(top_builddir)/intl @CPPFLAGS@
+CPPFLAGS = -I$(srcdir) -I.. @CPPFLAGS@
LDFLAGS = @LDFLAGS@
transform = @program_transform_name@

View File

@ -1,23 +1,9 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2009/10/17 08:39:34 bernd Exp $
@comment $OpenBSD: PLIST,v 1.2 2013/06/01 20:48:01 ajacoutot Exp $
@bin bin/gcal
bin/gcal-daily
bin/gcal-ddiff
bin/gcal-ddiffdrv
bin/gcal-dst
bin/gcal-gcalltx
bin/gcal-gcalltx.pl
bin/gcal-moon
bin/gcal-mrms
bin/gcal-srss
bin/gcal-wlocdrv
@bin bin/gcal2txt
@bin bin/tcal
@bin bin/txt2gcal
@info info/gcal.info
@man man/man1/gcal.1
@man man/man1/gcal2txt.1
@man man/man1/tcal.1
@man man/man1/txt2gcal.1
share/examples/gcal/
share/examples/gcal/ansipic.rc
share/examples/gcal/birthday.rc
@ -36,9 +22,15 @@ share/examples/gcal/wtt1.rc
share/examples/gcal/wtt2.rc
share/examples/gcal/wtt3.rc
share/gcal/
share/gcal/CREDITS.dates
share/gcal/README.dates
share/gcal/CREDITS
share/gcal/Makefile.in
share/gcal/README
share/gcal/ancient
share/gcal/ansipic.rc
share/gcal/birthday.rc
share/gcal/bkk.rc
share/gcal/cal2gcal.awk
share/gcal/cal2gcal.pl
share/gcal/calendar.birth
share/gcal/calendar.chris
share/gcal/calendar.compu
@ -50,6 +42,10 @@ share/gcal/calendar.ushol
share/gcal/can_holiday
share/gcal/celtic
share/gcal/computing
share/gcal/ct2gcal.awk
share/gcal/ct2gcal.pl
share/gcal/de-mdata.rc
share/gcal/de-sdata.rc
share/gcal/events
share/gcal/events1
share/gcal/events2
@ -57,6 +53,7 @@ share/gcal/events3
share/gcal/events4
share/gcal/events5
share/gcal/events6
share/gcal/gcalrc
share/gcal/gdead
share/gcal/hawaii
share/gcal/literature
@ -68,75 +65,46 @@ share/gcal/lives4
share/gcal/lives5
share/gcal/lives6
share/gcal/lotr
share/gcal/misc/
share/gcal/misc/README
share/gcal/misc/daily/
share/gcal/misc/daily/daily
share/gcal/misc/daily/daily.awk
share/gcal/misc/daily/daily.pl
share/gcal/misc/daily/daily.rc
share/gcal/misc/ddiff/
share/gcal/misc/ddiff/ddiff
share/gcal/misc/ddiff/ddiff1.awk
share/gcal/misc/ddiff/ddiff1.pl
share/gcal/misc/ddiff/ddiff2.awk
share/gcal/misc/ddiff/ddiff2.pl
share/gcal/misc/ddiff/ddiffdrv
share/gcal/misc/ddiff/ddiffdrv.awk
share/gcal/misc/ddiff/ddiffdrv.pl
share/gcal/misc/ddiff/zone.tab
share/gcal/misc/dst/
share/gcal/misc/dst/dst
share/gcal/misc/dst/dst.awk
share/gcal/misc/dst/dst.pl
share/gcal/misc/gcalltx/
share/gcal/misc/gcalltx/gcalltx
share/gcal/misc/gcalltx/gcalltx.pl
share/gcal/misc/gcalltx/gcalltx.sed
share/gcal/misc/gcalmagic.add
share/gcal/misc/moon/
share/gcal/misc/moon/moon
share/gcal/misc/mrms/
share/gcal/misc/mrms/mrms
share/gcal/misc/mrms/mrms.awk
share/gcal/misc/mrms/mrms.pl
share/gcal/misc/mrms/mrms.rc
share/gcal/misc/srss/
share/gcal/misc/srss/srss
share/gcal/misc/srss/srss.awk
share/gcal/misc/srss/srss.pl
share/gcal/misc/srss/srss.rc
share/gcal/misc/wloc/
share/gcal/misc/wloc/wlocdrv
share/gcal/misc/wloc/wlocdrv1.awk
share/gcal/misc/wloc/wlocdrv1.pl
share/gcal/misc/wloc/wlocdrv2.awk
share/gcal/misc/wloc/wlocdrv2.pl
share/gcal/misc/wloc/zone.tab
share/gcal/mdata.rc
share/gcal/meteoric.rc
share/gcal/movies
share/gcal/ms.rc
share/gcal/music
share/gcal/old2v220.awk
share/gcal/old2v220.pl
share/gcal/radio
share/gcal/scripts/
share/gcal/scripts/cal2gcal.awk
share/gcal/scripts/cal2gcal.pl
share/gcal/scripts/ct2gcal.awk
share/gcal/scripts/ct2gcal.pl
share/gcal/scripts/old2v220.awk
share/gcal/scripts/old2v220.pl
share/gcal/scripts/v2x2v300.awk
share/gcal/scripts/v2x2v300.pl
share/gcal/sdata.rc
share/gcal/sfo
share/gcal/space
share/gcal/sports
share/gcal/sun-moon.rc
share/gcal/television
share/gcal/textpic.rc
share/gcal/usa_holiday
share/gcal/usa_other
share/gcal/usa_states
share/gcal/v2x2v300.awk
share/gcal/v2x2v300.pl
share/gcal/witchcraft
share/gcal/wloc.rc
share/gcal/world
share/gcal/wtt1.rc
share/gcal/wtt2.rc
share/gcal/wtt3.rc
share/locale/ca/LC_MESSAGES/gcal.mo
share/locale/da/LC_MESSAGES/gcal.mo
share/locale/de/LC_MESSAGES/gcal.mo
share/locale/es/LC_MESSAGES/gcal.mo
share/locale/fr/LC_MESSAGES/gcal.mo
share/locale/it/LC_MESSAGES/gcal.mo
share/locale/lt/
share/locale/lt/LC_MESSAGES/
share/locale/lt/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/rw/
share/locale/rw/LC_MESSAGES/
share/locale/rw/LC_MESSAGES/gcal.mo
share/locale/sv/LC_MESSAGES/gcal.mo
share/locale/tr/LC_MESSAGES/gcal.mo