Attachment 138313 Details for Bug 184241 – file.diff

[patch] file.diff

file.diff (text/plain), 2.95 KB, created by tkato432 on 2013-11-24 18:10:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2013-11-24 18:10:07 UTC

Size: 2.95 KB

patch

obsolete

>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>

Actions: View | Diff

Attachments on bug 184241: 138313