[Midnightbsd-cvs] mports: Makefile: The previous one wasn't quite right.

[laffer1 at midnightbsd.org]

Log Message:
-----------
The previous one wasn't quite right.

Modified Files:
--------------
    mports/security/mcrypt:
        Makefile (r1.3 -> r1.4)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/security/mcrypt/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L security/mcrypt/Makefile -L security/mcrypt/Makefile -u -r1.3 -r1.4
--- security/mcrypt/Makefile
+++ security/mcrypt/Makefile
@@ -3,8 +3,6 @@
 # Whom:					trevor
 # based on the OpenBSD port
 #
-# $OpenBSD: Makefile,v 1.1.1.1 2000/11/27 15:56:03 avsm Exp $
-# $FreeBSD: ports/security/mcrypt/Makefile,v 1.35 2006/02/11 21:03:07 netchild Exp $
 # $MidnightBSD$
 #
 
@@ -15,7 +13,7 @@
 		ftp://argeas.cs-net.gr/pub/unix/mcrypt/attic/ \
 		ftp://ftp.ntua.gr/pub/security/mcrypt/ \
 		ftp://mcrypt.hellug.gr/pub/mcrypt/attic/
-MASTER_SITE_SUBDIR=	mcrypt
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Replacement for crypt(1)
@@ -24,42 +22,34 @@
 LIB_DEPENDS=	mcrypt.8:${PORTSDIR}/security/libmcrypt \
 		mhash.2:${PORTSDIR}/security/mhash
 
-USE_AUTOTOOLS=	autoconf:261:env
-USE_GETTEXT=		yes
-CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
-CONFIGURE_ARGS+=	--enable-static --with-catgets
-CONFIGURE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -lintl"
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd6.0
-GNU_CONFIGURE=		yes
-DOCS=			FORMAT magic
-MAN1=			mcrypt.1
-PKGMESSAGE=		${WRKDIR}/pkg-message
-PLIST=			${WRKDIR}/pkg-plist
-
-# to avoid having to read the configure script
-pre-configure:
-	cd ${WRKSRC} && ${RM} configure && ${AUTOCONF}
+USE_GETTEXT=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd6.0
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib -lintl"
+CONFIGURE_ARGS=	--enable-static --with-catgets
+
+MAN1=		mcrypt.1
+PORTDOCS=	FORMAT magic
+PLIST_FILES=	bin/mcrypt \
+		%%EXAMPLESDIR%%/sample.mcryptrc \
+		share/locale/cs/LC_MESSAGES/mcrypt.mo \
+		share/locale/de/LC_MESSAGES/mcrypt.mo \
+		share/locale/el/LC_MESSAGES/mcrypt.mo \
+		share/locale/es_AR/LC_MESSAGES/mcrypt.mo \
+		share/locale/pl/LC_MESSAGES/mcrypt.mo
+PLIST_DIRS=	%%EXAMPLESDIR%%
+
+PLIST=		${WRKDIR}/pkg-plist
+
+post-patch:
+	${REINPLACE_CMD} -e '/malloc\.h/d' ${WRKSRC}/src/rfc2440.c
 
 pre-install:
-	${ECHO_CMD} bin/${PORTNAME} > ${PLIST}
-.for i in cs de el es_AR pl
-	${ECHO_CMD} share/locale/${i}/LC_MESSAGES/mcrypt.mo >> ${PLIST}
-	${ECHO_CMD} @dirrmtry share/locale/${i}/LC_MESSAGES >> ${PLIST}
-	${ECHO_CMD} @dirrmtry share/locale/${i} >> ${PLIST}
-.endfor
-.if !defined(NOPORTDOCS)
-	${ECHO_CMD} share/examples/${PORTNAME}/sample.mcryptrc >> ${PLIST}
-	${ECHO_CMD} @dirrm share/examples/${PORTNAME} >> ${PLIST}
-.for i in ${DOCS}
-	${ECHO_CMD} share/doc/${PORTNAME}/${i} >> ${PLIST}
+.for i in es_AR
+	@${ECHO_CMD} "@dirrmtry share/locale/${i}/LC_MESSAGES" >> ${PLIST}
+	@${ECHO_CMD} "@dirrmtry share/locale/${i}" >> ${PLIST}
 .endfor
-	${ECHO_CMD} @dirrm share/doc/${PORTNAME} >> ${PLIST}
-.endif
-	${ECHO_CMD} "*** WARNING ***" > ${PKGMESSAGE}
-	${ECHO_CMD} \
-"The source for this package has not been reviewed by the FreeBSD maintainer." \
-		>> ${PKGMESSAGE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/mcrypt ${PREFIX}/bin/
@@ -71,10 +61,11 @@
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/sample.mcryptrc ${EXAMPLESDIR}/
 	${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${MANPREFIX}/man/man1/
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/examples/${PORTNAME} ${DOCSDIR}
+	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/sample.mcryptrc ${EXAMPLESDIR}/
-.for i in ${DOCS}
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+.for i in FORMAT magic
 	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}/
 .endfor
 .endif