Bug 135886

Comment 1 Philip M. Gollucci 2009-06-23 07:07:29 UTC

Responsible Changed
From-To: freebsd-ports-bugs->pgollucci

I'll take it.

Comment 2 Philip M. Gollucci 2009-06-23 07:21:41 UTC

State Changed
From-To: open->feedback

http://tb.p6m7g8.net/errors/8-CURRENT-amd64/vhcp-1.7g2.log

--- Makefile.orig       2009-06-23 09:27:13.000000000 +0300
+++ Makefile    2009-06-23 10:14:34.000000000 +0300
@@ -28,8 +28,15 @@
 pre-install:
        @if [ -f ${WRKSRC}/config.php ]; then \
                ${MV} ${WRKSRC}/config.php ${WRKSRC}/config.php.dist ; fi
-       @cd ${WRKSRC} && ${FIND} -s * -type f | \
-               ${SED} -e 's|^|${VHCPDIR}/|g' > ${PLIST} && \
+       @cd ${WRKSRC} && \
+               ${ECHO_CMD} "@unexec if cmp -s %D/${VHCPDIR}/config.php.dist \
+               %D/${VHCPDIR}/config.php; then \
+               rm -f %D/${VHCPDIR}/config.php; fi" > ${PLIST} && \
+               ${FIND} -s * -type f | \
+               ${SED} -e 's|^|${VHCPDIR}/|g' >> ${PLIST} && \
+               ${ECHO_CMD} "@exec if [ ! -f %D/${VHCPDIR}/config.php ] ; then \
+               cp -p %D/${VHCPDIR}/config.php.dist \
+               %D/${VHCPDIR}/config.php; fi" >> ${PLIST} && \
                ${FIND} -d * -type d | \
                ${SED} -e 's|^|@dirrm ${VHCPDIR}/|g' >> ${PLIST} && \
                ${ECHO_CMD} @dirrm ${VHCPDIR} >> ${PLIST}
@@ -39,7 +46,10 @@
        @${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${VHCPDIR}
        @${CHMOD} 755 ${PREFIX}/${VHCPDIR}
        @${CP} -R ${WRKSRC}/ ${PREFIX}/${VHCPDIR}
-       ${CP} ${PREFIX}/${VHCPDIR}/config.php.dist
${PREFIX}/${VHCPDIR}/config.php
+       if [ ! -f ${PREFIX}/${VHCPDIR}/config.php ]; then \
+               ${CP} ${PREFIX}/${VHCPDIR}/config.php.dist \
+               ${PREFIX}/${VHCPDIR}/config.php ; \
+       fi

 post-install:
        @${CAT} ${PKGMESSAGE}

Comment 4 Philip M. Gollucci 2009-06-23 19:52:06 UTC

State Changed
From-To: feedback->open

Submitter has fixed.

Comment 5 Philip M. Gollucci 2009-06-23 20:49:06 UTC

State Changed
From-To: open->feedback

please send the patch as an attachment

Here it is...

Comment 7 Philip M. Gollucci 2009-06-23 21:00:39 UTC

State Changed
From-To: feedback->open

4 (via e-mail)

Comment 8 dfilter service 2009-06-23 21:00:46 UTC

pgollucci    2009-06-23 20:00:35 UTC

  FreeBSD ports repository

  Modified files:
    net-p2p              Makefile 
  Added files:
    net-p2p/vhcp         Makefile distinfo pkg-descr 
    net-p2p/vhcp/files   pkg-message.in 
  Log:
  Verlihub Contro Panel is a tool for the administration of your hubsoft
  VerliHub 0.9.7 (or higher). It's written in PHP so you can use it on
  every OS that runs Apache Web Server with PHP support.
  
  WWW: http://vhcp.verlihub-project.org/viewforum.php?f=32
  
  PR:             ports/135886
  Submitted by:   Maxim Ignatenko
  
  Revision  Changes    Path
  1.74      +1 -0      ports/net-p2p/Makefile
  1.1       +57 -0     ports/net-p2p/vhcp/Makefile (new)
  1.1       +3 -0      ports/net-p2p/vhcp/distinfo (new)
  1.1       +4 -0      ports/net-p2p/vhcp/files/pkg-message.in (new)
  1.1       +5 -0      ports/net-p2p/vhcp/pkg-descr (new)
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"

Comment 9 Philip M. Gollucci 2009-06-23 21:00:53 UTC

State Changed
From-To: open->closed

Committed, with minor changes. Thanks!