- Update to 1.39

PR:		139518
Submitted by:	Ports Fury

3 files changed, 26 insertions, 33 deletions

diff --git a/graphics/autoq3d/Makefile b/graphics/autoq3d/Makefile
index f33df82ac7e2..a92c2d446107 100644
--- a/graphics/autoq3d/Makefile
+++ b/graphics/autoq3d/Makefile
@@ -6,26 +6,18 @@
 #
 
 PORTNAME=	autoq3d
-DISTVERSION=	1.36
-PORTREVISION=	2
+DISTVERSION=	1.39
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/AutoQ3D%20${PORTVERSION}
-DISTNAME=	AutoQ3DGPL${PORTVERSION:C/\./-/}qt4source
+DISTNAME=	AutoQ3DCommunity${PORTVERSION:C/\./-/}qt4source
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A complete QT quick 3d model editor program
 
 USE_ZIP=	yes
 USE_QT_VER=	4
-QT_COMPONENTS=	qmake_build corelib moc_build gui opengl
-
-PORTDOCS=	3DQformat.txt ChangeLog.txt Install.txt license.txt
-
-.if !defined(WITHOUT_NLS)
-PLIST_SUB+=	NLS=""
-.else
-PLIST_SUB+=	NLS="@comment "
-.endif
+QT_COMPONENTS=	corelib gui opengl \
+		moc_build qmake_build
 
 DESKTOP_ENTRIES=	"AutoQ3D" \
 			"A complete QT quick 3d model editor program" \
@@ -35,30 +27,26 @@ DESKTOP_ENTRIES=	"AutoQ3D" \
 			"false"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/share/AutoQ3D-GPL|${DATADIR}|g' \
-		${WRKSRC}/src/main.cpp \
-		${WRKSRC}/src/fgui/cadform.cpp \
-		${WRKSRC}/src/dialogs/prgsettings.cpp
+.for file in src/main.cpp src/fgui/cadform.cpp src/dialogs/prgsettings.cpp
+	@${REINPLACE_CMD} -e \
+		's|/usr/share/AutoQ3D-Community|${DATADIR}|g' ${WRKSRC}/${file}
+.endfor
 
-pre-build:
+do-configure:
 	@cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${QMAKE} -spec ${QMAKESPEC}
 
-post-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/AutoQ3D ${PREFIX}/bin
-	@${MKDIR} ${PREFIX}/share/pixmaps
-	@${INSTALL_DATA} ${WRKSRC}/AutoQ3D.png ${PREFIX}/share/pixmaps
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/AutoQ3D ${PREFIX}/bin
 	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${WRKSRC}/qref*.htm ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.htm ${DATADIR}
+	${INSTALL_DATA} ${WRKSRC}/*.qm ${DATADIR}
 	@${MKDIR} ${DATADIR}/images
-	@${INSTALL_DATA} ${WRKSRC}/images/*.png ${DATADIR}/images
-.if !defined(WITHOUT_NLS)
-	@${INSTALL_DATA} ${WRKSRC}/*.qm ${DATADIR}
-.endif
+	${INSTALL_DATA} ${WRKSRC}/images/*.png ${DATADIR}/images
+	@${MKDIR} ${PREFIX}/share/pixmaps
+	${INSTALL_DATA} ${WRKSRC}/AutoQ3D.png ${PREFIX}/share/pixmaps
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-.for doc in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/docs/${doc} ${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${WRKSRC}/docs/*.txt ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/autoq3d/distinfo b/graphics/autoq3d/distinfo
index 48a938bedb7b..f531389eaef2 100644
--- a/graphics/autoq3d/distinfo
+++ b/graphics/autoq3d/distinfo
@@ -1,3 +1,3 @@
-MD5 (AutoQ3DGPL1-36qt4source.zip) = 969a93ab1e0eaf69b5457b9fdaa169a2
-SHA256 (AutoQ3DGPL1-36qt4source.zip) = 39769b39aa99102201bf64bce447543624daf84cc0c75826685211e58bbd219a
-SIZE (AutoQ3DGPL1-36qt4source.zip) = 221520
+MD5 (AutoQ3DCommunity1-39qt4source.zip) = 7070fbc4f4174e0358963cf76768eb51
+SHA256 (AutoQ3DCommunity1-39qt4source.zip) = a498385d20ee4a6fbb9b6ea72fb75319f56b2013afad03a69d8aa64e4a78b8e9
+SIZE (AutoQ3DCommunity1-39qt4source.zip) = 219580
diff --git a/graphics/autoq3d/pkg-plist b/graphics/autoq3d/pkg-plist
index 419537c70aae..3d64b78ee85f 100644
--- a/graphics/autoq3d/pkg-plist
+++ b/graphics/autoq3d/pkg-plist
@@ -49,9 +49,14 @@ bin/AutoQ3D
 %%DATADIR%%/images/vwprop.png
 %%DATADIR%%/images/zoomi.png
 %%DATADIR%%/images/zoomim.png
-%%NLS%%%%DATADIR%%/lan_sp.qm
+%%DATADIR%%/lan_sp.qm
 %%DATADIR%%/qref.htm
 %%DATADIR%%/qref_sp.htm
+%%PORTDOCS%%%%DOCSDIR%%/3DQformat.txt
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.txt
+%%PORTDOCS%%%%DOCSDIR%%/Install.txt
+%%PORTDOCS%%%%DOCSDIR%%/license.txt
 share/pixmaps/AutoQ3D.png
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%DATADIR%%/images
 @dirrm %%DATADIR%%