Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 20 Apr 2012 11:54:10 -0700 (PDT)
From:      Brooks Davis <brooks@FreeBSD.org>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        glarkin@FreeBSD.org
Subject:   ports/167127: [PATCH] www/trac-wysiwyg: Update to latest version
Message-ID:  <201204201909.q3KJ9PoP005106@freefall.freebsd.org>
Resent-Message-ID: <201204201910.q3KJABZU005143@freefall.freebsd.org>

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

>Number:         167127
>Category:       ports
>Synopsis:       [PATCH] www/trac-wysiwyg: Update to latest version
>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:   Fri Apr 20 19:10:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     Brooks Davis
>Release:        FreeBSD 8.3-PRERELEASE amd64
>Organization:
>Environment:
System: FreeBSD aerosource-west.aero.org 8.3-PRERELEASE FreeBSD 8.3-PRERELEASE #7 r232510: Fri Mar  2 15:31:27
>Description:

Upgrade to the latest version and switch to the Trac-0.12 branch.  At a
minimum this fixes a resize bug in the edit window.

I've also added some automated distfile creation bits you may find useful.
You'll want to remove the "brooks" specific bits.

Added file(s):
- Makefile.svn_rev

Port maintainer (glarkin@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- trac-wysiwyg-0.4.11508.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/www/trac-wysiwyg/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile	18 May 2010 04:08:04 -0000	1.17
+++ Makefile	20 Apr 2012 18:51:37 -0000
@@ -3,34 +3,58 @@
 # Whom:                              Greg Larkin <glarkin@FreeBSD.org>
 #
 # $FreeBSD: ports/www/trac-wysiwyg/Makefile,v 1.17 2010/05/18 04:08:04 pgollucci Exp $
+
 #
 
 PORTNAME=	wysiwyg
-PORTVERSION=	0.2.7848
-PORTREVISION=	2
+DISTVERSION=	0.4.${SVN_REV}
 CATEGORIES=	www devel python
-MASTER_SITES=	http://www.sourcehosting.net/freebsd/distfiles/ \
-		LOCAL/glarkin
+MASTER_SITES=	LOCAL/brooks
 PKGNAMEPREFIX=	trac-
-DISTNAME=	${PORTNAME}plugin-${PORTVERSION}
+DIST_SUBDIR=	trac
 
 MAINTAINER=	glarkin@FreeBSD.org
 COMMENT=	WYSIWYG editor for Trac wiki
 
 RUN_DEPENDS+=	tracd:${PORTSDIR}/www/trac
+BUILD_DEPENDS+=	easy_install:${PORTSDIR}/devel/py-setuptools
 
-USE_ZIP=	yes
-
-WRKSRC=		${WRKDIR}/trac${PORTNAME}plugin/0.11
-USE_PYTHON=	2.5+
-USE_PYDISTUTILS=	easy_install
-PYDISTUTILS_PKGNAME=    TracWysiwyg
-PYDISTUTILS_PKGVERSION= ${PORTVERSION:R}
-PLIST_SUB+=	EGGVERSION=${PORTVERSION:R} PYTHONVERSION=${_PYTHON_VERSION}
+USE_BZIP2=	yes
+USE_PYTHON=	yes
+NO_BUILD=	yes
+USE_PYDISTUTILS=yes
+PYDISTUTILS_PKGNAME=	TracWysiwyg
+EGGVERSION=	${PORTVERSION:C/\.r.*/dev/}
+PLIST_FULES+=	%%PYTHON_SITELIBDIR%%/TracWysiwyg-%%EGGVERSION%%-py%%PYTHONVERSION%%.egg
 PYDISTUTILS_NOEGGINFO=	yes
-PLIST_FILES=	%%PYTHON_SITELIBDIR%%/TracWysiwyg-%%EGGVERSION%%-py%%PYTHONVERSION%%.egg
+
+.include <bsd.port.pre.mk>
+
+.if !defined(SVN_REV)
+.if defined(BOOTSTRAP)
+SVN_URL=	http://trac-hacks.org/svn/tracwysiwygplugin/0.12/
+LANG=		"C"
+SVN_REV!=	svn info ${SVN_URL} | ${GREP} Revision | cut -d' ' -f2
+.else
+.include "Makefile.svn_rev"
+.endif
+.endif
+
+.if defined(BOOTSTRAP) || defined(SVN_FETCH)
+FETCH_DEPENDS+=	svn:${PORTSDIR}/devel/subversion
+
+do-fetch:
+	${MKDIR} ${WRKDIR}
+	svn export -r ${SVN_REV} ${SVN_URL} ${WRKSRC}
+	cd ${WRKDIR}; tar cvfy ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}.tar.bz2 ${DISTNAME}
+	echo "SVN_REV=  ${SVN_REV}" > ${MASTERDIR}/Makefile.svn_rev
+.if ${USER} == brooks
+	scp ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}.tar.bz2 \
+	    freefall.freebsd.org:public_distfiles/
+.endif
+.endif
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
Index: Makefile.svn_rev
===================================================================
RCS file: Makefile.svn_rev
diff -N Makefile.svn_rev
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ Makefile.svn_rev	20 Apr 2012 18:51:37 -0000
@@ -0,0 +1 @@
+SVN_REV=  11508
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/www/trac-wysiwyg/distinfo,v
retrieving revision 1.11
diff -u -r1.11 distinfo
--- distinfo	19 Mar 2011 12:37:03 -0000	1.11
+++ distinfo	20 Apr 2012 18:51:37 -0000
@@ -1,2 +1,2 @@
-SHA256 (wysiwygplugin-0.2.7848.zip) = 79f579b72481df981b19c4fda03ff03ac509177a532809d5c295e1276127cdaa
-SIZE (wysiwygplugin-0.2.7848.zip) = 138095
+SHA256 (trac/wysiwyg-0.4.11508.tar.bz2) = 2c988573b57bd4942fad7b023b2faed9a82e3a11beec130cba38ada98de91895
+SIZE (trac/wysiwyg-0.4.11508.tar.bz2) = 41353
--- trac-wysiwyg-0.4.11508.patch ends here ---


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



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