3 files changed, 25 insertions, 29 deletions

diff --git a/sysutils/userneu-devel/Makefile b/sysutils/userneu-devel/Makefile
index 6b33a94d1c6b..532c14fa4e7c 100644
--- a/sysutils/userneu-devel/Makefile
+++ b/sysutils/userneu-devel/Makefile
@@ -6,40 +6,37 @@
 #
 
 PORTNAME=	userneu
-PORTVERSION=	1.36
+PORTVERSION=	1.38
 CATEGORIES=	sysutils
 MASTER_SITES=	http://btmdx8.mat.uni-bayreuth.de/~johannes/files/userneu/ \
 		http://home.arcor.de/fehlner/inhalt/download/
+DISTNAME=	${PORTNAME}-${PORTVERSION}_1
 
 MAINTAINER=	fehlner@gmx.de
 COMMENT=	Account management and creation tool
 
 RUN_DEPENDS=	\
-${SITE_PERL}/Crypt/PasswdMD5.pm:${PORTSDIR}/security/p5-Crypt-PasswdMD5/ \
-${SITE_PERL}/Crypt/RandPasswd.pm:${PORTSDIR}/security/p5-Crypt-RandPasswd/ \
-${SITE_PERL}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5/
+    ${SITE_PERL}/Crypt/PasswdMD5.pm:${PORTSDIR}/security/p5-Crypt-PasswdMD5/ \
+    ${SITE_PERL}/Crypt/RandPasswd.pm:${PORTSDIR}/security/p5-Crypt-RandPasswd/ \
+    ${SITE_PERL}/Digest/MD5.pm:${PORTSDIR}/security/p5-Digest-MD5/
 
-WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
-GLOCATE=	${PREFIX}/${PORTNAME}
 USE_PERL5=	yes
 NO_BUILD=	yes
 
-USE_IMAGE=	yes
-MANCOMPRESSED=	no
-MAN8=	userneu.8 userquick.8
-
-DOCS=	BUGS CHANGES COPYING CREDITS REQUIREMENTS TODO doc/README doc/INSTALL doc/userneu.pod doc/userquick.pod
+SCRIPTS=	userneu.pl userquick.pl smbrepair.pl
+MAN8=		userneu.8 userquick.8
+DOCS=		BUGS CHANGES CREDITS REQUIREMENTS TODO \
+		doc/README doc/INSTALL doc/userneu.pod doc/userquick.pod
 EXAMPLES=	list-sample
 
 do-install:
-	${MKDIR} ${GLOCATE}
-	${INSTALL_MAN} 	${WRKSRC}/doc/userneu.8 ${PREFIX}/man/man8
-	${INSTALL_MAN}	${WRKSRC}/doc/userquick.8 ${PREFIX}/man/man8
-	${INSTALL_SCRIPT} ${WRKSRC}/userneu.pl ${PREFIX}/sbin
-	${INSTALL_SCRIPT} ${WRKSRC}/userquick.pl ${PREFIX}/sbin
+	cd ${WRKSRC}/doc && ${INSTALL_MAN} ${MAN8} ${MANPREFIX}/man/man8
+	cd ${WRKSRC} && ${INSTALL_SCRIPT} ${SCRIPTS} ${PREFIX}/sbin
 	@${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${EXAMPLES} ${EXAMPLESDIR}
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/userneu-devel/distinfo b/sysutils/userneu-devel/distinfo
index 83890adbade7..54f6edf21088 100644
--- a/sysutils/userneu-devel/distinfo
+++ b/sysutils/userneu-devel/distinfo
@@ -1 +1 @@
-MD5 (userneu-1.36.tar.gz) = 67ddcaf8539c62c9645ef6b405c04be2
+MD5 (userneu-1.38_1.tar.gz) = 069cfe28ab1b8eed8a7847c9f9e3fb87
diff --git a/sysutils/userneu-devel/pkg-plist b/sysutils/userneu-devel/pkg-plist
index 4037215ec06d..931417cbb340 100644
--- a/sysutils/userneu-devel/pkg-plist
+++ b/sysutils/userneu-devel/pkg-plist
@@ -1,16 +1,15 @@
 sbin/userneu.pl
 sbin/userquick.pl
-%%DOCSDIR%%/BUGS
-%%DOCSDIR%%/CHANGES
-%%DOCSDIR%%/COPYING
-%%DOCSDIR%%/REQUIREMENTS
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/README
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/CREDITS
-%%DOCSDIR%%/userneu.pod
-%%DOCSDIR%%/userquick.pod
+sbin/smbrepair.pl
+%%PORTDOCS%%%%DOCSDIR%%/BUGS
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/REQUIREMENTS
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/CREDITS
+%%PORTDOCS%%%%DOCSDIR%%/userneu.pod
+%%PORTDOCS%%%%DOCSDIR%%/userquick.pod
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 %%EXAMPLESDIR%%/list-sample
-@dirrm %%DOCSDIR%%
 @dirrm %%EXAMPLESDIR%%
-@dirrm userneu