Attachment 117959 Details for Bug 160118 – file.diff

[patch] file.diff

file.diff (text/plain), 2.75 KB, created by tkato432 on 2011-08-24 19:50:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2011-08-24 19:50:27 UTC

Size: 2.75 KB

patch

obsolete

>diff -urN /usr/ports/graphics/libgfx/Makefile graphics/libgfx/Makefile
>--- /usr/ports/graphics/libgfx/Makefile	2010-03-28 17:38:46.000000000 +0900
>+++ graphics/libgfx/Makefile	2011-08-19 00:17:35.000000000 +0900
>@@ -9,40 +9,48 @@
> DISTVERSION=	1.1.0
> PORTREVISION=	6
> CATEGORIES=	graphics
>-MASTER_SITES=	http://graphics.cs.uiuc.edu/~garland/dist/ CENKES
>+MASTER_SITES=	http://mgarland.org/files/dist/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	OpenGL/FLTK development
> 
>+LICENSE=	MIT
>+
> LIB_DEPENDS=	fltk.1:${PORTSDIR}/x11-toolkits/fltk \
> 		tiff.4:${PORTSDIR}/graphics/tiff \
> 		png.6:${PORTSDIR}/graphics/png \
> 		gzstream.0:${PORTSDIR}/devel/gzstream \
> 		jpeg.11:${PORTSDIR}/graphics/jpeg
> 
>-USE_GL=		gl
>+BUILD_WRKSRC=	${WRKSRC}/src
>+
>+USE_GL=		glu
> USE_GMAKE=	yes
>-USE_LDCONFIG=	yes
> GNU_CONFIGURE=	yes
>-CONFIGURE_ENV=	CFLAGS="${CFLAGS}" CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
>+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
> CONFIGURE_ARGS=	--enable-gzstream --with-libtiff-lzw --with-x
>-CFLAGS=		-I${LOCALBASE}/include -fPIC
>-LDFLAGS=	-L${LOCALBASE}/lib
>-BUILD_WRKSRC=	${WRKSRC}/src
> ALL_TARGET=	${PORTNAME}.so
>-MAKE_ARGS=	CC="${CC}" CXX="${CXX}"
>+USE_LDCONFIG=	yes
>+MAKE_JOBS_SAFE=	yes
>+
>+CFLAGS+=	-fPIC
>+CPPFLAGS=	-I${LOCALBASE}/include
>+LDFLAGS=	-L${LOCALBASE}/lib
> 
> post-patch:
>-	@${REINPLACE_CMD} -e '/^CC /d;/^CXX /d' ${WRKSRC}/gfx-config.in
>-	@${REINPLACE_CMD} -e 's|\.a|.so|g;/RANLIB/d;s|[(]AR[)] cru|{CC} \
>-		${CFLAGS} ${LDFLAGS} -shared $${GUI_LIBS} -lgzstream -o|'\
>-		${WRKSRC}/src/${MAKEFILE}
>-	@${REINPLACE_CMD} -e '6115s|-lfltk|`fltk-config --ldflags`|' \
>-	    ${WRKSRC}/configure
>+	@${REINPLACE_CMD} -e \
>+		'/^CC /d ; \
>+		 /^CXX /d' ${WRKSRC}/gfx-config.in
>+	@${REINPLACE_CMD} -e \
>+		's|\.a|.so|g ; \
>+		 /RANLIB/d ; \
>+		 s|[(]AR[)] cru|{CC} ${CFLAGS} ${LDFLAGS} -shared $${GUI_LIBS} -lgzstream -o|' ${WRKSRC}/src/${MAKEFILE}
>+	@${REINPLACE_CMD} -e \
>+		'/^FLTK_LIBS/s|"-lfltk"|"`fltk-config --ldflags`"|' ${WRKSRC}/configure
> 
> do-install:
>-	@cd ${WRKSRC}/include/gfx/&&${COPYTREE_SHARE} . ${PREFIX}/include/gfx/
>-	@${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME}.so ${PREFIX}/lib/
>+	@(cd ${WRKSRC}/include/gfx && ${COPYTREE_SHARE} . ${PREFIX}/include/gfx)
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/${PORTNAME}.so ${PREFIX}/lib
> 	@${LN} -sf ${PORTNAME}.so ${PREFIX}/lib/${PORTNAME}.so.0
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/graphics/libgfx/pkg-descr graphics/libgfx/pkg-descr
>--- /usr/ports/graphics/libgfx/pkg-descr	2006-08-29 00:32:33.000000000 +0900
>+++ graphics/libgfx/pkg-descr	2011-08-18 23:48:26.000000000 +0900
>@@ -6,4 +6,4 @@
> This release introduces some (relatively small) incompatible changes with
> 1.0.x versions of the library. Details on changes can be found below.
> 
>-WWW: http://graphics.cs.uiuc.edu/~garland/software/libgfx.html
>+WWW: http://mgarland.org/software/libgfx.html

Actions: View | Diff

Attachments on bug 160118: 117959