Attachment 130308 Details for Bug 174199 – cad_leocad.diff

[patch] cad_leocad.diff

cad_leocad.diff (text/x-diff), 4.25 KB, created by tkato432 on 2013-01-07 17:55:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2013-01-07 17:55:06 UTC

Size: 4.25 KB

patch

obsolete

>diff -urN /usr/ports/cad/leocad/Makefile cad/leocad/Makefile
>--- /usr/ports/cad/leocad/Makefile	2013-01-07 13:59:41.000000000 +0900
>+++ cad/leocad/Makefile	2013-01-07 14:59:14.000000000 +0900
>@@ -2,11 +2,11 @@
> # $FreeBSD: head/cad/leocad/Makefile 310020 2013-01-07 02:07:26Z makc $
> 
> 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}
>+EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}-src.tgz
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	CAD modeling with LEGO-like bricks
>@@ -15,47 +15,47 @@
> 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
>+USE_GMAKE=	yes
>+MAKE_JOBS_SAFE=	yes
> 
> DESKTOP_ENTRIES="Leocad" "${COMMENT}" "" "${PORTNAME}" "" "true"
> 
>-PLIST_FILES=	bin/leocad \
>-		${DATADIR_REL}/pieces.bin \
>-		${DATADIR_REL}/pieces.idx
>-PLIST_DIRS=	${DATADIR_REL}
> MAN1=		leocad.1
>+PLIST_FILES=	bin/leocad %%DATADIR%%/library.bin
>+PLIST_DIRS=	%%DATADIR%%
>+
>+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
> 
> 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}
>+	@${MKDIR} ${DATADIR}
> 	${INSTALL_DATA} ${WRKDIR}/pieces/* ${DATADIR}
> 
>-.include <bsd.port.pre.mk>
>-
>-.if ${ARCH} == "sparc64"
>-BROKEN=		Does not compile on sparc64
>-.endif
>-
> .include <bsd.port.post.mk>
>diff -urN /usr/ports/cad/leocad/distinfo cad/leocad/distinfo
>--- /usr/ports/cad/leocad/distinfo	2012-12-15 04:32:53.000000000 +0900
>+++ cad/leocad/distinfo	2013-01-03 15:23:40.000000000 +0900
>@@ -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-0.79.1-src.tgz) = c13266380f3d9d34f1cf60f496640b2bad0d145ff9c892b48f93563ee3b7b023
>+SIZE (leocad-0.79.1-src.tgz) = 626772
>+SHA256 (pieces-7114.zip) = 16506da21d139769524d140ce47bfce57bc5415f541fbd6f66a67025c1f535ab
>+SIZE (pieces-7114.zip) = 20546651
>diff -urN /usr/ports/cad/leocad/files/patch-config.mk cad/leocad/files/patch-config.mk
>--- /usr/ports/cad/leocad/files/patch-config.mk	2012-12-15 04:32:53.000000000 +0900
>+++ cad/leocad/files/patch-config.mk	2012-12-15 04:42:28.000000000 +0900
>@@ -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

Actions: View | Diff

Attachments on bug 174199: 130305 | 130306 | 130307 | 130308 | 130309