2 files changed, 30 insertions, 38 deletions

diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index a0ce55f6ec8e..8b0c299e3c88 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -13,55 +13,32 @@ MASTER_SITES=	SF/${PORTNAME}/MCrypt/${PORTVERSION} \
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	Replacement for crypt(1)
 
-LIB_DEPENDS=	mcrypt.8:${PORTSDIR}/security/libmcrypt \
-		mhash.2:${PORTSDIR}/security/mhash
+LIB_DEPENDS=	libmcrypt.so:${PORTSDIR}/security/libmcrypt \
+		libmhash.so:${PORTSDIR}/security/mhash
 
-USES=		gettext
 GNU_CONFIGURE=	yes
 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%%
+OPTIONS_DEFINE=	DOCS NLS EXAMPLES
+OPTIONS_SUB=	yes
+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
 
-PLIST=		${WRKDIR}/pkg-plist
-
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e '/malloc\.h/d' ${WRKSRC}/src/rfc2440.c
 
-pre-install:
-.for i in es_AR
-	@${ECHO_CMD} "@dirrmtry share/locale/${i}/LC_MESSAGES" >> ${PLIST}
-	@${ECHO_CMD} "@dirrmtry share/locale/${i}" >> ${PLIST}
-.endfor
+.include <bsd.port.options.mk>
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/src/mcrypt ${PREFIX}/bin/
-.for i in cs de el es_AR pl
-	${MKDIR} ${PREFIX}/share/locale/${i}/LC_MESSAGES
-	${INSTALL_DATA} ${WRKSRC}/po/${i}.gmo \
-		${PREFIX}/share/locale/${i}/LC_MESSAGES/mcrypt.mo
-.endfor
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/sample.mcryptrc ${EXAMPLESDIR}/
-	${INSTALL_MAN} ${WRKSRC}/doc/${MAN1} ${MANPREFIX}/man/man1/
-	${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/sample.mcryptrc ${EXAMPLESDIR}/
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for i in FORMAT magic
-	${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DOCSDIR}/
-.endfor
+post-install:
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/doc/sample.mcryptrc ${STAGEDIR}${EXAMPLESDIR}
+.endif
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	@cd  ${WRKSRC}/doc && ${INSTALL_DATA} FORMAT magic ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/security/mcrypt/pkg-plist b/security/mcrypt/pkg-plist
new file mode 100644
index 000000000000..72d888ca0c28
--- /dev/null
+++ b/security/mcrypt/pkg-plist
@@ -0,0 +1,15 @@
+bin/mcrypt
+bin/mdecrypt
+man/man1/mcrypt.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/FORMAT
+%%PORTDOCS%%%%DOCSDIR%%/magic
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sample.mcryptrc
+%%NLS%%share/locale/cs/LC_MESSAGES/mcrypt.mo
+%%NLS%%share/locale/de/LC_MESSAGES/mcrypt.mo
+%%NLS%%share/locale/el/LC_MESSAGES/mcrypt.mo
+%%NLS%%share/locale/es_AR/LC_MESSAGES/mcrypt.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/mcrypt.mo
+%%NLS%%@dirrmtry share/locale/es_AR/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/es_AR
+%%PORTEXAMPLES%%@dirrmtry %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrmtry %%DOCSDIR%%