ports/174911: [PATCH] cad/leocad: update to 0.79.1, take maintainership, added OptionsNG, license, icons, documentation

Wed Jan 2 20:10:00 UTC 2013

>Number:         174911
>Category:       ports
>Synopsis:       [PATCH] cad/leocad: update to 0.79.1, take maintainership, added OptionsNG, license, icons, documentation
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Jan 02 20:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:
- Update to 0.79.1
- Take maintainership

Added file(s):
- pkg-plist

Makefile changed:
+MASTER_SITES=	GOOGLE_CODE
+DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tgz \
+		${LEOCAD_PIECES}
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}-src.tgz
+COMMENT=
+LICENSE=	GPLv2
+PORTDOCS=	*
+INSTALLS_ICONS=
+.include <bsd.port.options.mk>

Changed and refined:
+DESKTOP_ENTRIES=
 post-extract:
 post-patch:
 files/patch-config.mk
 pkg-descr

Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:

portlint -A
looks fine.

port test: clean

>Fix:

--- leocad-0.79.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/cad/leocad/Makefile ./Makefile
--- /usr/ports/cad/leocad/Makefile	2012-12-14 22:27:46.000000000 +0100
+++ ./Makefile	2013-01-02 20:50:47.000000000 +0100
@@ -2,22 +2,25 @@
 # $FreeBSD: head/cad/leocad/Makefile 308912 2012-12-14 17:27:03Z eadler $
 
 PORTNAME=	leocad
-PORTVERSION=	0.79.0
+PORTVERSION=	0.79.1
 CATEGORIES=	cad
-MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE}
-DISTFILES=	${LEOCAD_DISTNAME} ${LEOCAD_PIECES}
-EXTRACT_ONLY=	${LEOCAD_DISTNAME}
+MASTER_SITES=	GOOGLE_CODE
+DISTFILES=	${PORTNAME}-${PORTVERSION}-src.tgz \
+		${LEOCAD_PIECES}
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}-src.tgz
 
-MAINTAINER=	ports at FreeBSD.org
-COMMENT=	A CAD program that uses bricks similar to those found in many toys
+MAINTAINER=	nemysis at gmx.ch
+COMMENT=	CAD program that uses bricks similar to those found in many toys
+
+LICENSE=	GPLv2
 
 EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png
 
-LEOCAD_DISTNAME=leocad-${PORTVERSION}-src.tgz
-LEOCAD_PIECES=	pieces-5823b.zip
 WRKSRC=		${WRKDIR}/${PORTNAME}
+LEOCAD_PIECES=	pieces-7114.zip
 
 USE_GL=		glut
 USE_XORG=	x11
@@ -25,25 +28,40 @@
 USE_GNOME=	gtk20
 MAKE_JOBS_UNSAFE=	yes
 
-DESKTOP_ENTRIES="Leocad" "${COMMENT}" "" "${PORTNAME}" "Engineering;" "true"
+PORTDOCS=	*
+
+DOCSRCDIR1=	${WRKSRC}
+DOC_FILES1=	CREDITS.txt README.txt
+
+DOCSRCDIR2=	${WRKSRC}/docs
+DOCSDIR2=	${DOCSDIR}/docs
+DOC_FILES2=	LINUX.txt TODO.txt
+
+INSTALLS_ICONS=	yes
+ICON_SIZES=	16x16 24x24 32x32 48x48 256x256
+
+DESKTOP_ENTRIES="LeoCAD" "${COMMENT}" "${PORTNAME}" \
+		"${PORTNAME}" "Development;Electronics;Engineering;" ${FALSE}
 
-PLIST_FILES=	bin/leocad \
-		${DATADIR_REL}/pieces.bin \
-		${DATADIR_REL}/pieces.idx
-PLIST_DIRS=	${DATADIR_REL}
 MAN1=		leocad.1
 
+.include <bsd.port.options.mk>
+
 post-extract:
-	@${UNZIP_CMD} -q -o ${DISTDIR}/${LEOCAD_PIECES} -d ${WRKDIR}/pieces
+	@${UNZIP_CMD} -q -o ${_DISTDIR}/${LEOCAD_PIECES} -d ${WRKDIR}/pieces
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|%%LOCALBASE%%|${LOCALBASE}|g; \
-		s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|; \
-		s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
+	@${REINPLACE_CMD} \
+		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
+		-e 's|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|' \
+		-e 's|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
 		${WRKSRC}/config.mk
 	@${REINPLACE_CMD} 's|share/man|man|g' \
 		${WRKSRC}/Makefile
+.for s in 16 24 32 48 256
+	@cd ${WRKSRC}/tools/icon && \
+		${MV} icon${s}.png ${PORTNAME}_${s}x${s}.png
+.endfor
 
 do-configure:
 	cd ${WRKSRC} && ${GMAKE} config
@@ -52,6 +70,20 @@
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKDIR}/pieces/* ${DATADIR}
 
+.for s in ${ICON_SIZES}
+	${MKDIR} ${PREFIX}/share/icons/hicolor/${s}/apps
+	${INSTALL_DATA} ${WRKSRC}/tools/icon/${PORTNAME}_${s}.png \
+		${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png
+.endfor
+	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png ${PREFIX}/share/pixmaps
+
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${DOCSDIR}
+	${MKDIR} ${DOCSDIR2}
+	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${DOCSDIR2}
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
diff -ruN --exclude=CVS /usr/ports/cad/leocad/distinfo ./distinfo
--- /usr/ports/cad/leocad/distinfo	2012-12-14 22:27:46.000000000 +0100
+++ ./distinfo	2013-01-02 20:34:31.000000000 +0100
@@ -1,4 +1,4 @@
-SHA256 (leocad-0.79.0-src.tgz) = 85f34dd560dec590ac5b0a5a7983359758fa58a729dbe3208a89c61f12440f24
-SIZE (leocad-0.79.0-src.tgz) = 624961
-SHA256 (pieces-5823b.zip) = 4c833bd1d89730757d8b391e20ba20ab133cd242b6717e89cee8fdf1c26f9a23
-SIZE (pieces-5823b.zip) = 44541797
+SHA256 (leocad/leocad-0.79.1-src.tgz) = c13266380f3d9d34f1cf60f496640b2bad0d145ff9c892b48f93563ee3b7b023
+SIZE (leocad/leocad-0.79.1-src.tgz) = 626772
+SHA256 (leocad/pieces-7114.zip) = 16506da21d139769524d140ce47bfce57bc5415f541fbd6f66a67025c1f535ab
+SIZE (leocad/pieces-7114.zip) = 20546651
diff -ruN --exclude=CVS /usr/ports/cad/leocad/files/patch-config.mk ./files/patch-config.mk
--- /usr/ports/cad/leocad/files/patch-config.mk	2012-12-14 22:27:46.000000000 +0100
+++ ./files/patch-config.mk	2013-01-02 18:49:24.000000000 +0100
@@ -1,6 +1,6 @@
---- config.mk.orig	2012-12-14 12:16:05.000000000 -0500
-+++ config.mk	2012-12-14 12:16:51.000000000 -0500
-@@ -6,12 +6,13 @@ ERROR_SETTING=2> /dev/null
+--- config.mk.orig	2013-01-02 08:56:54.000000000 +0100
++++ config.mk	2013-01-02 18:38:58.000000000 +0100
+@@ -6,17 +6,17 @@
  
  default: all
  
@@ -12,8 +12,13 @@
  
  # (Add a -g for debugging)
 -CPPFLAGS += -O2 -Wall
-+CPPFLAGS += -Wall -I%%LOCALBASE%%/include %%PTHREAD_CFLAGS%%
-+LDFLAGS	+= %%PTHREAD_LIBS%%
  
  ### FreeBSD configuration
  
+ ifeq ($(shell uname), FreeBSD)
+-CPPFLAGS += -L/usr/local/lib
++CPPFLAGS += -Wall -I%%LOCALBASE%%/include %%PTHREAD_CFLAGS%%
++LDFLAGS += -L%%LOCALBASE%%/lib %%PTHREAD_LIBS%%
+ endif
+ 
+ ### Default directory
diff -ruN --exclude=CVS /usr/ports/cad/leocad/pkg-descr ./pkg-descr
--- /usr/ports/cad/leocad/pkg-descr	2012-12-05 00:44:26.000000000 +0100
+++ ./pkg-descr	2013-01-02 19:00:02.000000000 +0100
@@ -1,6 +1,5 @@
-LeoCAD is a CAD program that uses bricks similar to those found in
-many toys (but they don't represent any particular brand). Currently
-it has a library of more than 1000 different pieces, most of them
-were created by James Jessiman (the author of LDraw).
+LeoCAD is a CAD program that can be used to create virtual LEGO models.
+It has an easy to use interface and currently features over 4000 different
+pieces created by the LDraw community.
 
 WWW: http://www.leocad.org
diff -ruN --exclude=CVS /usr/ports/cad/leocad/pkg-plist ./pkg-plist
--- /usr/ports/cad/leocad/pkg-plist	1970-01-01 01:00:00.000000000 +0100
+++ ./pkg-plist	2013-01-02 20:38:43.000000000 +0100
@@ -0,0 +1,21 @@
+bin/leocad
+share/icons/hicolor/16x16/apps/leocad.png
+share/icons/hicolor/24x24/apps/leocad.png
+share/icons/hicolor/256x256/apps/leocad.png
+share/icons/hicolor/32x32/apps/leocad.png
+share/icons/hicolor/48x48/apps/leocad.png
+%%DATADIR%%/library.bin
+share/pixmaps/leocad.png
+ at dirrm %%DATADIR%%
+ at dirrmtry share/icons/hicolor/48x48/apps
+ at dirrmtry share/icons/hicolor/48x48
+ at dirrmtry share/icons/hicolor/32x32/apps
+ at dirrmtry share/icons/hicolor/32x32
+ at dirrmtry share/icons/hicolor/256x256/apps
+ at dirrmtry share/icons/hicolor/256x256
+ at dirrmtry share/icons/hicolor/24x24/apps
+ at dirrmtry share/icons/hicolor/24x24
+ at dirrmtry share/icons/hicolor/16x16/apps
+ at dirrmtry share/icons/hicolor/16x16
+ at dirrmtry share/icons/hicolor
+ at dirrmtry share/icons
--- leocad-0.79.1.patch ends here ---

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