diff -urN /usr/ports/games/prboom/Makefile prboom/Makefile
--- /usr/ports/games/prboom/Makefile	Sat Mar  5 05:34:54 2005
+++ prboom/Makefile	Sat Sep 17 20:54:59 2005
@@ -16,30 +16,36 @@
 
 LIB_DEPENDS=	smpeg.1:${PORTSDIR}/multimedia/smpeg
 
-USE_SDL=	mixer net sdl
 USE_GMAKE=	yes
+USE_SDL=	mixer net sdl
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CFLAGS+="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS+=--disable-cpu-opt
 
+OPTIONS=	GL "Enable OpenGL support" on
+
 MAN5=		boom.cfg.5
 MAN6=		prboom.6 prboom-game-server.6
 
+DATADIR=	${DMDIR}
+
+.include "${.CURDIR}/../doom-data/Makefile.include"
+
+.include <bsd.port.pre.mk>
+
 .if defined(WITH_GL)
 CONFIGURE_ARGS+=--enable-gl
-USE_GL= 	yes
+USE_GL=		yes
 .endif
 
-.include <bsd.port.pre.mk>
-
 post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/prboom
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/prboom
-	${INSTALL_DATA} ${WRKSRC}/doc/README.compat ${PREFIX}/share/doc/prboom
-	${INSTALL_DATA} ${WRKSRC}/doc/README.demos ${PREFIX}/share/doc/prboom
-	${INSTALL_DATA} ${WRKSRC}/doc/boom.txt ${PREFIX}/share/doc/prboom
+	${MKDIR} ${DOCSDIR}
+.   for f in README doc/README.compat doc/README.demos doc/boom.txt
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.   endfor
 .endif
 
 .include <bsd.port.post.mk>
diff -urN /usr/ports/games/prboom/pkg-plist prboom/pkg-plist
--- /usr/ports/games/prboom/pkg-plist	Mon Jul  9 21:24:46 2001
+++ prboom/pkg-plist	Sat Sep 17 20:53:10 2005
@@ -1,9 +1,8 @@
 bin/prboom
 bin/prboom-game-server
-share/doom/prboom.wad
-@dirrm share/doom
-%%PORTDOCS%%share/doc/prboom/README
-%%PORTDOCS%%share/doc/prboom/README.compat
-%%PORTDOCS%%share/doc/prboom/README.demos
-%%PORTDOCS%%share/doc/prboom/boom.txt
-%%PORTDOCS%%@dirrm share/doc/prboom
+%%DATADIR%%/prboom.wad
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.compat
+%%PORTDOCS%%%%DOCSDIR%%/README.demos
+%%PORTDOCS%%%%DOCSDIR%%/boom.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%