Enable stage support

3 files changed, 26 insertions, 17 deletions

diff --git a/games/ldmud/Makefile b/games/ldmud/Makefile
index b38ecb3744ce..473176f32030 100644
--- a/games/ldmud/Makefile
+++ b/games/ldmud/Makefile
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.bearnip.com/ftp/mud/ \
 MAINTAINER=	johans@FreeBSD.org
 COMMENT=	A modern version of the LPMud game driver
 
-LIB_DEPENDS=	pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
 
 GNU_CONFIGURE=	yes
 USE_OPENSSL=	yes
@@ -23,9 +23,7 @@ CONFIGURE_ARGS+=--libdir=${DATADIR} \
 		--enable-use-tls=ssl
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 ALL_TARGET=	ldmud
-MAN1=		ldmud.1
 USE_RC_SUBR=	ldmud
-SUB_LIST+=	LDUSER=${USERS}
 MAKE_JOBS_UNSAFE=	yes
 
 USERS=		mud
@@ -35,9 +33,6 @@ OPTIONS_DEFINE=	MYSQL PGSQL SQLITE IPV6 LPMUD
 OPTIONS_DEFAULT=MYSQL PGSQL SQLITE IPV6 LPMUD
 LPMUD_DESC=	Install default mudlib (LP-245)
 
-PORTSCOUT=	skipv:3.4.2
-
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MIPV6}
@@ -78,20 +73,21 @@ PLIST_SUB+=	LPMUD="@comment " DEMOLIB=""
 
 post-install:
 #	# Install mudlib and other directories
-	@${MKDIR} ${DATADIR} /var/log/${PORTNAME} /var/run/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}/var/log/${PORTNAME} \
+		${STAGEDIR}/var/run/${PORTNAME}
 	@${CHOWN} ${USERS}:${GROUPS} /var/log/${PORTNAME} /var/run/${PORTNAME}
 .if ${PORT_OPTIONS:MLPMUD}
 	@cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}/mud/lp-245 && ${FIND} . \
-		| ${CPIO} -pdmu -R ${USERS}:${GROUPS} ${DATADIR}
+		| ${CPIO} -pdmu -R ${USERS}:${GROUPS} ${STAGEDIR}${DATADIR}
 .else
 	@cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}/mudlib && ${FIND} . \
-		| ${CPIO} -pdmu -R ${USERS}:${GROUPS} ${DATADIR}
+		| ${CPIO} -pdmu -R ${USERS}:${GROUPS} ${STAGEDIR}${DATADIR}
 .endif
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc && ${FIND} . \
-		| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
-	@${RM} -f ${DOCSDIR}/Makefile
+		| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR}
+	@${RM} -f ${STAGEDIR}${DOCSDIR}/Makefile
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/games/ldmud/files/patch-Makefile.in b/games/ldmud/files/patch-Makefile.in
new file mode 100644
index 000000000000..5c043c2a5825
--- /dev/null
+++ b/games/ldmud/files/patch-Makefile.in
@@ -0,0 +1,15 @@
+--- Makefile.in.orig	2013-12-29 15:19:34.000000000 +0100
++++ Makefile.in	2013-12-29 15:20:35.000000000 +0100
+@@ -135,9 +135,9 @@ install: install-driver
+ 	@echo "To install everything in one go, use 'make install-all'."
+ 
+ install-driver: ldmud@EXEEXT@ docs
+-	$(mkinstalldirs) $(BINDIR) $(MANDIR)/man1
+-	$(INSTALL) -c ldmud@EXEEXT@ $(BINDIR)/ldmud@EXEEXT@
+-	$(INSTALL) -c ../doc/man/ldmud.1 $(MANDIR)/man1/ldmud.1
++	$(mkinstalldirs) $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
++	$(INSTALL) -c ldmud@EXEEXT@ $(DESTDIR)$(BINDIR)/ldmud@EXEEXT@
++	$(INSTALL) -c ../doc/man/ldmud.1 $(DESTDIR)$(MANDIR)/man1/ldmud.1
+ 
+ install-headers: 
+ 	$(mkinstalldirs) $(MUD_LIB_INCLUDE)
diff --git a/games/ldmud/pkg-plist b/games/ldmud/pkg-plist
index 3e160d333b32..a1f731218769 100644
--- a/games/ldmud/pkg-plist
+++ b/games/ldmud/pkg-plist
@@ -1,4 +1,5 @@
 sbin/ldmud
+man/man1/ldmud.1.gz
 %%LPMUD%%%%DATADIR%%/ACCESS.ALLOW
 %%LPMUD%%%%DATADIR%%/NEWS
 %%LPMUD%%%%DATADIR%%/README
@@ -1396,8 +1397,5 @@ sbin/ldmud
 %%LPMUD%%@dirrm %%DATADIR%%/doc
 %%LPMUD%%@dirrm %%DATADIR%%/banish
 @dirrm %%DATADIR%%
-@cwd /var
-@exec mkdir -p run/ldmud log/ldmud
-@exec chown %%LDUSER%% run/ldmud log/ldmud
-@dirrmtry run/ldmud
-@dirrmtry log/ldmud
+@dirrmtry /var/run/ldmud
+@dirrmtry /var/log/ldmud