Bug 184923 - databases/phpmyadmin : optional dependency on expired www/suphp
Summary: databases/phpmyadmin : optional dependency on expired www/suphp
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Matthew Seaman
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-17 09:30 UTC by Rene Ladan
Modified: 2013-12-17 17:07 UTC (History)
0 users

See Also:


Attachments
file.diff (377 bytes, patch)
2013-12-17 09:30 UTC, Rene Ladan
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Rene Ladan freebsd_committer freebsd_triage 2013-12-17 09:30:00 UTC
databases/phpmyadmin optionally depends on www/suphp, which is expired.
Mark the port as deprecated in this case.

Fix: Patch attached with submission follows:
How-To-Repeat: Tools/scripts/rmport www/suphp
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-12-17 09:30:14 UTC
Responsible Changed
From-To: freebsd-ports-bugs->matthew

Over to maintainer (via the GNATS Auto Assign Tool)
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-12-17 13:56:31 UTC
Author: matthew
Date: Tue Dec 17 13:56:24 2013
New Revision: 336725
URL: http://svnweb.freebsd.org/changeset/ports/336725

Log:
  Drop the SUPHP option as the www/suphp port has expired.
  
  General cleanup:
  
     pkg-install and pkg-deinstall are redundant: it's all handled by
     @exec and @unexec actions in pkg-plist.
  
  PR:		ports/184923
  Submitted by:	rene

Deleted:
  head/databases/phpmyadmin/files/pkg-deinstall.in
  head/databases/phpmyadmin/files/pkg-install.in
Modified:
  head/databases/phpmyadmin/Makefile

Modified: head/databases/phpmyadmin/Makefile
==============================================================================
--- head/databases/phpmyadmin/Makefile	Tue Dec 17 13:54:02 2013	(r336724)
+++ head/databases/phpmyadmin/Makefile	Tue Dec 17 13:56:24 2013	(r336725)
@@ -3,6 +3,7 @@
 
 PORTNAME=	phpMyAdmin
 DISTVERSION=	4.1.0
+PORTREVISION=	1
 CATEGORIES=	databases www
 MASTER_SITES=	SF/${PORTNAME:L}/${PORTNAME}/${DISTVERSION}
 DISTNAME=	${PORTNAME}-${DISTVERSION}-all-languages
@@ -25,8 +26,7 @@ USE_PHP=	ctype session filter mbstring j
 # want this, either turn off GD in the config dialog, or else turn off
 # FONTCONFIG in the graphics/gd port options.
 
-PHP_MODULE_OPTIONS=	APC BZ2 GD MCRYPT OPENSSL PDF XML ZIP ZLIB
-OPTIONS_DEFINE=		SUPHP ${PHP_MODULE_OPTIONS}
+OPTIONS_DEFINE=		APC BZ2 GD MCRYPT OPENSSL PDF XML ZIP ZLIB
 OPTIONS_DEFAULT=	APC BZ2 GD MCRYPT MYSQLI OPENSSL PDF XML ZIP ZLIB
 
 OPTIONS_MULTI=		DB_connect
@@ -40,52 +40,30 @@ MYSQLI_DESC=	PHP Improved MySQL client s
 MYSQL_DESC=	PHP MySQL support via mysql client
 OPENSSL_DESC=	PHP OpenSSL support
 PDF_DESC=	PHP PDFlib support
-SUPHP_DESC=	suPHP support
 XML_DESC=	PHP XML support (Export to OpenDoc)
 ZIP_DESC=	PHP Zip compression support
 ZLIB_DESC=	PHP ZLIB support
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MSUPHP}
-
-PKGNAMESUFFIX=	-suphp
-RUN_DEPENDS+=	${LOCALBASE}/sbin/suphp:${PORTSDIR}/www/suphp
-WANT_PHP_CGI=	yes
-
-.else
-
 WANT_PHP_WEB=	yes
 
-.endif
-
-# USERS is only used with the SUPHP option
 GROUPS?=	${WWWGRP}
 CFG_FILE=	config.inc.php
 
 PLIST=		${WRKDIR}/plist
 PLIST_SUB+=	PMA_GRP=${GROUPS}
 
-.if ${PORT_OPTIONS:MSUPHP}
-
-USERS?=		_pma
-SUPHP_ENABLED=	yes
-
-.endif
-
 SUB_LIST+=	PKGNAME=${PKGNAME}	       \
-		PMA_USR=${USERS}	       \
-		PMA_GRP=${GROUPS}	       \
-		CFG_FILE=${WWWDIR}/${CFG_FILE} \
-		SUPHP_ENABLED=${SUPHP_ENABLED}
-SUB_FILES+=	pkg-install pkg-deinstall pkg-message
+		CFG_FILE=${WWWDIR}/${CFG_FILE}
+SUB_FILES+=	pkg-message
 
 SHEBANG_FILES=	libraries/plugins/transformations/generator_main_class.sh \
 		libraries/plugins/transformations/generator_plugin.sh
 
 .if !defined(WITHOUT_PHP_DEPENDS)
 
-.for opt in ${PHP_MODULE_OPTIONS} ${OPTIONS_MULTI_DB_connect}
+.for opt in ${OPTIONS_DEFINE} ${OPTIONS_MULTI_DB_connect}
 .    if ${PORT_OPTIONS:M${opt}}
 USE_PHP+=	${opt:L}
 .    endif
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 3 Matthew Seaman freebsd_committer freebsd_triage 2013-12-17 17:06:56 UTC
State Changed
From-To: open->closed

SUPHP support was removed from the port entirely. 

Thank you for the submission.