Skip site navigation (1)Skip section navigation (2)
Date:      Wed,  7 Sep 2005 12:23:48 +0200 (CEST)
From:      Soeren Straarup <xride@x12.dk>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/85825: [Update] and maintainer change
Message-ID:  <20050907102348.9B34D4296@beacon.x12.dk>
Resent-Message-ID: <200509071030.j87AUDfI066697@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         85825
>Category:       ports
>Synopsis:       [Update] and maintainer change
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Wed Sep 07 10:30:12 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator:     Soeren Straarup
>Release:        FreeBSD 6.0-BETA1 i386
>Organization:
>Environment:
System: FreeBSD beacon.x12.dk 6.0-BETA1 FreeBSD 6.0-BETA1 #0: Tue Jul 12 18:05:55 UTC 2005 root@x64.samsco.home:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
	Version bump from 0.7.4 to 0.7.6
	Maintainer from ports@FreeBSD.org to xride@x12.dk
	The new version is beeing installed into bblog/bblog with some files in bblog. It will not work if installed like 0.7.4 port.
>How-To-Repeat:
	
>Fix:

	

--- bblog.diff begins here ---
diff -uNrd /usr/ports/www/bblog/Makefile bblog/Makefile
--- /usr/ports/www/bblog/Makefile	Fri Apr 22 06:04:06 2005
+++ bblog/Makefile	Wed Sep  7 12:10:01 2005
@@ -2,17 +2,17 @@
 # Date created:		2005-04-16
 # Whom:			chinsan@mail2000.com.tw
 #
-# $FreeBSD: ports/www/bblog/Makefile,v 1.1 2005/04/22 04:04:06 vanilla Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	bBlog
-PORTVERSION=	0.7.4
+PORTVERSION=	0.7.6
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	bblog
 DISTNAME=	${PORTNAME}-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	xride@x12.dk
 COMMENT=	A elegant personal publishing system with Smarty
 
 USE_PHP=	mysql pcre session
@@ -21,7 +21,7 @@
 WANT_PHP_WEB=	YES
 
 TMPDIR?=	blog
-WRKSRC=		${WRKDIR}/${TMPDIR}
+WRKSRC=		${WRKDIR}
 WWWDOCROOT?=	www/data-dist
 BBLOGURL?=	bblog
 WWWOWN?=	www
@@ -48,7 +48,9 @@
 .endif
 
 pre-install:
-	cd ${WRKSRC}/${BBLOGURL} && ${FIND} -s . -type f | \
+	cd ${WRKSRC} && ${FIND} -s . -type f | \
+		${GREP} -v _done. | \
+		${GREP} -v '.PLIST' | \
 		${SED} -e 's|^./||;s|^|${BBLOGDIR}/|' > ${PLIST} \
 		&& ${FIND} -d * -type d | \
 		${SED} -e 's|^|@dirrm ${BBLOGDIR}/|' >> ${PLIST} \
@@ -58,12 +60,15 @@
 	-${MKDIR} ${PREFIX}/${BBLOGDIR}
 	@${CHOWN} ${WWWOWN}:${WWWGRP} ${PREFIX}/${BBLOGDIR}
 	@${CHMOD} 755 ${PREFIX}/${BBLOGDIR}
-	@${CP} -R ${WRKSRC}/${BBLOGURL}/ ${PREFIX}/${BBLOGDIR}
-	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/install.php
-	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/compiled_templates/
-	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/cache/
-	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/cache/favorites.xml
-	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/config.php
+	@${CP} -R ${WRKSRC}/ ${PREFIX}/${BBLOGDIR}
+	@${RM} ${PREFIX}/${BBLOGDIR}/.PLIST*
+	@${RM} ${PREFIX}/${BBLOGDIR}/.*done*
+	#@${CP} -R ${WRKSRC}/${BBLOGURL}/ ${PREFIX}/${BBLOGDIR}
+	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/bblog/install.php
+	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/bblog/compiled_templates/
+	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/bblog/cache/
+	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/bblog/cache/favorites.xml
+	@${CHMOD} 775 ${PREFIX}/${BBLOGDIR}/bblog/config.php
 
 post-install:
 	@${SED} -e 's|%%BBLOGURL%%|${BBLOGURL}|' ${PKGMESSAGE}
diff -uNrd /usr/ports/www/bblog/distinfo bblog/distinfo
--- /usr/ports/www/bblog/distinfo	Fri Apr 22 06:04:06 2005
+++ bblog/distinfo	Tue Sep  6 20:44:12 2005
@@ -1,2 +1,2 @@
-MD5 (bBlog-0.7.4.tar.gz) = a8170b28c1ef7d2e8b85cc656009ea49
-SIZE (bBlog-0.7.4.tar.gz) = 306347
+MD5 (bBlog-0.7.6.tar.gz) = 1dff970b988e8545f3f5751d06055ae8
+SIZE (bBlog-0.7.6.tar.gz) = 297459
diff -uNrd /usr/ports/www/bblog/pkg-message bblog/pkg-message
--- /usr/ports/www/bblog/pkg-message	Fri Apr 22 06:04:06 2005
+++ bblog/pkg-message	Tue Sep  6 23:13:50 2005
@@ -2,7 +2,7 @@
 
 For first use of bBLog, remember to point your browser to
 
-http://localhost/%%BBLOGURL%%/install.php
+http://localhost/%%BBLOGURL%%/bblog/install.php
 
 At the end of the install when the config file is written to disk, you
 should change the permissions back to 755 so it is not writable by the 
--- bblog.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20050907102348.9B34D4296>