Date: Mon, 4 Feb 2013 18:00:01 GMT From: nemysis <nemysis@gmx.ch> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/174911: [PATCH] cad/leocad: update to 0.79.1, take maintainership, added OptionsNG, license, icons, documentation Message-ID: <201302041800.r14I01ta010224@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/174911; it has been noted by GNATS.
From: nemysis <nemysis@gmx.ch>
To: bug-followup@FreeBSD.org
Cc:
Subject: Re: ports/174911: [PATCH] cad/leocad: update to 0.79.1, take
maintainership, added OptionsNG, license, icons, documentation
Date: Mon, 4 Feb 2013 18:56:09 +0100
--MP_/HmqPWCkfb+009bWjKn6Rnwm
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Update after commit cad/leocad to 0.79.2
portlint -A
looks fine.
port test: clean
--MP_/HmqPWCkfb+009bWjKn6Rnwm
Content-Type: text/x-patch
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename=leocad.diff
===> Generating patch
===> Viewing diff with more
diff -ruN --exclude=CVS /usr/ports/cad/leocad/Makefile ./Makefile
--- /usr/ports/cad/leocad/Makefile 2013-02-04 17:00:49.000000000 +0100
+++ ./Makefile 2013-02-04 18:39:11.000000000 +0100
@@ -3,57 +3,92 @@
PORTNAME= leocad
PORTVERSION= 0.79.2
+PORTREVISION= 1
CATEGORIES= cad
MASTER_SITES= GOOGLE_CODE
-DISTFILES= ${PORTNAME}-${PORTVERSION}-src.tgz ${LEOCAD_PIECES}
+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
+MAINTAINER= nemysis@gmx.ch
+COMMENT= CAD program that uses bricks similar to those found in many toys
+
+LICENSE= GPLv2
EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip
+BUILD_DEPENDS= update-mime-database:${PORTSDIR}/misc/shared-mime-info
LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
png15:${PORTSDIR}/graphics/png
WRKSRC= ${WRKDIR}/${PORTNAME}
+LEOCAD_PIECES= pieces-7114.zip
-USE_GL= gl
+USE_GL= glut
USE_GNOME= gtk20
USE_GMAKE= yes
-INSTALL_ICONS= yes
MAKE_JOBS_SAFE= yes
-MAN1= leocad.1
+PORTDOCS= *
-LEOCAD_PIECES= pieces-7114.zip
+DOCSRCDIR1= ${WRKSRC}
+DOC_FILES1= CREDITS.txt README.txt
-.include <bsd.port.pre.mk>
+DOCSRCDIR2= ${WRKSRC}/docs
+DOCSDIR2= ${DOCSDIR}/docs
+DOC_FILES2= LINUX.txt TODO.txt
-.if ${ARCH} == "sparc64"
-BROKEN= Does not compile on sparc64
-.endif
+INSTALLS_ICONS= yes
+ICON_SIZES= 16x16 24x24 32x32 48x48 128x128 256x256
+
+MAN1= leocad.1
+
+.include <bsd.port.options.mk>
post-extract:
- @${UNZIP_CMD} -q -o ${DISTDIR}/${DIST_SUBDIR}/${LEOCAD_PIECES} \
- -d ${WRKDIR}/pieces
+ @${UNZIP_CMD} -q -o ${_DISTDIR}/${LEOCAD_PIECES} -d ${WRKDIR}/pieces
post-patch:
- @${REINPLACE_CMD} -e \
- '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
+ @${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 128 256
+ @cd ${WRKSRC}/tools/icon && \
+ ${MV} icon${s}.png ${PORTNAME}_${s}x${s}.png
+.endfor
+ @cd ${WRKSRC}/tools/icon && ${CP} -a ${PORTNAME}_128x128.png icon128.png
do-configure:
- (cd ${WRKSRC} && ${SETENV} PREFIX="${PREFIX}" ${GMAKE} config)
+ cd ${WRKSRC} && ${SETENV} PREFIX="${PREFIX}" ${GMAKE} config
post-install:
- (cd ${WRKDIR}/pieces && ${INSTALL_DATA} * ${DATADIR})
+ ${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
+
+ @-update-mime-database ${PREFIX}/share/mime
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "sparc64"
+BROKEN= Does not compile on sparc64
+.endif
.include <bsd.port.post.mk>
diff -ruN --exclude=CVS /usr/ports/cad/leocad/files/patch-config.mk ./files/patch-config.mk
--- /usr/ports/cad/leocad/files/patch-config.mk 2013-02-04 17:00:49.000000000 +0100
+++ ./files/patch-config.mk 2013-02-04 17:29:23.000000000 +0100
@@ -1,13 +1,13 @@
---- 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 @@
+--- config.mk.orig 2013-01-22 00:21:07.000000000 +0100
++++ config.mk 2013-02-04 17:25:50.000000000 +0100
+@@ -5,17 +5,18 @@
default: all
-CC := gcc
-CXX := g++
-+CC ?= gcc
-+CXX ?= g++
++CC := cc
++CXX := c++
OSDIR := linux
# (Add a -g for debugging)
@@ -18,8 +18,8 @@
ifeq ($(shell uname), FreeBSD)
-CPPFLAGS += -L/usr/local/lib
-+CPPFLAGS += -I%%LOCALBASE%%/include %%PTHREAD_LIBS%%
-+LDFLAGS += -L%%LOCALBASE%%/lib %%PTHREAD_LIBS%%
++CPPFLAGS += -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 2013-01-14 17:53:35.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 2013-02-04 17:00:49.000000000 +0100
+++ ./pkg-plist 2013-02-04 18:13:35.000000000 +0100
@@ -1,12 +1,38 @@
bin/leocad
share/applications/leocad.desktop
+share/icons/hicolor/128x128/apps/leocad.png
+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
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
+share/mime/application/vnd.leocad.xml
+share/mime/packages/leocad-mime.xml
+share/pixmaps/leocad.png
+share/pixmaps/leocad.svg
+@dirrmtry share/mime/packages
+@dirrmtry share/mime/application
+@dirrmtry share/mime
@dirrm %%DATADIR%%
+@dirrmtry share/icons/hicolor/scalable/mimetypes
+@dirrmtry share/icons/hicolor/scalable
+@dirrmtry share/icons/hicolor/48x48/apps
+@dirrmtry share/icons/hicolor/48x48
+@dirrmtry share/icons/hicolor/32x32/apps
+@dirrmtry share/icons/hicolor/32x32
+@dirrmtry share/icons/hicolor/256x256/apps
+@dirrmtry share/icons/hicolor/256x256
+@dirrmtry share/icons/hicolor/24x24/apps
+@dirrmtry share/icons/hicolor/24x24
+@dirrmtry share/icons/hicolor/16x16/apps
+@dirrmtry share/icons/hicolor/16x16
+@dirrmtry share/icons/hicolor/128x128/apps
+@dirrmtry share/icons/hicolor/128x128
+@dirrmtry share/icons/hicolor
+@dirrmtry share/icons
@dirrmtry share/applications
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
===> Done
--MP_/HmqPWCkfb+009bWjKn6Rnwm--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302041800.r14I01ta010224>