Date: Mon, 18 Jul 2016 16:41:20 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418715 - in head: audio/sidplayer audio/sidplayer/files lang/visualworks lang/visualworks/files mail/imap-uw mail/imap-uw/files mail/panda-imap mail/panda-imap/files mail/qpopper mail/... Message-ID: <201607181641.u6IGfKv2024755@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Mon Jul 18 16:41:19 2016 New Revision: 418715 URL: https://svnweb.freebsd.org/changeset/ports/418715 Log: Don't echo in post-install, use pkg-message. Also, don't "fix" pkg-message in post-install, use SUB_FILES/SUB_LIST. Sponsored by: Absolight Added: head/audio/sidplayer/files/ head/audio/sidplayer/files/pkg-message.in (contents, props changed) head/lang/visualworks/files/ head/lang/visualworks/files/pkg-message.in (contents, props changed) head/news/noffle/files/pkg-message.in (contents, props changed) - copied, changed from r418703, head/news/noffle/pkg-message head/sysutils/clockspeed/files/pkg-message.in (contents, props changed) - copied, changed from r418703, head/sysutils/clockspeed/pkg-message head/sysutils/env4801/files/env4801.sh.in - copied, changed from r418703, head/sysutils/env4801/files/env4801.sh head/sysutils/env4801/files/pkg-message.in (contents, props changed) - copied, changed from r418703, head/sysutils/env4801/pkg-message head/www/b2evolution/files/ head/www/b2evolution/files/pkg-message.in (contents, props changed) - copied, changed from r418703, head/www/b2evolution/pkg-message Deleted: head/news/noffle/pkg-message head/sysutils/clockspeed/pkg-message head/sysutils/env4801/files/env4801.sh head/sysutils/env4801/pkg-message head/www/b2evolution/pkg-message Modified: head/audio/sidplayer/Makefile (contents, props changed) head/lang/visualworks/Makefile (contents, props changed) head/mail/imap-uw/Makefile (contents, props changed) head/mail/imap-uw/files/pkg-message.in (contents, props changed) head/mail/panda-imap/Makefile (contents, props changed) head/mail/panda-imap/files/pkg-message.in (contents, props changed) head/mail/qpopper/Makefile (contents, props changed) head/mail/qpopper/files/pkg-message.in (contents, props changed) head/news/noffle/Makefile (contents, props changed) head/sysutils/clockspeed/Makefile (contents, props changed) head/sysutils/env4801/Makefile (contents, props changed) head/www/b2evolution/Makefile (contents, props changed) head/www/lilurl/Makefile (contents, props changed) head/www/lilurl/files/pkg-message.in (contents, props changed) Modified: head/audio/sidplayer/Makefile ============================================================================== --- head/audio/sidplayer/Makefile Mon Jul 18 16:28:58 2016 (r418714) +++ head/audio/sidplayer/Makefile Mon Jul 18 16:41:19 2016 (r418715) @@ -3,7 +3,7 @@ PORTNAME= sidplayer PORTVERSION= 4.4 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= audio MASTER_SITES= http://sidplayer.cebix.net/downloads/ \ LOCAL/ehaupt @@ -20,8 +20,8 @@ GNU_CONFIGURE= yes SDLINCLUDEDIR= SDL OPTIONS_DEFINE= DOCS - -.include <bsd.port.options.mk> +OPTIONS_SUB= yes +SUB_FILES= pkg-message post-patch: @${REINPLACE_CMD} -e 's|SDL/SDL_endian\.h|${SDLINCLUDEDIR}/SDL_endian\.h|' \ @@ -32,12 +32,4 @@ do-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/PSID\ Demo/* ${STAGEDIR}${DOCSDIR} -post-install: - @${ECHO_MSG} "==============================================================" - @${ECHO_MSG} "A huge SID tune archive can be found at http://hvsc.c64.org/" -.if ${PORT_OPTIONS:MDOCS} - @${ECHO_MSG} "You can find a few examples in ${DOCSDIR}" -.endif - @${ECHO_MSG} "==============================================================" - .include <bsd.port.mk> Added: head/audio/sidplayer/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/sidplayer/files/pkg-message.in Mon Jul 18 16:41:19 2016 (r418715) @@ -0,0 +1,4 @@ +============================================================== +A huge SID tune archive can be found at http://hvsc.c64.org/ +%%DOCS%%You can find a few examples in %%DOCSDIR%% +============================================================== Modified: head/lang/visualworks/Makefile ============================================================================== --- head/lang/visualworks/Makefile Mon Jul 18 16:28:58 2016 (r418714) +++ head/lang/visualworks/Makefile Mon Jul 18 16:41:19 2016 (r418715) @@ -3,6 +3,7 @@ PORTNAME= visualworks PORTVERSION= 7.6 +PORTREVISION= 1 CATEGORIES= lang linux MASTER_SITES= http://www.cincomsmalltalk.com/bsdports/${SUBDIR}.old/ DISTFILES= BaseVisualWorks.tar.gz \ @@ -28,6 +29,8 @@ OPTIONS_DEFINE= ATOOLS COM DLLC DST DATA WEBAPP WEBSERVICES VMLINUX VMWINDOWS VMMAC VMSOLARIS VMAIX VMHPUX VMSGI OPTIONS_DEFAULT= DLLC DATABASE SEASIDE STORE +SUB_FILES= pkg-message + ATOOLS_DESC= Advanced Tools COM_DESC= COM DLLC_DESC= DLLC Connect @@ -163,19 +166,4 @@ do-install: @${INSTALL_SCRIPT} ${WRKDIR}/${MY_STARTUP_SCRIPT} ${STAGEDIR}${DATADIR} @${LN} -s ${DATADIR}/${MY_STARTUP_SCRIPT} ${STAGEDIR}${PREFIX}/bin/visual -post-install: - @${ECHO_MSG} " " - @${ECHO_MSG} " --------------------------- Please note: ---------------------------" - @${ECHO_MSG} " " - @${ECHO_MSG} " To start using VisualWorks, copy the default image to your" - @${ECHO_MSG} " home directory:" - @${ECHO_MSG} " # ${CP} ${DATADIR}/image/visualnc.im ~" - @${ECHO_MSG} " Make it writeable:" - @${ECHO_MSG} " # ${CHMOD} u+w ~/visualnc.im" - @${ECHO_MSG} " Then run it using:" - @${ECHO_MSG} " # visual ~/visualnc.im" - @${ECHO_MSG} " " - @${ECHO_MSG} " -------------------- Thanks for your attention! --------------------" - @${ECHO_MSG} " " - .include <bsd.port.post.mk> Added: head/lang/visualworks/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/visualworks/files/pkg-message.in Mon Jul 18 16:41:19 2016 (r418715) @@ -0,0 +1,11 @@ + --------------------------- Please note: --------------------------- + + To start using VisualWorks, copy the default image to your + home directory: + # cp %%DATADIR%%/image/visualnc.im ~ + Make it writeable: + # chmod u+w ~/visualnc.im + Then run it using: + # visual ~/visualnc.im + + -------------------- Thanks for your attention! -------------------- Modified: head/mail/imap-uw/Makefile ============================================================================== --- head/mail/imap-uw/Makefile Mon Jul 18 16:28:58 2016 (r418714) +++ head/mail/imap-uw/Makefile Mon Jul 18 16:41:19 2016 (r418715) @@ -3,6 +3,7 @@ PORTNAME= imap PORTVERSION= 2007f +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.cac.washington.edu/imap/%SUBDIR%/ \ @@ -34,6 +35,7 @@ ALL_TARGET= bsf OPTIONS_DEFINE= SSL SSL_AND_PLAINTEXT DRAC NETSCAPE_BRAIN_DAMAGE DOCS OPTIONS_DEFAULT= SSL +OPTIONS_SUB= yes SSL_DESC= Compile with SSL support SSL_AND_PLAINTEXT_DESC= Allow plain text passwords and SSL DRAC_DESC= Dynamically open MTA for relaying @@ -94,32 +96,10 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${STAGEDIR}${PREFIX}/man/man1/ ${INSTALL_MAN} ${WRKSRC}/src/tmail/tmail.1 ${STAGEDIR}${PREFIX}/man/man1/ -post-install: - @${CAT} ${PKGMESSAGE} -.if ${PORT_OPTIONS:MDRAC} - @${ECHO} "================================================================================" - @${ECHO} "To have DRAC working, you must create ${PREFIX}/etc/dracd.host, containing" - @${ECHO} "the hostname of the DRAC server:" - @${ECHO} - @${ECHO} "localhost" - @${ECHO} "================================================================================" -.endif -.if ${PORT_OPTIONS:MSSL} - @${ECHO} - @${ECHO} "To create and install a new SSL certificate for imapd and ipop3d, type \"make" - @${ECHO} "cert\". Or install manually in ${PREFIX}/certs." - @${ECHO} - @${ECHO} "Example inetd config for SSL only services:" - @${ECHO} - @${ECHO} "pop3s stream tcp nowait root ${PREFIX}/libexec/ipop3d ipop3d" - @${ECHO} "imaps stream tcp nowait root ${PREFIX}/libexec/imapd imapd" - @${ECHO} "================================================================================" -.endif -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} -m 0755 -p ${STAGEDIR}${DOCSDIR} @${TAR} -C ${WRKSRC}/docs -cf - . | \ (umask 022; ${TAR} -C ${STAGEDIR}${DOCSDIR} -xf -) -.endif cert: @${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/certs Modified: head/mail/imap-uw/files/pkg-message.in ============================================================================== --- head/mail/imap-uw/files/pkg-message.in Mon Jul 18 16:28:58 2016 (r418714) +++ head/mail/imap-uw/files/pkg-message.in Mon Jul 18 16:41:19 2016 (r418715) @@ -31,3 +31,18 @@ dir accessed. WITHOUT_SSL - build without SSL/encryption support. WITH_SSL_AND_PLAINTEXT - build with SSL/encryption support, but allow non-encrypted logins. +%%DRAC%%================================================================================ +%%DRAC%%To have DRAC working, you must create ${PREFIX}/etc/dracd.host, containing +%%DRAC%%the hostname of the DRAC server: +%%DRAC%% +%%DRAC%%localhost +%%DRAC%%================================================================================ +%%SSL%% +%%SSL%%To create and install a new SSL certificate for imapd and ipop3d, type \"make +%%SSL%%cert\". Or install manually in ${PREFIX}/certs. +%%SSL%% +%%SSL%%Example inetd config for SSL only services: +%%SSL%% +%%SSL%%pop3s stream tcp nowait root ${PREFIX}/libexec/ipop3d ipop3d +%%SSL%%imaps stream tcp nowait root ${PREFIX}/libexec/imapd imapd +%%SSL%%================================================================================ Modified: head/mail/panda-imap/Makefile ============================================================================== --- head/mail/panda-imap/Makefile Mon Jul 18 16:28:58 2016 (r418714) +++ head/mail/panda-imap/Makefile Mon Jul 18 16:41:19 2016 (r418715) @@ -3,6 +3,7 @@ PORTNAME= panda-imap PORTVERSION= 20130621 +PORTREVISION= 1 CATEGORIES= mail ipv6 MAINTAINER= thierry@FreeBSD.org @@ -31,6 +32,7 @@ ALL_TARGET= bsf OPTIONS_DEFINE= SSL SSL_AND_PLAINTEXT DRAC NETSCAPE_BRAIN_DAMAGE DOCS OPTIONS_DEFAULT= SSL +OPTIONS_SUB= yes SSL_DESC= Compile with SSL support SSL_AND_PLAINTEXT_DESC= Allow plain text passwords and SSL DRAC_DESC= Dynamically open MTA for relaying @@ -92,32 +94,10 @@ do-install: ${INSTALL_MAN} ${WRKSRC}/src/mailutil/mailutil.1 ${STAGEDIR}${PREFIX}/man/man1/ ${INSTALL_MAN} ${WRKSRC}/src/tmail/tmail.1 ${STAGEDIR}${PREFIX}/man/man1/ -post-install: - @${CAT} ${PKGMESSAGE} -.if ${PORT_OPTIONS:MDRAC} - @${ECHO} "================================================================================" - @${ECHO} "To have DRAC working, you must create ${PREFIX}/etc/dracd.host, containing" - @${ECHO} "the hostname of the DRAC server:" - @${ECHO} - @${ECHO} "localhost" - @${ECHO} "================================================================================" -.endif -.if ${PORT_OPTIONS:MSSL} - @${ECHO} - @${ECHO} "To create and install a new SSL certificate for imapd and ipop3d, type \"make" - @${ECHO} "cert\". Or install manually in ${PREFIX}/certs." - @${ECHO} - @${ECHO} "Example inetd config for SSL only services:" - @${ECHO} - @${ECHO} "pop3s stream tcp nowait root ${PREFIX}/libexec/ipop3d ipop3d" - @${ECHO} "imaps stream tcp nowait root ${PREFIX}/libexec/imapd imapd" - @${ECHO} "================================================================================" -.endif -.if ${PORT_OPTIONS:MDOCS} +post-install-DOCS-on: ${MKDIR} -m 0755 -p ${STAGEDIR}${DOCSDIR} ${TAR} -C ${WRKSRC}/docs -cf - . | \ (umask 022; ${TAR} -C ${STAGEDIR}${DOCSDIR} -xf -) -.endif cert: ${INSTALL} -d -o root -g wheel -m 0755 ${PREFIX}/certs Modified: head/mail/panda-imap/files/pkg-message.in ============================================================================== --- head/mail/panda-imap/files/pkg-message.in Mon Jul 18 16:28:58 2016 (r418714) +++ head/mail/panda-imap/files/pkg-message.in Mon Jul 18 16:41:19 2016 (r418715) @@ -31,3 +31,18 @@ dir accessed. WITHOUT_SSL - build without SSL/encryption support. WITH_SSL_AND_PLAINTEXT - build with SSL/encryption support, but allow non-encrypted logins. +%%DRAC%%================================================================================ +%%DRAC%%To have DRAC working, you must create ${PREFIX}/etc/dracd.host, containing +%%DRAC%%the hostname of the DRAC server: +%%DRAC%% +%%DRAC%%localhost +%%DRAC%%================================================================================ +%%SSL%% +%%SSL%%To create and install a new SSL certificate for imapd and ipop3d, type \"make +%%SSL%%cert\". Or install manually in ${PREFIX}/certs. +%%SSL%% +%%SSL%%Example inetd config for SSL only services: +%%SSL%% +%%SSL%%pop3s stream tcp nowait root ${PREFIX}/libexec/ipop3d ipop3d +%%SSL%%imaps stream tcp nowait root ${PREFIX}/libexec/imapd imapd +%%SSL%%================================================================================ Modified: head/mail/qpopper/Makefile ============================================================================== --- head/mail/qpopper/Makefile Mon Jul 18 16:28:58 2016 (r418714) +++ head/mail/qpopper/Makefile Mon Jul 18 16:41:19 2016 (r418715) @@ -3,7 +3,7 @@ PORTNAME= qpopper PORTVERSION= 4.1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.qualcomm.com/eudora/servers/unix/popper/ \ http://core.ring.gr.jp/archives/net/mail/qpopper/ @@ -57,6 +57,7 @@ STANDALONE_MODE_DESC= build qpopper to b U_OPTION_DESC= include support for user .qpopper-options OPTIONS_DEFAULT= APOP SSL U_OPTION +OPTION_SUB= yes .include <bsd.port.pre.mk> @@ -176,14 +177,4 @@ post-install: fi ; \ fi -.if ${PORT_OPTIONS:MPOPPASSD} - @${ECHO_MSG} "" - @${ECHO_MSG} "===============================================================================" - @${ECHO_MSG} "It adds for myself" - @${ECHO_MSG} "/etc/devfs.conf:" - @${ECHO_MSG} "link /dev/pts/0 pty0" - @${ECHO_MSG} "===============================================================================" - @${ECHO_MSG} "" -.endif - .include <bsd.port.post.mk> Modified: head/mail/qpopper/files/pkg-message.in ============================================================================== --- head/mail/qpopper/files/pkg-message.in Mon Jul 18 16:28:58 2016 (r418714) +++ head/mail/qpopper/files/pkg-message.in Mon Jul 18 16:41:19 2016 (r418715) @@ -4,3 +4,10 @@ To enable the qpopper-daemon, add the fo pop3 stream tcp nowait root %%PREFIX%%/libexec/qpopper qpopper -s **************************************************************************** +%%POPPASSD%% +%%POPPASSD%%=============================================================================== +%%POPPASSD%%It adds for myself +%%POPPASSD%%/etc/devfs.conf: +%%POPPASSD%%link /dev/pts/0 pty0 +%%POPPASSD%%=============================================================================== +%%POPPASSD%% Modified: head/news/noffle/Makefile ============================================================================== --- head/news/noffle/Makefile Mon Jul 18 16:28:58 2016 (r418714) +++ head/news/noffle/Makefile Mon Jul 18 16:41:19 2016 (r418715) @@ -21,6 +21,7 @@ LIBS+= -L${LOCALBASE}/lib SPOOL_DIR= /var/spool/noffle PLIST_SUB+= SPOOL_DIR=${SPOOL_DIR} +SUB_FILES= pkg-message DOCS= ChangeLog docs/FAQ INSTALL docs/INTERNALS README \ docs/testing.txt docs/noffle.lsm @@ -51,7 +52,4 @@ do-install: ${STAGEDIR}${SPOOL_DIR}/requested -post-install: - ${SED} -e "s:/usr/local:${PREFIX}:g" ${PKGMESSAGE} - .include <bsd.port.mk> Copied and modified: head/news/noffle/files/pkg-message.in (from r418703, head/news/noffle/pkg-message) ============================================================================== --- head/news/noffle/pkg-message Mon Jul 18 13:39:17 2016 (r418703, copy source) +++ head/news/noffle/files/pkg-message.in Mon Jul 18 16:41:19 2016 (r418715) @@ -2,6 +2,6 @@ **************************************************************************** To enable the noffle-daemon, add the following line to your /etc/inetd.conf: -nntp stream tcp nowait news /usr/local/bin/noffle -r +nntp stream tcp nowait news %%PREFIX%%/bin/noffle -r **************************************************************************** Modified: head/sysutils/clockspeed/Makefile ============================================================================== --- head/sysutils/clockspeed/Makefile Mon Jul 18 16:28:58 2016 (r418714) +++ head/sysutils/clockspeed/Makefile Mon Jul 18 16:41:19 2016 (r418715) @@ -26,6 +26,8 @@ RC_SCRIPT_STARTUP_DIR= ${PREFIX}/etc/rc OPTIONS_DEFINE= DOCS +SUB_FILES= pkg-message + post-extract: # get this port working under FreeBSD non-i386 @${INSTALL} ${FILESDIR}/tryclock_gettime.c ${WRKSRC} @@ -62,9 +64,6 @@ do-install: ${INSTALL_SCRIPT} ${WRKDIR}/${CLOCKSPEED_RC_SCRIPT_SAMPLE:T} \ ${STAGEDIR}/${RC_SCRIPT_STARTUP_DIR}/${CLOCKSPEED_RC_SCRIPT_SAMPLE:T} -post-install: - @${SED} s!/usr/local/!${PREFIX}/! ${PKGMESSAGE} - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/INSTALL ${STAGEDIR}${DOCSDIR} Copied and modified: head/sysutils/clockspeed/files/pkg-message.in (from r418703, head/sysutils/clockspeed/pkg-message) ============================================================================== --- head/sysutils/clockspeed/pkg-message Mon Jul 18 13:39:17 2016 (r418703, copy source) +++ head/sysutils/clockspeed/files/pkg-message.in Mon Jul 18 16:41:19 2016 (r418715) @@ -1,6 +1,6 @@ ATTENTIONATTENTION: -Please make sure that you read /usr/local/share/doc/clockspeed/INSTALL. +Please make sure that you read %%PREFIX%%/share/doc/clockspeed/INSTALL. It contains important information about testing and configuring clockspeed, and finally installing it in your system. @@ -15,13 +15,13 @@ PR ports/27617. 1) killall clockspeed (you can't have it running) 2) sntpclock IP.OF.NTP.SERVER | clockadd 3) enable/start clockspeed : - % cp /usr/local/etc/rc.d/clockspeed.sh.sample \ - /usr/local/etc/rc.d/clockspeed.sh + % cp %%PREFIX%%/etc/rc.d/clockspeed.sh.sample \ + %%PREFIX%%/etc/rc.d/clockspeed.sh # enable clockspeed to automagically start next # time you reboot. do this after testing everything - % /usr/local/etc/rc.d/clockspeed.sh start + % %%PREFIX%%/etc/rc.d/clockspeed.sh start # start clockspeed now -4) sntpclock IP.OF.NTP.SERVER > /usr/local/etc/clockspeed/adjust +4) sntpclock IP.OF.NTP.SERVER > %%PREFIX%%/etc/clockspeed/adjust 5) cd /usr/src/share/zoneinfo 6) make -DLEAPSECONDS clean all install ; make clean Modified: head/sysutils/env4801/Makefile ============================================================================== --- head/sysutils/env4801/Makefile Mon Jul 18 16:28:58 2016 (r418714) +++ head/sysutils/env4801/Makefile Mon Jul 18 16:41:19 2016 (r418715) @@ -17,11 +17,12 @@ NO_WRKSUBDIR= yes EXTRACT_CMD= ${CP} EXTRACT_BEFORE_ARGS= EXTRACT_AFTER_ARGS= ${WRKSRC} -RC_SCRIPTS_SUB= PREFIX=${PREFIX} MAKE_ARGS= -DNOMAN PLIST_FILES= sbin/env4801 etc/rc.d/env4801.sh +SUB_FILES= env4801.sh pkg-message + OPTIONS_DEFINE= STATIC OPTIONS_DEFAULT= STATIC STATIC_DESC= Build a statically linked executable @@ -33,15 +34,8 @@ post-patch: @${REINPLACE_CMD} -e '/-static/d' ${WRKSRC}/Makefile .endif -post-extract: - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} \ - ${FILESDIR}/env4801.sh > ${WRKSRC}/env4801.sh - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/env4801 ${STAGEDIR}${PREFIX}/sbin - ${INSTALL_SCRIPT} ${WRKSRC}/env4801.sh ${STAGEDIR}${PREFIX}/etc/rc.d - -post-install: - @${SED} ${RC_SCRIPTS_SUB:S/$/!g/:S/^/ -e s!%%/:S/=/%%!/} ${PKGMESSAGE} + ${INSTALL_SCRIPT} ${WRKDIR}/env4801.sh ${STAGEDIR}${PREFIX}/etc/rc.d .include <bsd.port.mk> Copied and modified: head/sysutils/env4801/files/env4801.sh.in (from r418703, head/sysutils/env4801/files/env4801.sh) ============================================================================== Copied and modified: head/sysutils/env4801/files/pkg-message.in (from r418703, head/sysutils/env4801/pkg-message) ============================================================================== Modified: head/www/b2evolution/Makefile ============================================================================== --- head/www/b2evolution/Makefile Mon Jul 18 16:28:58 2016 (r418714) +++ head/www/b2evolution/Makefile Mon Jul 18 16:41:19 2016 (r418715) @@ -30,6 +30,9 @@ WARNING= ${PKGDIR}/pkg-warning OPTIONS_DEFINE= MYSQL OPTIONS_DEFAULT= MYSQL +SUB_FILES= pkg-message +SUB_LIST+= B2EVO_DIR=${B2EVO_DIR} B2EVO_URL=${B2EVO_URL} + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MMYSQL} @@ -54,9 +57,4 @@ do-install: @${CP} -R ${WRKSRC}/ ${STAGEDIR}${PREFIX}/${B2EVO_DIR} @${CHMOD} 665 ${STAGEDIR}${PREFIX}/${B2EVO_DIR}/blogs/conf/_config.php -post-install: - @${SED} -e 's|%%PREFIX%%|${PREFIX}|' \ - -e 's|%%B2EVO_DIR%%|${B2EVO_DIR}|; s|%%B2EVO_URL%%|${B2EVO_URL}|' \ - ${PKGMESSAGE} - .include <bsd.port.mk> Copied and modified: head/www/b2evolution/files/pkg-message.in (from r418703, head/www/b2evolution/pkg-message) ============================================================================== Modified: head/www/lilurl/Makefile ============================================================================== --- head/www/lilurl/Makefile Mon Jul 18 16:28:58 2016 (r418714) +++ head/www/lilurl/Makefile Mon Jul 18 16:41:19 2016 (r418715) @@ -19,7 +19,6 @@ WANT_PHP_WEB= yes WRKSRC= ${WRKDIR}/${PORTNAME} LILURL_DIR?= www/lilurl -PKGMESSAGE= ${WRKDIR}/pkg-message SUB_FILES= pkg-message PLIST= ${WRKDIR}/pkg-plist @@ -39,8 +38,4 @@ do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/${LILURL_DIR} @${CP} -R ${WRKSRC}/ ${STAGEDIR}${PREFIX}/${LILURL_DIR} -post-install: - @${SED} -e 's,%%PREFIX%%,${PREFIX},; s,%%LILURL_DIR%%,${LILURL_DIR},g' \ - ${PKGMESSAGE} - .include <bsd.port.mk> Modified: head/www/lilurl/files/pkg-message.in ============================================================================== --- head/www/lilurl/files/pkg-message.in Mon Jul 18 16:28:58 2016 (r418714) +++ head/www/lilurl/files/pkg-message.in Mon Jul 18 16:41:19 2016 (r418715) @@ -10,12 +10,12 @@ you may have to follow this steps to mak # echo "GRANT ALL ON lilurl.* TO lilurluser@localhost IDENTIFIED BY 'lilurluser'; FLUSH PRIVILEGES;" | mysql 3. Import the default lilurl database: -# mysql lilurl < %%PREFIX%%/%%LILURL_DIR%%/lilurl.sql +# mysql lilurl < %%WWWDIR%%/lilurl.sql -4. Copy %%PREFIX%%/%%LILURL_DIR%%/includes/conf.php.sample to %%PREFIX%%/%%LILURL_DIR%%/includes/conf.php - Edit %%PREFIX%%/%%LILURL_DIR%%/includes/conf.php +4. Copy %%WWWDIR%%/includes/conf.php.sample to %%WWWDIR%%/includes/conf.php + Edit %%WWWDIR%%/includes/conf.php 5. Add alias in apache config for the lilurl dir: -Alias /lilurl "%%PREFIX%%/%%LILURL_DIR%%/" +Alias /lilurl "%%WWWDIR%%/" =======================================================================
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607181641.u6IGfKv2024755>