- Allow package build as user

- Style cleanups (no functional changes)

2 files changed, 25 insertions, 41 deletions

diff --git a/games/ldmud/Makefile b/games/ldmud/Makefile
index 525dbd1e25ba..a7b2085c979c 100644
--- a/games/ldmud/Makefile
+++ b/games/ldmud/Makefile
@@ -30,65 +30,43 @@ MAKE_JOBS_UNSAFE=	yes
 USERS=		mud
 GROUPS=		mud
 
-OPTIONS_DEFINE=	MYSQL PGSQL SQLITE IPV6 LPMUD
+OPTIONS_DEFINE=	MYSQL PGSQL SQLITE IPV6
 OPTIONS_DEFAULT=MYSQL PGSQL SQLITE IPV6 LPMUD
+OPTIONS_SINGLE=	MUDLIB
+OPTIONS_SINGLE_MUDLIB=	LPMUD DEMOLIB
+OPTIONS_SUB=	yes
 LPMUD_DESC=	Install default mudlib (LP-245)
+IPV6_CONFIGURE_ENABLE=	use-ipv6
+MYSQL_USE=		MYSQL=yes
+MYSQL_CONFIGURE_ENABLE=	use-mysql
+PGSQL_USE=		PGSQL=yes
+PGSQL_CONFIGURE_ENABLE=	use-pgsql
+SQLITE_USE=		SQLITE=yes
+SQLITE_CONFIGURE_ENABLE=use-sqlite
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MIPV6}
-CONFIGURE_ARGS+=--enable-use-ipv6
-.else
-CONFIGURE_ARGS+=--disable-use-ipv6
-.endif
-
 .if ${PORT_OPTIONS:MMYSQL}
-USE_MYSQL=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib/mysql
-CONFIGURE_ARGS+=--enable-use-mysql
-.else
-CONFIGURE_ARGS+=--disable-use-mysql
 .endif
 
-.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL=	yes
-CONFIGURE_ARGS+=--enable-use-pgsql
-.else
-CONFIGURE_ARGS+=--disable-use-pgsql
-.endif
-
-.if ${PORT_OPTIONS:MSQLITE}
-USE_SQLITE=	yes
-CONFIGURE_ARGS+=--enable-use-sqlite
-.else
-CONFIGURE_ARGS+=--disable-use-sqlite
-.endif
-
-.if ${PORT_OPTIONS:MLPMUD}
-PLIST_SUB+=	LPMUD="" DEMOLIB="@comment "
-.else
-PLIST_SUB+=	LPMUD="@comment " DEMOLIB=""
-.endif
-
-.include <bsd.port.pre.mk>
-
 post-install:
 #	# Install mudlib and other directories
 	@${MKDIR} ${STAGEDIR}${DATADIR} ${STAGEDIR}/var/log/${PORTNAME} \
 		${STAGEDIR}/var/run/${PORTNAME}
-	@${CHOWN} ${USERS}:${GROUPS} /var/log/${PORTNAME} /var/run/${PORTNAME}
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/ldmud
 .if ${PORT_OPTIONS:MLPMUD}
-	@cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}/mud/lp-245 && ${FIND} . \
-		| ${CPIO} -pdmu -R ${USERS}:${GROUPS} ${STAGEDIR}${DATADIR}
+	cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}/mud/lp-245 && ${FIND} . \
+		| ${CPIO} -pdmu ${STAGEDIR}${DATADIR}
 .else
-	@cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}/mudlib && ${FIND} . \
-		| ${CPIO} -pdmu -R ${USERS}:${GROUPS} ${STAGEDIR}${DATADIR}
+	cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}/mudlib && ${FIND} . \
+		| ${CPIO} -pdmu ${STAGEDIR}${DATADIR}
 .endif
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	@cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc && ${FIND} . \
-		| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}/doc && ${FIND} . \
+		| ${CPIO} -pdmu ${STAGEDIR}${DOCSDIR}
 	@${RM} -f ${STAGEDIR}${DOCSDIR}/Makefile
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/ldmud/pkg-plist b/games/ldmud/pkg-plist
index a1f731218769..c17132c6762b 100644
--- a/games/ldmud/pkg-plist
+++ b/games/ldmud/pkg-plist
@@ -1,5 +1,7 @@
 sbin/ldmud
 man/man1/ldmud.1.gz
+@owner mud
+@group mud
 %%LPMUD%%%%DATADIR%%/ACCESS.ALLOW
 %%LPMUD%%%%DATADIR%%/NEWS
 %%LPMUD%%%%DATADIR%%/README
@@ -510,6 +512,8 @@ man/man1/ldmud.1.gz
 %%DEMOLIB%%%%DATADIR%%/sys/tls.h
 %%DEMOLIB%%%%DATADIR%%/telnetneg.h
 %%DEMOLIB%%%%DATADIR%%/uni-crasher/crashleak.c
+@owner root
+@group wheel
 %%PORTDOCS%%%%DOCSDIR%%/man/ldmud.1
 %%PORTDOCS%%%%DOCSDIR%%/3.2vs3.2.1
 %%PORTDOCS%%%%DOCSDIR%%/FAQ
@@ -1397,5 +1401,7 @@ man/man1/ldmud.1.gz
 %%LPMUD%%@dirrm %%DATADIR%%/doc
 %%LPMUD%%@dirrm %%DATADIR%%/banish
 @dirrm %%DATADIR%%
+@owner mud
+@group mud
 @dirrmtry /var/run/ldmud
 @dirrmtry /var/log/ldmud