5 files changed, 47 insertions, 15 deletions

diff --git a/misc/libmcal/Makefile b/misc/libmcal/Makefile
index e48fdbe5a68c..7d342af61d57 100644
--- a/misc/libmcal/Makefile
+++ b/misc/libmcal/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} mcaldrivers-0.9.tar.gz
 
-MAINTAINER=	thierry@pompo.net
+MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Modular Calendar Access Library
 
 USE_AUTOTOOLS=	libltdl:15
@@ -21,7 +21,7 @@ GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-mstore --with-icap \
 		--prefix=${PREFIX} --exec-prefix=${PREFIX}
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 WRKSRCDRV=	${WRKDIR}/mcal-drivers
@@ -29,6 +29,9 @@ WRKSRCDRV=	${WRKDIR}/mcal-drivers
 DOCS=		CHANGELOG FAQ-MCAL FEATURE-IMPLEMENTATION FUNCTION-REF.html \
 		HOW-TO-MCAL LICENSE README mstore/README.mstore
 
+PKGMESSAGE=	${WRKDIR}/pkg-message
+SUB_FILES=	pkg-message
+
 post-extract:
 	${CP} -pR ${WRKSRCDRV}/mstore ${WRKSRC}
 	${CP} -pR ${WRKSRCDRV}/icap ${WRKSRC}
@@ -41,10 +44,8 @@ post-extract:
 	${CHMOD} u+x ${WRKSRC}/configure
 	${MV} ${WRKSRC}/mstore/README ${WRKSRC}/mstore/README.mstore
 
-post-patch:
-	${REINPLACE_CMD} -e "s:/etc/mpasswd:${PREFIX}/etc/mpasswd:" ${WRKSRC}/mstore/mstore.c
-
 pre-configure:
+	${REINPLACE_CMD} -e "s:/etc/mpasswd:${PREFIX}/etc/mpasswd:" ${WRKSRC}/mstore/mstore.c
 	@${ECHO_MSG} "===>  Building the driver mstore"
 	cd ${WRKSRC}/mstore ; \
 		${MAKE}
@@ -65,7 +66,7 @@ post-install:
 	@${ECHO_MSG} "===>  Documentation installed in ${DOCSDIR}."
 .endif
 	@${ECHO}
-	@${CAT} ${PKGMESSAGE} | ${SED} -e "s:%%LOCALBASE%%:${LOCALBASE}:g"
+	@${CAT} ${PKGMESSAGE}
 	@${ECHO}
 
 .include <bsd.port.mk>
diff --git a/misc/libmcal/files/patch-icap_icap.c b/misc/libmcal/files/patch-icap_icap.c
new file mode 100644
index 000000000000..a8ad33f1399d
--- /dev/null
+++ b/misc/libmcal/files/patch-icap_icap.c
@@ -0,0 +1,11 @@
+--- icap/icap.c.orig	Tue Jan 28 18:31:33 2003
++++ icap/icap.c	Tue Mar 20 21:49:33 2007
+@@ -159,7 +159,7 @@
+ 	if (!reopen) {
+ 		if ((stream = calloc(1, sizeof(*stream))) == NULL)
+ 			goto fail;
+-		if ((DATA = calloc(1, sizeof(*DATA))) == NULL)
++		if ((stream->data = calloc(1, sizeof(*DATA))) == NULL)
+ 			goto fail;
+ 
+ 		/* Copy host. */
diff --git a/misc/libmcal/files/patch-mstore_mstore.c b/misc/libmcal/files/patch-mstore_mstore.c
new file mode 100644
index 000000000000..97f5155c9ac7
--- /dev/null
+++ b/misc/libmcal/files/patch-mstore_mstore.c
@@ -0,0 +1,20 @@
+--- mstore/mstore.c.orig	Tue Jan 28 18:31:33 2003
++++ mstore/mstore.c	Tue Mar 20 21:46:20 2007
+@@ -308,7 +308,7 @@
+ 	if (!reopen) {
+ 		if ((stream = calloc(1, sizeof(*stream))) == NULL)
+ 			goto fail;
+-		if ((DATA = calloc(1, sizeof(*DATA))) == NULL)
++		if ((stream->data = calloc(1, sizeof(*DATA))) == NULL)
+ 			goto fail;
+ 	}
+ 
+@@ -773,7 +773,7 @@
+         while((event=read_event(calfile))) {
+ 	  if (event->id == modified_event->id)
+ 	    {
+-	    (const CALEVENT*)event = modified_event;         
++	      event = modified_event;
+ 	  /*is more required here to assign objects, a loop through all the properties*/
+ 	    /*    We actually only want to modify any individual property, not the whole thing..
+ 		  TODO */
diff --git a/misc/libmcal/pkg-message b/misc/libmcal/files/pkg-message.in
index 8445baa8ee6b..8445baa8ee6b 100644
--- a/misc/libmcal/pkg-message
+++ b/misc/libmcal/files/pkg-message.in
diff --git a/misc/libmcal/pkg-plist b/misc/libmcal/pkg-plist
index 809c0592c38f..602017f236ee 100644
--- a/misc/libmcal/pkg-plist
+++ b/misc/libmcal/pkg-plist
@@ -8,12 +8,12 @@ lib/libmcal.a
 lib/libmcal.so
 lib/libmcal.so.0
 @dirrm include/mcal
-%%PORTDOCS%%share/doc/libmcal/CHANGELOG
-%%PORTDOCS%%share/doc/libmcal/FAQ-MCAL
-%%PORTDOCS%%share/doc/libmcal/FEATURE-IMPLEMENTATION
-%%PORTDOCS%%share/doc/libmcal/FUNCTION-REF.html
-%%PORTDOCS%%share/doc/libmcal/HOW-TO-MCAL
-%%PORTDOCS%%share/doc/libmcal/LICENSE
-%%PORTDOCS%%share/doc/libmcal/README
-%%PORTDOCS%%share/doc/libmcal/README.mstore
-%%PORTDOCS%%@dirrm share/doc/libmcal
+%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG
+%%PORTDOCS%%%%DOCSDIR%%/FAQ-MCAL
+%%PORTDOCS%%%%DOCSDIR%%/FEATURE-IMPLEMENTATION
+%%PORTDOCS%%%%DOCSDIR%%/FUNCTION-REF.html
+%%PORTDOCS%%%%DOCSDIR%%/HOW-TO-MCAL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.mstore
+%%PORTDOCS%%@dirrm %%DOCSDIR%%