4 files changed, 22 insertions, 19 deletions

diff --git a/emulators/linux-peops-softgpu/Makefile b/emulators/linux-peops-softgpu/Makefile
index 21b6c0a64da4..9e5d85ee8cae 100644
--- a/emulators/linux-peops-softgpu/Makefile
+++ b/emulators/linux-peops-softgpu/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	peops-softgpu
-PORTVERSION=	1.15
-PORTREVISION=	1
+PORTVERSION=	1.16
 CATEGORIES=	emulators linux
-MASTER_SITES=	http://home.t-online.de/home/PeteBernert/
+MASTER_SITES=	http://www.pbernert.com/
 PKGNAMEPREFIX=	linux-
-DISTNAME=	gpupeopssoftx115
+DISTNAME=	gpupeopssoftx${MAJOR}${MINOR}
 
 MAINTAINER=	jylefort@brutele.be
 COMMENT=	A PSEmu Pro GPU plugin using a software X11 renderer (Linux version)
@@ -28,6 +27,10 @@ ONLY_FOR_ARCHS=	i386
 # because as a side effect it brands the binary as FreeBSD.
 STRIP=
 
+MAJOR=		${PORTVERSION:R}
+MINOR=		${PORTVERSION:E}
+PLIST_SUB+=	MAJOR=${MAJOR} MINOR=${MINOR}
+
 .include <bsd.port.pre.mk>
 
 PSEMUPRO_PLUGINS_DIR=	${LOCALBASE}/lib/psemupro/plugins
@@ -36,7 +39,7 @@ PSEMUPRO_CFGFILES_DIR=	${LOCALBASE}/share/psemupro/cfg
 
 do-install:
 	${MKDIR} ${PSEMUPRO_PLUGINS_DIR}
-	${INSTALL_PROGRAM} ${WRKSRC}/libgpuPeopsSoftX.so.1.0.15 ${PSEMUPRO_PLUGINS_DIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/libgpuPeopsSoftX.so.${MAJOR}.0.${MINOR} ${PSEMUPRO_PLUGINS_DIR}
 
 	${MKDIR} ${PSEMUPRO_CFGBINS_DIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/cfgPeopsSoft ${PSEMUPRO_CFGBINS_DIR}
@@ -47,8 +50,8 @@ do-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} \
-		${WRKSRC}/peops_soft_readme_1_15.txt \
-		${WRKSRC}/peops_soft_version_1_15.txt \
+		${WRKSRC}/peops_soft_readme_${MAJOR}_${MINOR}.txt \
+		${WRKSRC}/peops_soft_version_${MAJOR}_${MINOR}.txt \
 		${DOCSDIR}
 .endif
 
diff --git a/emulators/linux-peops-softgpu/distinfo b/emulators/linux-peops-softgpu/distinfo
index ac7ba98816a2..2b625c1729a0 100644
--- a/emulators/linux-peops-softgpu/distinfo
+++ b/emulators/linux-peops-softgpu/distinfo
@@ -1,2 +1,2 @@
-MD5 (gpupeopssoftx115.tar.gz) = 890391e4a9a1b9b4e5954ab69a4011df
-SIZE (gpupeopssoftx115.tar.gz) = 151939
+MD5 (gpupeopssoftx116.tar.gz) = ae1f75b736b283d0b6aa916f022a54d5
+SIZE (gpupeopssoftx116.tar.gz) = 165653
diff --git a/emulators/linux-peops-softgpu/pkg-descr b/emulators/linux-peops-softgpu/pkg-descr
index b719f953bd03..e407f8d755ca 100644
--- a/emulators/linux-peops-softgpu/pkg-descr
+++ b/emulators/linux-peops-softgpu/pkg-descr
@@ -1,6 +1,6 @@
 P.E.Op.S. Soft GPU is a PSEmu Pro GPU plugin using a software X11 renderer.
 
-This is the Linux version, tested with emulators/linux-epsxe.
+This is the Linux version, tested with emulators/linux-ePSXe.
 
 WWW: http://sourceforge.net/projects/peops/
 
diff --git a/emulators/linux-peops-softgpu/pkg-plist b/emulators/linux-peops-softgpu/pkg-plist
index a055ae2b738a..e0cb1a95fd8e 100644
--- a/emulators/linux-peops-softgpu/pkg-plist
+++ b/emulators/linux-peops-softgpu/pkg-plist
@@ -1,12 +1,12 @@
-lib/psemupro/plugins/libgpuPeopsSoftX.so.1.0.15
+lib/psemupro/plugins/libgpuPeopsSoftX.so.%%MAJOR%%.0.%%MINOR%%
 libexec/psemupro/cfg/cfgPeopsSoft
 share/psemupro/cfg/gpuPeopsSoftX.cfg
-@dirrm lib/psemupro/plugins
-@dirrm lib/psemupro
-@dirrm libexec/psemupro/cfg
-@dirrm libexec/psemupro
-@dirrm share/psemupro/cfg
-@dirrm share/psemupro
-%%PORTDOCS%%%%DOCSDIR%%/peops_soft_readme_1_15.txt
-%%PORTDOCS%%%%DOCSDIR%%/peops_soft_version_1_15.txt
+@unexec rmdir %D/lib/psemupro/plugins 2>/dev/null || true
+@unexec rmdir %D/lib/psemupro 2>/dev/null || true
+@unexec rmdir %D/libexec/psemupro/cfg 2>/dev/null || true
+@unexec rmdir %D/libexec/psemupro 2>/dev/null || true
+@unexec rmdir %D/share/psemupro/cfg 2>/dev/null || true
+@unexec rmdir %D/share/psemupro 2>/dev/null || true
+%%PORTDOCS%%%%DOCSDIR%%/peops_soft_readme_%%MAJOR%%_%%MINOR%%.txt
+%%PORTDOCS%%%%DOCSDIR%%/peops_soft_version_%%MAJOR%%_%%MINOR%%.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%