[Midnightbsd-cvs] mports: Makefile: Cleaup stuff being done in both post-install and the

[ctriv at midnightbsd.org]

Log Message:
-----------
Cleaup stuff being done in both post-install and the plist.
Use bsd.mport.options.mk

Modified Files:
--------------
    mports/print/cups-base:
        Makefile (r1.16 -> r1.17)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/print/cups-base/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -L print/cups-base/Makefile -L print/cups-base/Makefile -u -r1.16 -r1.17
--- print/cups-base/Makefile
+++ print/cups-base/Makefile
@@ -68,27 +68,20 @@
 CUPSOWN=	cups
 CUPSSYSGRP=	wheel
 
-.include <bsd.port.pre.mk>
-
-.if defined(CUPS_OVERWRITE_BASE)
-PLIST_SUB+=		OVERWRITE=""
-.else
-PLIST_SUB+=		OVERWRITE="@comment "
-.endif
+.include <bsd.mport.options.mk>
 
 .if !defined(WITHOUT_GNUTLS)
 CONFIGURE_ARGS+=	--enable-gnutls --disable-openssl
 LIB_DEPENDS+=		gnutls-openssl.26:${PORTSDIR}/security/gnutls
 .else
+EXTENSIONS+=		openssl
 CONFIGURE_ARGS+=	--disable-gnutls --enable-openssl
-.include "${PORTSDIR}/Mk/bsd.openssl.mk"
 .endif
 
 .if defined(WITH_PHP)
 CONFIGURE_ARGS+=	--with-php
 USE_PHP=		yes
 PLIST_SUB+=		PHP=""
-.include "${PORTSDIR}/Mk/bsd.php.mk"
 .else
 CONFIGURE_ARGS+=	--without-php
 PLIST_SUB+=		PHP="@comment "
@@ -97,7 +90,6 @@
 .if defined(WITH_PYTHON)
 CONFIGURE_ARGS+=	--with-python
 USE_PYTHON=		yes
-.include "${PORTSDIR}/Mk/bsd.python.mk"
 .endif
 
 .if defined(WITH_LIBPAPER)
@@ -140,6 +132,15 @@
 RUN_DEPENDS=		xdg-open:${PORTSDIR}/devel/xdg-utils
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if defined(CUPS_OVERWRITE_BASE)
+PLIST_SUB+=		OVERWRITE=""
+.else
+PLIST_SUB+=		OVERWRITE="@comment "
+.endif
+
+
 MAN1EXT=	1
 MAN5EXT=	5
 MAN7EXT=	7
@@ -205,11 +206,8 @@
 		-e 's|/private/etc/pam.d|${LOCALBASE}/etc/pam.d|' \
 		${WRKSRC}/${CONFIGURE_SCRIPT}
 
-pre-su-install:
+pre-install:
 	@${INSTALL} -d ${DESKTOPDIR}/
-	if ! pw groupshow ${CUPSGRP}; then pw groupadd ${CUPSGRP} -g 193; fi
-	if ! pw usershow ${CUPSOWN}; then pw useradd ${CUPSOWN} -g ${CUPSGRP} -u 193 \
-		-h - -d ${NONEXISTENT} -s /usr/sbin/nologin -c "CUPS Owner"; fi
 .if defined(CUPS_OVERWRITE_BASE)
 	if test -e /usr/bin/lp; then ${CHMOD} -h 0 /usr/bin/lp; fi
 	if test -e /usr/bin/lpq; then ${CHMOD} -h 0 /usr/bin/lpq; fi
@@ -228,10 +226,5 @@
 .endfor
 	${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${FILESDIR}/lpt-cupsd.conf ${EXAMPLESDIR}/
-	${INSTALL} -d ${CUPS_SPOOLDIR}/tmp/
-	${CHOWN} -R ${CUPSOWN}:${CUPSGRP} ${CUPS_SPOOLDIR}/
-	${CHMOD} -R g+w ${CUPS_SPOOLDIR}/
-	${INSTALL} -d /var/cache/cups/
-	${CHOWN} root:${CUPSGRP} /var/cache/cups/
 
 .include <bsd.port.post.mk>