Maintainer update: misc/libmcal: upgrading to v. 0.7.

	Upgrading to v. 0.7:
	This is not a major upgrade, but it removes a lot of patches
	from the ports tree!

PR:		ports/47608
Submitted by:	Thierry Thomas <thierry@pompo.net>

3 files changed, 32 insertions, 35 deletions

diff --git a/misc/libmcal/Makefile b/misc/libmcal/Makefile
index 063d2a90db7b..aa027c3d2438 100644
--- a/misc/libmcal/Makefile
+++ b/misc/libmcal/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	libmcal
-PORTVERSION=	0.6
-PORTREVISION=	2
+PORTVERSION=	0.7
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} mcaldrivers-0.8.tar.gz
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} mcaldrivers-0.9.tar.gz
 
 MAINTAINER=	thierry@pompo.net
 
diff --git a/misc/libmcal/distinfo b/misc/libmcal/distinfo
index 517736409802..cbaec951b1f2 100644
--- a/misc/libmcal/distinfo
+++ b/misc/libmcal/distinfo
@@ -1,2 +1,2 @@
-MD5 (libmcal-0.6.tar.gz) = b56ff2c9e989d1018f143e0f40290e94
-MD5 (mcaldrivers-0.8.tar.gz) = c9a005847d99585c0a7e46bb903ee9f4
+MD5 (libmcal-0.7.tar.gz) = 8d8f16e59a7e859c1407df3d72052825
+MD5 (mcaldrivers-0.9.tar.gz) = c8c96f6cd574139b88a13f6084164cfa
diff --git a/misc/libmcal/files/patch-ac b/misc/libmcal/files/patch-ac
index 02c433bafe1f..b466d23c7eb0 100644
--- a/misc/libmcal/files/patch-ac
+++ b/misc/libmcal/files/patch-ac
@@ -1,19 +1,17 @@
---- Makefile.in.orig	Tue Jan 25 04:08:10 2000
-+++ Makefile.in	Sun Oct 21 23:22:16 2001
-@@ -1,45 +1,63 @@
--# 	$Id: Makefile.in,v 1.2 2000/01/25 03:08:10 markie Exp $
--
+--- Makefile.in.orig	Tue Jan 28 18:45:21 2003
++++ Makefile.in	Tue Jan 28 23:17:26 2003
+@@ -1,56 +1,63 @@
+ # 	$Id: Makefile.in,v 1.5 2001/07/03 16:03:19 rufustfirefly Exp $
+ 
 -CC=gcc
 -FLEX=flex
-+# 	$Id: Makefile.in,v 1.5 2001/07/03 16:03:19 rufustfirefly Exp $
- 
 +FLEX=/usr/bin/flex
  
  @BOOTSTRAP@
  
  INCLUDE=@DRIVER_INCDIR@  ${OTHERINCDIR} -I.
  
--CFLAGS=-O0 -Wall -g ${INCLUDE}
+-CFLAGS=-O0 -Wall -g ${INCLUDE} ${OTHER_CFLAGS}
 +CFLAGS+=-Wall ${INCLUDE} ${OTHER_CFLAGS} -D_REENTRANT
  
  LIBOBJS=mcal.o datetime.o lex.ical_yy.o icalroutines.o cal_misc.o $(DRIVER_LIBS)
@@ -25,55 +23,55 @@
 +REV=0.6
 +
  LIBCAL=libmcal.a
-+LIBCAL_SO=libmcal.so
+ LIBCAL_SO=libmcal.so
  
--all: libmcal.a
+-all: libmcal.a libmcal.so
 +all: $(LIBCAL) $(LIBCAL_SO).$(REV)
  
--install: libmcal.a
--	mkdir /usr/local/mcal
--	mkdir /usr/local/mcal/lib
--	mkdir /usr/local/mcal/include
--	cp libmcal.a /usr/local/mcal/lib
--	cp mcal.h bool.h datetime.h drivers.h /usr/local/mcal/include
--libmcal.a: $(LIBOBJS)
+-install: libmcal.a libmcal.so
 +install: all
-+	mkdir -p ${DESTDIR}@prefix@/lib/
-+	mkdir -p ${DESTDIR}@prefix@/include/mcal/
+ 	mkdir -p ${DESTDIR}@prefix@/lib/
+ 	mkdir -p ${DESTDIR}@prefix@/include/mcal/
+-	install -m 755 -o 0 -g 0 libmcal.a libmcal.so ${DESTDIR}@prefix@/lib
 +	rm -f ${DESTDIR}@prefix@/lib/$(LIBCAL_SO)
 +	install -m 755 -o 0 -g 0 $(LIBCAL) $(LIBCAL_SO).0 ${DESTDIR}@prefix@/lib
 +	ln -s ${DESTDIR}@prefix@/lib/$(LIBCAL_SO).0 ${DESTDIR}@prefix@/lib/$(LIBCAL_SO)
-+	install -m 644 -o 0 -g 0 \
-+	  mcal.h bool.h datetime.h drivers.h cal_misc.h icalroutines.h \
-+	  ${DESTDIR}@prefix@/include/mcal/
-+	touch installed
-+
-+install-strip: installed
+ 	install -m 644 -o 0 -g 0 \
+ 	  mcal.h bool.h datetime.h drivers.h cal_misc.h icalroutines.h \
+ 	  ${DESTDIR}@prefix@/include/mcal/
+ 	touch installed
+ 
+ install-strip: installed
+-	strip ${DESTDIR}@prefix@/lib/libmcal.so
+-	strip ${DESTDIR}@prefix@/lib/libmcal.a
 +	strip ${DESTDIR}@prefix@/lib/$(LIBCAL_SO).$(REV)
 +	strip ${DESTDIR}@prefix@/lib/$(LIBCAL)
-+
+ 
+-libmcal.a: $(LIBOBJS)
 +$(LIBCAL): $(LIBOBJS)
  	rm -f $(LIBCAL)
  	ar r $(LIBCAL) $(LIBOBJS)
  
+-libmcal.so: $(LIBOBJS)
+-	rm -f $(LIBCAL_SO)
+-	gcc $(CFLAGS) -shared -o $(LIBCAL_SO) $(LIBOBJS)
 +$(LIBCAL_SO).$(REV): $(LIBOBJS)
 +	rm -f $@
 +	$(CC) $(CFLAGS) $(SHLIBLDFLAGS) -o $@ $(LIBOBJS)
 +	strip --strip-unneeded $@
 +	rm -f $(LIBCAL_SO).0
 +	ln -s $@ $(LIBCAL_SO).0
-+
+ 
  lex.ical_yy.c: icalscanner.lex
  	$(FLEX) $<
  
 -tester: tester.o libmcal.a
 -	gcc -Wall -g -o tester tester.o $(LIBCAL) -lcrypt
 +tester: tester.o $(LIBCAL)
-+	$(CC) $(CFLAGS) -Wall -g -o tester tester.o $(LIBCAL) -lcrypt
++	$(CC) $(CFLAGS) -g -o tester tester.o $(LIBCAL) -lcrypt
  
  clean:
--	rm -f *.o $(LIBCAL) tester  
-+	rm -f *.o *~ core $(LIBCAL) $(LIBCAL_SO) tester installed 
+ 	rm -f *.o *~ core $(LIBCAL) $(LIBCAL_SO) tester installed 
  
  distclean: clean
 -	rm -f  config.cache  config.status config.log Makefile drivers.c drivers.h bootstrap.in