Bug 174199

Summary: cad/leocad: Update to version 0.78.1
Product: Ports & Packages Reporter: tkato432
Component: Individual Port(s)Assignee: Marcelo Araujo <araujo>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff
none
cad_leocad.diff
none
cad_leocad.diff
none
cad_leocad.diff
none
cad_leocad.diff none

Description tkato432 2012-12-05 18:10:12 UTC 
- Update to version 0.78.1
Comment 1 Marcelo Araujo freebsd_committer freebsd_triage 2012-12-11 11:19:56 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->araujo

I'll take it.
Comment 2 tkato432 2012-12-14 20:55:19 UTC 
Remake of the patch against current tree.
Comment 3 tkato432 2013-01-03 17:56:14 UTC 
Version 0.79.1 has been released.
Comment 4 tkato432 2013-01-07 17:55:06 UTC 
Remake of the patch against current tree.
Comment 5 tkato432 2013-01-23 18:30:00 UTC 
Version 0.79.2 has been released.
Comment 6 Marcelo Araujo freebsd_committer freebsd_triage 2013-02-04 10:03:20 UTC 
State Changed
From-To: open->closed

Committed. Thanks!
Comment 7 dfilter service freebsd_committer freebsd_triage 2013-02-04 10:03:25 UTC 
Author: araujo
Date: Mon Feb  4 10:03:15 2013
New Revision: 311598
URL: http://svnweb.freebsd.org/changeset/ports/311598

Log:
  - Update to 0.79.2.
  
  PR:		ports/174199
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Added:
  head/cad/leocad/pkg-plist   (contents, props changed)
Modified:
  head/cad/leocad/Makefile
  head/cad/leocad/distinfo   (contents, props changed)
  head/cad/leocad/files/patch-config.mk   (contents, props changed)

Modified: head/cad/leocad/Makefile
==============================================================================
--- head/cad/leocad/Makefile	Mon Feb  4 10:01:55 2013	(r311597)
+++ head/cad/leocad/Makefile	Mon Feb  4 10:03:15 2013	(r311598)
@@ -2,12 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	leocad
-PORTVERSION=	0.79.0
-PORTREVISION=	1
+PORTVERSION=	0.79.2
 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@FreeBSD.org
 COMMENT=	CAD modeling with LEGO-like bricks
@@ -16,47 +16,44 @@ EXTRACT_DEPENDS=unzip:${PORTSDIR}/archiv
 LIB_DEPENDS=	jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png
 
-LEOCAD_DISTNAME=leocad-${PORTVERSION}-src.tgz
-LEOCAD_PIECES=	pieces-5823b.zip
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_GL=		glut
-USE_XORG=	x11
-USE_GMAKE=	yes
+USE_GL=		gl
 USE_GNOME=	gtk20
-MAKE_JOBS_UNSAFE=	yes
-
-DESKTOP_ENTRIES="Leocad" "${COMMENT}" "" "${PORTNAME}" "" "true"
+USE_GMAKE=	yes
+INSTALL_ICONS=	yes
+MAKE_JOBS_SAFE=	yes
 
-PLIST_FILES=	bin/leocad \
-		${DATADIR_REL}/pieces.bin \
-		${DATADIR_REL}/pieces.idx
-PLIST_DIRS=	${DATADIR_REL}
 MAN1=		leocad.1
 
+LEOCAD_PIECES=	pieces-7114.zip
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "sparc64"
+BROKEN=		Does not compile on sparc64
+.endif
+
 post-extract:
-	@${UNZIP_CMD} -q -o ${DISTDIR}/${LEOCAD_PIECES} -d ${WRKDIR}/pieces
+	@${UNZIP_CMD} -q -o ${DISTDIR}/${DIST_SUBDIR}/${LEOCAD_PIECES} \
+		-d ${WRKDIR}/pieces
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|%%LOCALBASE%%|${LOCALBASE}|g; \
-		s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}|; \
-		s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' \
-		${WRKSRC}/config.mk
-	@${REINPLACE_CMD} 's|share/man|man|g' \
-		${WRKSRC}/Makefile
+		's|%%LOCALBASE%%|${LOCALBASE}| ; \
+		 s|%%PTHREAD_CFLAGS%%|${PTHREAD_CFLAGS}| ; \
+		 s|%%PTHREAD_LIBS%%|${PTHREAD_LIBS}|' ${WRKSRC}/config.mk
+	@${REINPLACE_CMD} -e \
+		's|+= -g|+=| ; \
+		 s|@$$(CXX)|$$(CXX)| ; \
+		 s|@install -c -m 0755|$${BSD_INSTALL_PROGRAM}| ; \
+		 s|@install -c -m 0644|$${BSD_INSTALL_MAN}| ; \
+		 s|share/man|man|' ${WRKSRC}/Makefile
 
 do-configure:
-	cd ${WRKSRC} && ${GMAKE} config
+	(cd ${WRKSRC} && ${SETENV} PREFIX="${PREFIX}" ${GMAKE} config)
 
 post-install:
-	${MKDIR} ${DATADIR}
-	${INSTALL_DATA} ${WRKDIR}/pieces/* ${DATADIR}
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
-.endif
+	(cd ${WRKDIR}/pieces && ${INSTALL_DATA} * ${DATADIR})
 
 .include <bsd.port.post.mk>

Modified: head/cad/leocad/distinfo
==============================================================================
--- head/cad/leocad/distinfo	Mon Feb  4 10:01:55 2013	(r311597)
+++ head/cad/leocad/distinfo	Mon Feb  4 10:03:15 2013	(r311598)
@@ -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.2-src.tgz) = d2b0a515ce8302cd9234450773a339e330718463edf52d721e20edf6ccfa74e3
+SIZE (leocad/leocad-0.79.2-src.tgz) = 2115720
+SHA256 (leocad/pieces-7114.zip) = 16506da21d139769524d140ce47bfce57bc5415f541fbd6f66a67025c1f535ab
+SIZE (leocad/pieces-7114.zip) = 20546651

Modified: head/cad/leocad/files/patch-config.mk
==============================================================================
--- head/cad/leocad/files/patch-config.mk	Mon Feb  4 10:01:55 2013	(r311597)
+++ head/cad/leocad/files/patch-config.mk	Mon Feb  4 10:03:15 2013	(r311598)
@@ -1,19 +1,25 @@
---- 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	2012-12-14 07:50:24.000000000 +0900
++++ config.mk	2012-12-15 04:42:02.000000000 +0900
+@@ -6,17 +6,18 @@
  
  default: all
  
 -CC    := gcc
 -CXX   := g++
-+CC    ?= cc
-+CXX   ?= c++
++CC    ?= gcc
++CXX   ?= g++
  OSDIR := linux
  
  # (Add a -g for debugging)
 -CPPFLAGS += -O2 -Wall
-+CPPFLAGS += -Wall -I%%LOCALBASE%%/include %%PTHREAD_CFLAGS%%
-+LDFLAGS	+= %%PTHREAD_LIBS%%
++CPPFLAGS += -Wall
  
  ### FreeBSD configuration
  
+ ifeq ($(shell uname), FreeBSD)
+-CPPFLAGS += -L/usr/local/lib
++CPPFLAGS += -I%%LOCALBASE%%/include %%PTHREAD_LIBS%%
++LDFLAGS  += -L%%LOCALBASE%%/lib %%PTHREAD_LIBS%%
+ endif
+ 
+ ### Default directory

Added: head/cad/leocad/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/cad/leocad/pkg-plist	Mon Feb  4 10:03:15 2013	(r311598)
@@ -0,0 +1,12 @@
+bin/leocad
+share/applications/leocad.desktop
+share/icons/hicolor/scalable/mimetypes/application-vnd.leocad.svg
+share/icons/hicolor/icon-theme.cache
+%%DATADIR%%/icon.png
+%%DATADIR%%/library.bin
+share/mime/packages/leocad-mime.xml 
+share/pixmaps/leocad.svg 
+@dirrm %%DATADIR%%
+@dirrmtry share/applications
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"