From tkato432@yahoo.com  Sun Nov 24 18:02:15 2013
Return-Path: <tkato432@yahoo.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id CBDFF2C4
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun, 24 Nov 2013 18:01:58 +0000 (UTC)
Received: from omta01.auone-net.jp (mail-or0-f67.auone-net.jp [106.187.230.67])
	by mx1.freebsd.org (Postfix) with ESMTP id A07DE2C81
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sun, 24 Nov 2013 18:01:58 +0000 (UTC)
Received: from coppermine.my.domain (ZT030024.ppp.dion.ne.jp [59.128.30.24])
	by omta01.auone-net.jp (au one net mail) with ESMTP id 4B99B980038
	for <FreeBSD-gnats-submit@FreeBSD.org>; Mon, 25 Nov 2013 03:01:56 +0900 (JST)
Message-Id: <20131125025209.85cbc18e1fcfa0c64ddd87d8@yahoo.com>
Date: Mon, 25 Nov 2013 02:52:09 +0900
From: KATO Tsuguru <tkato432@yahoo.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: graphics/qslim: Fix build on -current

>Number:         184241
>Category:       ports
>Synopsis:       graphics/qslim: Fix build on -current
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pawel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 24 18:10:07 UTC 2013
>Closed-Date:    Wed Dec 25 17:43:18 UTC 2013
>Last-Modified:  Thu Dec 26 13:20:07 UTC 2013
>Originator:     KATO Tsuguru
>Release:        FreeBSD 8.4-RELEASE-p4 i386
>Organization:
>Environment:
>Description:
- Fix build on -current

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/graphics/qslim/Makefile graphics/qslim/Makefile
--- /usr/ports/graphics/qslim/Makefile	2013-11-06 22:02:22.000000000 +0900
+++ graphics/qslim/Makefile	2013-11-25 00:00:00.000000000 +0900
@@ -13,27 +13,28 @@
 
 LICENSE=	GPLv2
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff \
-		gfx.0:${PORTSDIR}/graphics/libgfx \
-		forms.2:${PORTSDIR}/x11-toolkits/xforms
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
+		libtiff.so:${PORTSDIR}/graphics/tiff \
+		libgfx.so:${PORTSDIR}/graphics/libgfx \
+		libforms.so:${PORTSDIR}/x11-toolkits/xforms
 
 CONFIGURE_WRKSRC=	${WRKSRC}/mixkit
 BUILD_WRKSRC=		${WRKSRC}/mixkit/src
 
+USES=		gmake
 USE_GL=		glu
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-MAKE_ENV=	FLTKCONFIG="${LOCALBASE}/bin/fltk-config"
+MAKE_ENV=	FLTKCONFIG="${FLTK_CONFIG}" GUI_LIBS="${GUI_LIBS}"
 MAKE_ARGS=	CC="${CC}" CXX="${CXX}"
 ALL_TARGET=	# none
 USE_LDCONFIG=	yes
 
-CFLAGS+=	-DMIX_ANSI_IOSTREAMS -fpermissive -fPIC ${CPPFLAGS}
-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} -DHAVE_BOOL
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CFLAGS+=	-DMIX_ANSI_IOSTREAMS -DHAVE_BOOL -fPIC -I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+FLTK_CONFIG=	${LOCALBASE}/bin/fltk-config
+GUI_LIBS=	$$(${FLTK_CONFIG} --use-gl --ldflags)
 
-NO_STAGE=	yes
 post-extract:
 	@${RM} -rf ${WRKSRC}/libgfx/
 
@@ -42,21 +43,26 @@
 	@${REINPLACE_CMD} -e 's/\.\..*mix\.a//' ${WRKSRC}/tools/qslim/Makefile
 	@${REINPLACE_CMD} -e '/gfx-config/d;s/\.a/.so/g;s/[(]AR[)] cru/(CXX) \
 		$$(CXXFLAGS) -shared -o/;/RANLIB/d' ${BUILD_WRKSRC}/${MAKEFILE}
-	@for f in ${BUILD_WRKSRC}/Makefile ${WRKSRC}/tools/qslim/Makefile;do\
-		${ECHO_CMD} '.SUFFIXES: .fl .c .cc .cxx .o' >> $$f;\
-		${ECHO_CMD} '.cxx.o:' >> $$f;\
-		${ECHO_CMD} '	$$(CXX) -c $$(CXXFLAGS) $$<' >> $$f;done
+.for i in mixkit/src/Makefile tools/qslim/Makefile
+	@${ECHO_CMD} '.SUFFIXES: .fl .c .cc .cxx .o' >> ${WRKSRC}/${i}
+	@${ECHO_CMD} '.cxx.o:' >> ${WRKSRC}/${i}
+	@${ECHO_CMD} '	$$(CXX) -c $$(CXXFLAGS) $$<' >> ${WRKSRC}/${i}
+.endfor
 
 post-build:
 	@(cd ${BUILD_WRKSRC}/../../tools/qslim && ${SETENV} ${MAKE_ENV} \
-	${GMAKE} ${MAKE_ARGS} ${ALL_TARGET})
+		${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET})
 
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/mixkit/src/libmix.so ${PREFIX}/lib/
-	@${LN} -sf libmix.so ${PREFIX}/lib/libmix.so.0
-	@${INSTALL_PROGRAM} ${WRKSRC}/tools/qslim/qslim ${PREFIX}/bin/
-	@${INSTALL_PROGRAM} ${WRKSRC}/tools/qslim/qvis ${PREFIX}/bin/
-	@${INSTALL} -d ${PREFIX}/include/mixkit/
-	@${INSTALL_DATA} ${WRKSRC}/mixkit/src/*.h ${PREFIX}/include/mixkit/
+.for i in qslim qvis 
+	(cd ${WRKSRC}/tools/qslim && ${INSTALL_PROGRAM} ${i} \
+		${STAGEDIR}${PREFIX}/bin)
+.endfor
+	@${MKDIR} ${STAGEDIR}${PREFIX}/include/mixkit
+	(cd ${WRKSRC}/mixkit/src && ${INSTALL_DATA} *.h \
+		${STAGEDIR}${PREFIX}/include/mixkit)
+	(cd ${WRKSRC}/mixkit/src && ${INSTALL_PROGRAM} libmix.so \
+		${STAGEDIR}${PREFIX}/lib)
+	@${LN} -sf libmix.so ${STAGEDIR}${PREFIX}/lib/libmix.so.0
 
 .include <bsd.port.mk>
>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->pawel 
Responsible-Changed-By: pawel 
Responsible-Changed-When: Wed Dec 25 17:33:54 UTC 2013 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184241 
State-Changed-From-To: open->closed 
State-Changed-By: pawel 
State-Changed-When: Wed Dec 25 17:43:17 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=184241 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184241: commit references a PR
Date: Wed, 25 Dec 2013 17:43:13 +0000 (UTC)

 Author: pawel
 Date: Wed Dec 25 17:43:05 2013
 New Revision: 337434
 URL: http://svnweb.freebsd.org/changeset/ports/337434
 
 Log:
   - Fix build on -current
   - Convert LIB_DEPENDS to new format
   - Support staging
   
   PR:		ports/184241
   Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
 
 Modified:
   head/graphics/qslim/Makefile
 
 Modified: head/graphics/qslim/Makefile
 ==============================================================================
 --- head/graphics/qslim/Makefile	Wed Dec 25 17:42:54 2013	(r337433)
 +++ head/graphics/qslim/Makefile	Wed Dec 25 17:43:05 2013	(r337434)
 @@ -9,31 +9,32 @@ MASTER_SITES=	http://mgarland.org/files/
  		CENKES
  
  MAINTAINER=	ports@FreeBSD.org
 -COMMENT=	SlimKit Surface Modeling Tools
 +COMMENT=	SlimKit surface modeling tools
  
  LICENSE=	GPLv2
  
 -LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 -		tiff.4:${PORTSDIR}/graphics/tiff \
 -		gfx.0:${PORTSDIR}/graphics/libgfx \
 -		forms.2:${PORTSDIR}/x11-toolkits/xforms
 +LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
 +		libtiff.so:${PORTSDIR}/graphics/tiff \
 +		libgfx.so:${PORTSDIR}/graphics/libgfx \
 +		libforms.so:${PORTSDIR}/x11-toolkits/xforms
  
  CONFIGURE_WRKSRC=	${WRKSRC}/mixkit
  BUILD_WRKSRC=		${WRKSRC}/mixkit/src
  
 +USES=		gmake
  USE_GL=		glu
 -USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
 -MAKE_ENV=	FLTKCONFIG="${LOCALBASE}/bin/fltk-config"
 +MAKE_ENV=	FLTKCONFIG="${FLTK_CONFIG}" GUI_LIBS="${GUI_LIBS}"
  MAKE_ARGS=	CC="${CC}" CXX="${CXX}"
  ALL_TARGET=	# none
  USE_LDCONFIG=	yes
  
 -CFLAGS+=	-DMIX_ANSI_IOSTREAMS -fpermissive -fPIC ${CPPFLAGS}
 -CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} -DHAVE_BOOL
 -LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 +CFLAGS+=	-DMIX_ANSI_IOSTREAMS -DHAVE_BOOL -fPIC -I${LOCALBASE}/include
 +LDFLAGS+=	-L${LOCALBASE}/lib
 +
 +FLTK_CONFIG=	${LOCALBASE}/bin/fltk-config
 +GUI_LIBS=	$$(${FLTK_CONFIG} --use-gl --ldflags)
  
 -NO_STAGE=	yes
  post-extract:
  	@${RM} -rf ${WRKSRC}/libgfx/
  
 @@ -42,21 +43,26 @@ post-patch:
  	@${REINPLACE_CMD} -e 's/\.\..*mix\.a//' ${WRKSRC}/tools/qslim/Makefile
  	@${REINPLACE_CMD} -e '/gfx-config/d;s/\.a/.so/g;s/[(]AR[)] cru/(CXX) \
  		$$(CXXFLAGS) -shared -o/;/RANLIB/d' ${BUILD_WRKSRC}/${MAKEFILE}
 -	@for f in ${BUILD_WRKSRC}/Makefile ${WRKSRC}/tools/qslim/Makefile;do\
 -		${ECHO_CMD} '.SUFFIXES: .fl .c .cc .cxx .o' >> $$f;\
 -		${ECHO_CMD} '.cxx.o:' >> $$f;\
 -		${ECHO_CMD} '	$$(CXX) -c $$(CXXFLAGS) $$<' >> $$f;done
 +.for i in mixkit/src/Makefile tools/qslim/Makefile
 +	@${ECHO_CMD} '.SUFFIXES: .fl .c .cc .cxx .o' >> ${WRKSRC}/${i}
 +	@${ECHO_CMD} '.cxx.o:' >> ${WRKSRC}/${i}
 +	@${ECHO_CMD} '	$$(CXX) -c $$(CXXFLAGS) $$<' >> ${WRKSRC}/${i}
 +.endfor
  
  post-build:
  	@(cd ${BUILD_WRKSRC}/../../tools/qslim && ${SETENV} ${MAKE_ENV} \
 -	${GMAKE} ${MAKE_ARGS} ${ALL_TARGET})
 +		${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET})
  
  do-install:
 -	@${INSTALL_PROGRAM} ${WRKSRC}/mixkit/src/libmix.so ${PREFIX}/lib/
 -	@${LN} -sf libmix.so ${PREFIX}/lib/libmix.so.0
 -	@${INSTALL_PROGRAM} ${WRKSRC}/tools/qslim/qslim ${PREFIX}/bin/
 -	@${INSTALL_PROGRAM} ${WRKSRC}/tools/qslim/qvis ${PREFIX}/bin/
 -	@${INSTALL} -d ${PREFIX}/include/mixkit/
 -	@${INSTALL_DATA} ${WRKSRC}/mixkit/src/*.h ${PREFIX}/include/mixkit/
 +.for i in qslim qvis
 +	(cd ${WRKSRC}/tools/qslim && ${INSTALL_PROGRAM} ${i} \
 +		${STAGEDIR}${PREFIX}/bin)
 +.endfor
 +	@${MKDIR} ${STAGEDIR}${PREFIX}/include/mixkit
 +	(cd ${WRKSRC}/mixkit/src && ${INSTALL_DATA} *.h \
 +		${STAGEDIR}${PREFIX}/include/mixkit)
 +	(cd ${WRKSRC}/mixkit/src && ${INSTALL_PROGRAM} libmix.so \
 +		${STAGEDIR}${PREFIX}/lib)
 +	@${LN} -sf libmix.so ${STAGEDIR}${PREFIX}/lib/libmix.so.0
  
  .include <bsd.port.mk>
 _______________________________________________
 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"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/184241: commit references a PR
Date: Thu, 26 Dec 2013 13:16:17 +0000 (UTC)

 Author: mat
 Date: Thu Dec 26 13:16:06 2013
 New Revision: 337502
 URL: http://svnweb.freebsd.org/changeset/ports/337502
 
 Log:
   MFH: r337434
   
   - Fix build on -current
   - Convert LIB_DEPENDS to new format
   - Support staging
   
   PR:		ports/184241
   Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
   Approved by:	portmgr (implicit)
 
 Modified:
   branches/2014Q1/graphics/qslim/Makefile
 Directory Properties:
   branches/2014Q1/   (props changed)
 
 Modified: branches/2014Q1/graphics/qslim/Makefile
 ==============================================================================
 --- branches/2014Q1/graphics/qslim/Makefile	Thu Dec 26 13:15:58 2013	(r337501)
 +++ branches/2014Q1/graphics/qslim/Makefile	Thu Dec 26 13:16:06 2013	(r337502)
 @@ -9,31 +9,32 @@ MASTER_SITES=	http://mgarland.org/files/
  		CENKES
  
  MAINTAINER=	ports@FreeBSD.org
 -COMMENT=	SlimKit Surface Modeling Tools
 +COMMENT=	SlimKit surface modeling tools
  
  LICENSE=	GPLv2
  
 -LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 -		tiff.4:${PORTSDIR}/graphics/tiff \
 -		gfx.0:${PORTSDIR}/graphics/libgfx \
 -		forms.2:${PORTSDIR}/x11-toolkits/xforms
 +LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
 +		libtiff.so:${PORTSDIR}/graphics/tiff \
 +		libgfx.so:${PORTSDIR}/graphics/libgfx \
 +		libforms.so:${PORTSDIR}/x11-toolkits/xforms
  
  CONFIGURE_WRKSRC=	${WRKSRC}/mixkit
  BUILD_WRKSRC=		${WRKSRC}/mixkit/src
  
 +USES=		gmake
  USE_GL=		glu
 -USE_GMAKE=	yes
  GNU_CONFIGURE=	yes
 -MAKE_ENV=	FLTKCONFIG="${LOCALBASE}/bin/fltk-config"
 +MAKE_ENV=	FLTKCONFIG="${FLTK_CONFIG}" GUI_LIBS="${GUI_LIBS}"
  MAKE_ARGS=	CC="${CC}" CXX="${CXX}"
  ALL_TARGET=	# none
  USE_LDCONFIG=	yes
  
 -CFLAGS+=	-DMIX_ANSI_IOSTREAMS -fpermissive -fPIC ${CPPFLAGS}
 -CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS} -DHAVE_BOOL
 -LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 +CFLAGS+=	-DMIX_ANSI_IOSTREAMS -DHAVE_BOOL -fPIC -I${LOCALBASE}/include
 +LDFLAGS+=	-L${LOCALBASE}/lib
 +
 +FLTK_CONFIG=	${LOCALBASE}/bin/fltk-config
 +GUI_LIBS=	$$(${FLTK_CONFIG} --use-gl --ldflags)
  
 -NO_STAGE=	yes
  post-extract:
  	@${RM} -rf ${WRKSRC}/libgfx/
  
 @@ -42,21 +43,26 @@ post-patch:
  	@${REINPLACE_CMD} -e 's/\.\..*mix\.a//' ${WRKSRC}/tools/qslim/Makefile
  	@${REINPLACE_CMD} -e '/gfx-config/d;s/\.a/.so/g;s/[(]AR[)] cru/(CXX) \
  		$$(CXXFLAGS) -shared -o/;/RANLIB/d' ${BUILD_WRKSRC}/${MAKEFILE}
 -	@for f in ${BUILD_WRKSRC}/Makefile ${WRKSRC}/tools/qslim/Makefile;do\
 -		${ECHO_CMD} '.SUFFIXES: .fl .c .cc .cxx .o' >> $$f;\
 -		${ECHO_CMD} '.cxx.o:' >> $$f;\
 -		${ECHO_CMD} '	$$(CXX) -c $$(CXXFLAGS) $$<' >> $$f;done
 +.for i in mixkit/src/Makefile tools/qslim/Makefile
 +	@${ECHO_CMD} '.SUFFIXES: .fl .c .cc .cxx .o' >> ${WRKSRC}/${i}
 +	@${ECHO_CMD} '.cxx.o:' >> ${WRKSRC}/${i}
 +	@${ECHO_CMD} '	$$(CXX) -c $$(CXXFLAGS) $$<' >> ${WRKSRC}/${i}
 +.endfor
  
  post-build:
  	@(cd ${BUILD_WRKSRC}/../../tools/qslim && ${SETENV} ${MAKE_ENV} \
 -	${GMAKE} ${MAKE_ARGS} ${ALL_TARGET})
 +		${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET})
  
  do-install:
 -	@${INSTALL_PROGRAM} ${WRKSRC}/mixkit/src/libmix.so ${PREFIX}/lib/
 -	@${LN} -sf libmix.so ${PREFIX}/lib/libmix.so.0
 -	@${INSTALL_PROGRAM} ${WRKSRC}/tools/qslim/qslim ${PREFIX}/bin/
 -	@${INSTALL_PROGRAM} ${WRKSRC}/tools/qslim/qvis ${PREFIX}/bin/
 -	@${INSTALL} -d ${PREFIX}/include/mixkit/
 -	@${INSTALL_DATA} ${WRKSRC}/mixkit/src/*.h ${PREFIX}/include/mixkit/
 +.for i in qslim qvis
 +	(cd ${WRKSRC}/tools/qslim && ${INSTALL_PROGRAM} ${i} \
 +		${STAGEDIR}${PREFIX}/bin)
 +.endfor
 +	@${MKDIR} ${STAGEDIR}${PREFIX}/include/mixkit
 +	(cd ${WRKSRC}/mixkit/src && ${INSTALL_DATA} *.h \
 +		${STAGEDIR}${PREFIX}/include/mixkit)
 +	(cd ${WRKSRC}/mixkit/src && ${INSTALL_PROGRAM} libmix.so \
 +		${STAGEDIR}${PREFIX}/lib)
 +	@${LN} -sf libmix.so ${STAGEDIR}${PREFIX}/lib/libmix.so.0
  
  .include <bsd.port.mk>
 _______________________________________________
 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"
 
>Unformatted:
