Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 29 Dec 2013 14:37:13 +0000 (UTC)
From:      Johan van Selst <johans@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r337994 - in head/games/ldmud: . files
Message-ID:  <201312291437.rBTEbD53069259@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: johans
Date: Sun Dec 29 14:37:13 2013
New Revision: 337994
URL: http://svnweb.freebsd.org/changeset/ports/337994

Log:
  Enable stage support

Added:
  head/games/ldmud/files/patch-Makefile.in   (contents, props changed)
Modified:
  head/games/ldmud/Makefile
  head/games/ldmud/pkg-plist

Modified: head/games/ldmud/Makefile
==============================================================================
--- head/games/ldmud/Makefile	Sun Dec 29 14:33:42 2013	(r337993)
+++ head/games/ldmud/Makefile	Sun Dec 29 14:37:13 2013	(r337994)
@@ -12,7 +12,7 @@ MASTER_SITES=	http://www.bearnip.com/ftp
 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 
 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>

Added: head/games/ldmud/files/patch-Makefile.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/games/ldmud/files/patch-Makefile.in	Sun Dec 29 14:37:13 2013	(r337994)
@@ -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)

Modified: head/games/ldmud/pkg-plist
==============================================================================
--- head/games/ldmud/pkg-plist	Sun Dec 29 14:33:42 2013	(r337993)
+++ head/games/ldmud/pkg-plist	Sun Dec 29 14:37:13 2013	(r337994)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312291437.rBTEbD53069259>