Bug 149027

Summary: [MAINTAINER] cad/pythoncad: update to 37
Product: Ports & Packages Reporter: Sven Esbjerg <esbjerg>
Component: Individual Port(s)Assignee: Dmitry Marakasov <amdmi3>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
pythoncad-37_1.patch none

Description Sven Esbjerg 2010-07-28 11:30:01 UTC 
- Update to 37

Added file(s):
- files/patch-PythonCAD_Generic_preferences.py
- files/patch-PythonCAD_Interface_Gtk_gtkimage.py

Generated with FreeBSD Port Tools 0.99
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2010-07-28 11:30:14 UTC 
Class Changed
From-To: maintainer-update->change-request

Fix category (submitter is not maintainer) (via the GNATS Auto Assign 
Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2010-07-28 11:30:17 UTC 
Maintainer of cad/pythoncad,

Please note that PR ports/149027 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/149027

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Edwin Groothuis freebsd_committer freebsd_triage 2010-07-28 11:30:20 UTC 
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 4 Sven Esbjerg 2010-07-28 17:25:17 UTC 
On Wed, Jul 28, 2010 at 10:30:17AM +0000, Edwin Groothuis wrote:
> Maintainer of cad/pythoncad,
> 
> Please note that PR ports/149027 has just been submitted.
> 
> If it contains a patch for an upgrade, an enhancement or a bug fix
> you agree on, reply to this email stating that you approve the patch
> and a committer will take care of it.

Yes I approve.


Regards
Sven Esbjerg
Comment 5 Mark Linimon freebsd_committer freebsd_triage 2010-07-28 19:35:24 UTC 
State Changed
From-To: feedback->open

Maintainer approved.
Comment 6 Dmitry Marakasov freebsd_committer freebsd_triage 2010-07-29 15:11:51 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->amdmi3

I'll take it.
Comment 7 Dmitry Marakasov 2010-08-24 12:21:22 UTC 
* Sven Esbjerg (esbjerg@xbsd.net) wrote:

How about these changes in addition:

* Use SF macro
* Don't hardcode /usr/local
* Clean up installation a bit
  * Use INSTALL_* macros
  * MKDIR unconditionally, it doesn't fail when dir exists
* Use dirrmtry for etc dir, as it may contain user's prefs.py

--- pythoncad.diff begins here ---
diff -ruN pythoncad.orig/Makefile pythoncad/Makefile
--- pythoncad.orig/Makefile	2010-08-24 04:32:25.000000000 +0400
+++ pythoncad/Makefile	2010-08-24 04:34:49.000000000 +0400
@@ -8,10 +8,8 @@
 
 PORTNAME=	pythoncad
 PORTVERSION=	37
-PORTREVISION=	1
 CATEGORIES=	cad
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}/${PORTNAME}/R${PORTVERSION}/Source
+MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/R${PORTVERSION}/Source
 DISTNAME=	PythonCAD-DS1-R${PORTVERSION}
 
 MAINTAINER=	fbsd-ports@xbsd.net
@@ -27,12 +25,15 @@
 PYDISTUTILS_PKGNAME=	PythonCAD
 PYDISTUTILS_PKGVERSION=	DS1-R${PORTVERSION}
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|' \
+		${WRKSRC}/PythonCAD/Generic/preferences.py \
+		${WRKSRC}/PythonCAD/Interface/Gtk/gtkimage.py
+
 post-install:
-	        ${INSTALL_SCRIPT} ${WRKSRC}/gtkpycad.py ${PREFIX}/bin/gtkpycad
-		${CP} ${WRKSRC}/gtkpycad.png ${PREFIX}/share/pixmaps
-		@if [ ! -d ${PREFIX}/etc/pythoncad ] ; then \
-		   ${MKDIR} ${PREFIX}/etc/pythoncad ; \
-		fi
-		${CP} ${WRKSRC}/prefs.py ${PREFIX}/etc/pythoncad/prefs.py.sample
+	${INSTALL_SCRIPT} ${WRKSRC}/gtkpycad.py ${PREFIX}/bin/gtkpycad
+	${INSTALL_DATA} ${WRKSRC}/gtkpycad.png ${PREFIX}/share/pixmaps
+	${MKDIR} ${PREFIX}/etc/pythoncad
+	${INSTALL_DATA} ${WRKSRC}/prefs.py ${PREFIX}/etc/pythoncad/prefs.py.sample
 
 .include <bsd.port.mk>
diff -ruN pythoncad.orig/pkg-plist pythoncad/pkg-plist
--- pythoncad.orig/pkg-plist	2010-08-24 04:32:25.000000000 +0400
+++ pythoncad/pkg-plist	2010-08-20 07:03:17.000000000 +0400
@@ -303,4 +303,4 @@
 @dirrm %%PYTHON_SITELIBDIR%%/PythonCAD/Interface
 @dirrm %%PYTHON_SITELIBDIR%%/PythonCAD/Generic
 @dirrm %%PYTHON_SITELIBDIR%%/PythonCAD
-@dirrm etc/pythoncad
+@dirrmtry etc/pythoncad
--- pythoncad.diff ends here ---


-- 
Dmitry Marakasov   .   55B5 0596 FF1E 8D84 5F56  9510 D35A 80DD F9D2 F77D
amdmi3@amdmi3.ru  ..:  jabber: amdmi3@jabber.ru    http://www.amdmi3.ru
Comment 8 Dmitry Marakasov freebsd_committer freebsd_triage 2010-08-24 12:21:35 UTC 
State Changed
From-To: open->feedback

Ask for submitter approval.
Comment 9 Sven Esbjerg 2010-08-24 16:17:57 UTC 
On Tue, Aug 24, 2010 at 03:21:22PM +0400, Dmitry Marakasov wrote:
> * Sven Esbjerg (fbsd-ports@xbsd.net) wrote:
> 
> How about these changes in addition:
>
> * Use SF macro
> * Don't hardcode /usr/local
> * Clean up installation a bit
>   * Use INSTALL_* macros
>   * MKDIR unconditionally, it doesn't fail when dir exists
> * Use dirrmtry for etc dir, as it may contain user's prefs.py

Looks very good to me. I still need to learn the tricks ;)

-Sven
Comment 10 Dmitry Marakasov freebsd_committer freebsd_triage 2010-08-24 18:48:01 UTC 
State Changed
From-To: feedback->closed

Committed. Thanks!
Comment 11 dfilter service freebsd_committer freebsd_triage 2010-08-24 18:50:38 UTC 
amdmi3      2010-08-24 17:47:47 UTC

  FreeBSD ports repository

  Modified files:
    cad/pythoncad        Makefile distinfo pkg-descr pkg-plist 
  Added files:
    cad/pythoncad/files  patch-PythonCAD_Generic_preferences.py 
                         patch-PythonCAD_Interface_Gtk_gtkimage.py 
  Log:
  - Update to 37
  
  PR:             149027
  Submitted by:   Sven Esbjerg <esbjerg@xbsd.net> (maintainer)
  
  Revision  Changes    Path
  1.22      +13 -3     ports/cad/pythoncad/Makefile
  1.11      +3 -3      ports/cad/pythoncad/distinfo
  1.1       +11 -0     ports/cad/pythoncad/files/patch-PythonCAD_Generic_preferences.py (new)
  1.1       +11 -0     ports/cad/pythoncad/files/patch-PythonCAD_Interface_Gtk_gtkimage.py (new)
  1.2       +7 -4      ports/cad/pythoncad/pkg-descr
  1.8       +264 -247  ports/cad/pythoncad/pkg-plist
_______________________________________________
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"