- Fix MASTER_SITES

- Utilize DATADIR/DOCSDIR

PR:		56002
Submitted by:	Ports Fury

2 files changed, 14 insertions, 16 deletions

diff --git a/games/3dpong/Makefile b/games/3dpong/Makefile
index d545717163da..816cf3a2be4b 100644
--- a/games/3dpong/Makefile
+++ b/games/3dpong/Makefile
@@ -8,28 +8,26 @@
 PORTNAME=	3dpong
 PORTVERSION=	0.4
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/3dpong/
+MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/3dpong/src/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	X Window 3D Pong game for 1 or 2 players with a ball and paddles
 
-MAKEFILE=	makefile
-USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
+MAKEFILE=	makefile
 
 post-patch:
 	@${REINPLACE_CMD} -e 's.	chmod .	${CHMOD} .g' \
 		${WRKSRC}/makefile
 
 do-install:
-	@ ${INSTALL_PROGRAM} ${WRKSRC}/3dpong ${PREFIX}/bin
-	@ ${MKDIR} ${PREFIX}/share/3dpong
-	@ ${INSTALL_DATA} ${WRKSRC}/sounds/*.au ${PREFIX}/share/3dpong
-
-post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/3dpong ${PREFIX}/bin
+	@${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/sounds/*.au ${DATADIR}
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/3dpong
-	@ ${INSTALL_DATA} ${WRKSRC}/README.txt ${PREFIX}/share/doc/3dpong
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/3dpong/pkg-plist b/games/3dpong/pkg-plist
index 983b7f9bea5c..820afa5a424d 100644
--- a/games/3dpong/pkg-plist
+++ b/games/3dpong/pkg-plist
@@ -1,7 +1,7 @@
 bin/3dpong
-share/3dpong/hit.au
-share/3dpong/score.au
-share/3dpong/wall.au
-%%PORTDOCS%%share/doc/3dpong/README.txt
-@dirrm share/3dpong
-%%PORTDOCS%%@dirrm share/doc/3dpong
+%%DATADIR%%/hit.au
+%%DATADIR%%/score.au
+%%DATADIR%%/wall.au
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%