Upgrade module fetchmail-1.100-1, make PREFIX clean.

5 files changed, 79 insertions, 1 deletions

diff --git a/sysutils/usermin/Makefile b/sysutils/usermin/Makefile
index e1421ff2315a..b330583e37e9 100644
--- a/sysutils/usermin/Makefile
+++ b/sysutils/usermin/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	usermin
 PORTVERSION=	1.100
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.webmin.com/uupdates/ \
 		${MASTER_SITE_SOURCEFORGE}
@@ -25,7 +26,7 @@ USE_PERL5=	yes
 USE_RC_SUBR=	yes
 USE_REINPLACE=	yes
 
-USERMIN_MODULES=
+USERMIN_MODULES=fetchmail-1.100-1.wbm.gz
 USERMIN_THEMES=
 
 post-extract:
@@ -37,6 +38,10 @@ post-extract:
 	fi
 
 post-patch:
+.for file in	mysql/config-freebsd postgresql/config-freebsd \
+		spam/config-freebsd
+	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
+.endfor
 	@${REINPLACE_CMD} -e "s=%%PREFIX%%=${PREFIX}=" ${WRKSRC}/setup.sh
 	@${FIND} ${WRKSRC} -name "*.cgi" -print \
 		| ${XARGS} ${REINPLACE_CMD} -e "s@#!/usr/local/bin/perl@#!${PERL}@"
diff --git a/sysutils/usermin/distinfo b/sysutils/usermin/distinfo
index 1f7ceb3d4fce..ebe6010372c2 100644
--- a/sysutils/usermin/distinfo
+++ b/sysutils/usermin/distinfo
@@ -1,2 +1,4 @@
 MD5 (usermin-1.100.tar.gz) = 0c419acc17ff5c3d623d5e319af06f23
 SIZE (usermin-1.100.tar.gz) = 2224193
+MD5 (fetchmail-1.100-1.wbm.gz) = 385bfa653d1b7463fabc88a2b8c6066b
+SIZE (fetchmail-1.100-1.wbm.gz) = 29643
diff --git a/sysutils/usermin/files/patch-mysql_config-freebsd b/sysutils/usermin/files/patch-mysql_config-freebsd
new file mode 100644
index 000000000000..03d51792c13b
--- /dev/null
+++ b/sysutils/usermin/files/patch-mysql_config-freebsd
@@ -0,0 +1,25 @@
+
+$FreeBSD$
+
+--- mysql/config-freebsd.orig
++++ mysql/config-freebsd
+@@ -1,12 +1,12 @@
+-start_cmd=(/usr/local/bin/safe_mysqld || /usr/local/bin/mysqld_safe) &
++start_cmd=(%%PREFIX%%/bin/safe_mysqld || %%PREFIX%%/bin/mysqld_safe) &
+ perpage=25
+-mysql=/usr/local/bin/mysql
+-mysqldump=/usr/local/bin/mysqldump
+-mysqlimport=/usr/local/bin/mysqlimport
+-mysqlshow=/usr/local/bin/mysqlshow
++mysql=%%PREFIX%%/bin/mysql
++mysqldump=%%PREFIX%%/bin/mysqldump
++mysqlimport=%%PREFIX%%/bin/mysqlimport
++mysqlshow=%%PREFIX%%/bin/mysqlshow
+ login=root
+-mysql_libs=/usr/local/lib/mysql
+-mysqladmin=/usr/local/bin/mysqladmin
++mysql_libs=%%PREFIX%%/lib/mysql
++mysqladmin=%%PREFIX%%/bin/mysqladmin
+ style=0
+ add_mode=0
+ nodbi=0
diff --git a/sysutils/usermin/files/patch-postgresql_config-freebsd b/sysutils/usermin/files/patch-postgresql_config-freebsd
new file mode 100644
index 000000000000..7ae3a15e4baa
--- /dev/null
+++ b/sysutils/usermin/files/patch-postgresql_config-freebsd
@@ -0,0 +1,30 @@
+
+$FreeBSD$
+
+--- postgresql/config-freebsd.orig
++++ postgresql/config-freebsd
+@@ -1,16 +1,16 @@
+ basedb=template1
+ pass=
+-hba_conf=/usr/local/pgsql/data/pg_hba.conf
+-pid_file=/usr/local/pgsql/data/postmaster.pid
+-stop_cmd=/usr/local/etc/rc.d/010.pgsql.sh stop
+-start_cmd=/usr/local/etc/rc.d/010.pgsql.sh start
++hba_conf=%%PREFIX%%/pgsql/data/pg_hba.conf
++pid_file=%%PREFIX%%/pgsql/data/postmaster.pid
++stop_cmd=%%PREFIX%%/etc/rc.d/010.pgsql.sh stop
++start_cmd=%%PREFIX%%/etc/rc.d/010.pgsql.sh start
+ perpage=25
+-psql=/usr/local/bin/psql
++psql=%%PREFIX%%/bin/psql
+ login=pgsql
+-plib=/usr/local/lib
++plib=%%PREFIX%%/lib
+ nodbi=0
+-dump_cmd=/usr/local/bin/pg_dump
+-rstr_cmd=/usr/local/bin/pg_restore
++dump_cmd=%%PREFIX%%/bin/pg_dump
++rstr_cmd=%%PREFIX%%/bin/pg_restore
+ sameunix=0
+ access=*: *
+ blob_mode=0
diff --git a/sysutils/usermin/files/patch-spam_config-freebsd b/sysutils/usermin/files/patch-spam_config-freebsd
new file mode 100644
index 000000000000..ebb36f05b086
--- /dev/null
+++ b/sysutils/usermin/files/patch-spam_config-freebsd
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- spam/config-freebsd.orig
++++ spam/config-freebsd
+@@ -1,8 +1,8 @@
+ local_cf=.spamassassin/user_prefs
+ spamassassin=spamassassin
+ sa_learn=sa-learn
+-global_procmailrc=/usr/local/etc/procmailrc
+-global_cf=/usr/local/etc/mail/spamassassin
++global_procmailrc=%%PREFIX%%/etc/procmailrc
++global_cf=%%PREFIX%%/etc/mail/spamassassin
+ show_global=0
+ avail_icons=white,score,report,user,header,setup,mail
+ warn_procmail=1