Date: Thu, 6 Dec 2012 02:31:09 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/174199: cad/leocad: Update to version 0.78.1 Message-ID: <20121206023109.3f6b6db4f671cb88e3c49fdb@yahoo.com> Resent-Message-ID: <201212051810.qB5IADgb033759@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174199
>Category: ports
>Synopsis: cad/leocad: Update to version 0.78.1
>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: Wed Dec 05 18:10:12 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p11 i386
>Organization:
>Environment:
>Description:
- Update to version 0.78.1
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/cad/leocad/Makefile cad/leocad/Makefile
--- /usr/ports/cad/leocad/Makefile 2012-11-08 04:22:12.000000000 +0900
+++ cad/leocad/Makefile 2012-12-03 23:37:24.000000000 +0900
@@ -1,66 +1,61 @@
-# New ports collection makefile for: leocad
-# Date created: 27 Jan 2002
-# Whom: David Yeske <dyeske@gmail.com>
-#
+# Created by: David Yeske <dyeske@gmail.com>
# $FreeBSD: head/cad/leocad/Makefile 303870 2012-09-08 06:53:18Z linimon $
-#
PORTNAME= leocad
-PORTVERSION= 0.77.0
-PORTREVISION= 1
+PORTVERSION= 0.78.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= A CAD program that uses bricks similar to those found in many toys
+COMMENT= CAD program that uses bricks similar to those found in many toys
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}
-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}" "Engineering;" "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%%/pieces.bin %%DATADIR%%/pieces.idx
+PLIST_DIRS= %%DATADIR%%
+
+LEOCAD_PIECES= pieces-6152.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-11-08 04:22:12.000000000 +0900
+++ cad/leocad/distinfo 2012-11-28 18:31:46.000000000 +0900
@@ -1,4 +1,4 @@
-SHA256 (leocad-0.77.0-src.tgz) = 17afed6174a04f429ba230b21ee0f03472ebb7645fb45d8715b97953fb7ba788
-SIZE (leocad-0.77.0-src.tgz) = 645424
-SHA256 (pieces-5823b.zip) = 4c833bd1d89730757d8b391e20ba20ab133cd242b6717e89cee8fdf1c26f9a23
-SIZE (pieces-5823b.zip) = 44541797
+SHA256 (leocad-0.78.1-src.tgz) = ebd64b523845fbf4281516b6b01d06adec83dceabd533804c767258f8ca97eaf
+SIZE (leocad-0.78.1-src.tgz) = 645213
+SHA256 (pieces-6152.zip) = f713f9d752f6717cc5d5333b950a6cdc3cbf56e135f5f5534486513a8f9a0c9f
+SIZE (pieces-6152.zip) = 47305056
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-11-08 04:22:12.000000000 +0900
+++ cad/leocad/files/patch-config.mk 2012-11-28 18:52:57.000000000 +0900
@@ -1,6 +1,6 @@
--- config.mk.orig 2012-03-17 22:55:49.000000000 +0100
+++ config.mk 2012-07-11 20:57:38.000000000 +0200
-@@ -6,11 +6,12 @@
+@@ -6,11 +6,11 @@
default: all
@@ -11,8 +11,17 @@
# (Add a -g for debugging)
-CPPFLAGS += -O2 -Wall
-+CPPFLAGS += -Wall -I%%LOCALBASE%%/include %%PTHREAD_CFLAGS%%
-+LDFLAGS += %%PTHREAD_LIBS%%
++CPPFLAGS += -Wall
# Add compile options, such as -I option to include jpeglib's headers
# CPPFLAGS += -I/home/fred/jpeglib
+@@ -35,7 +35,8 @@
+ OS := -DLC_LINUX
+ OSDIR := linux
+ TEST_GTK := 1
+-CPPFLAGS += -L/usr/local/lib
++CPPFLAGS += -I%%LOCALBASE%%/include %%PTHREAD_CFLAGS%%
++LDFLAGS += -L%%LOCALBASE%%/lib %%PTHREAD_LIBS%%
+
+ endif
+
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121206023109.3f6b6db4f671cb88e3c49fdb>