diff options
| author | alepulver <alepulver@FreeBSD.org> | 2010-10-11 11:35:22 +0800 |
|---|---|---|
| committer | alepulver <alepulver@FreeBSD.org> | 2010-10-11 11:35:22 +0800 |
| commit | fa9223b49999d87e018bfe8052b792183e20d42a (patch) | |
| tree | 98722698b9b0f923be31db8bd6e2bcd12bdb4136 /graphics | |
| parent | a41f3c1b00ad00753d65962f2592d34ed18371e8 (diff) | |
| download | freebsd-ports-graphics-fa9223b49999d87e018bfe8052b792183e20d42a.tar.gz freebsd-ports-graphics-fa9223b49999d87e018bfe8052b792183e20d42a.tar.zst freebsd-ports-graphics-fa9223b49999d87e018bfe8052b792183e20d42a.zip | |
- Remove GPC option (lang/gpc is deprecated and to be removed).
- Remove -m32/-m64 compilation flags.
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/grx/Makefile | 25 | ||||
| -rw-r--r-- | graphics/grx/pkg-plist | 2 |
2 files changed, 2 insertions, 25 deletions
diff --git a/graphics/grx/Makefile b/graphics/grx/Makefile index bd24dfacb55..8796b8810ac 100644 --- a/graphics/grx/Makefile +++ b/graphics/grx/Makefile @@ -27,7 +27,6 @@ INSTALL_TARGET= install install-bin install-fonts install-info OPTIONS= BGI "Enable BGI support" on \ BMP "Enable BMP support" on \ - GPC "Install GNU Pascal Compiler unit" off \ JPEG "Enable JPEG support" off \ PNG "Enable PNG support" on \ PRINT "Enable printing support" on \ @@ -52,17 +51,6 @@ CONFIGURE_ARGS+=--enable-bmp CONFIGURE_ARGS+=--disable-bmp .endif -.if defined(WITH_GPC) -RUN_DEPENDS+= gpc:${PORTSDIR}/lang/gpc -GCC_VER!= cd ${PORTSDIR}/lang/gpc && ${MAKE} -V GCC_VER -GNU_HOST!= cd ${PORTSDIR}/lang/gpc && ${MAKE} -V GNU_HOST -PLIST_SUB+= GPC="" \ - GCC_VER="${GCC_VER}" \ - GNU_HOST="${GNU_HOST}" -.else -PLIST_SUB+= GPC="@comment " -.endif - .if defined(WITH_JPEG) LIB_DEPENDS+= jpeg.11:${PORTSDIR}/graphics/jpeg CONFIGURE_ARGS+=--enable-jpeg @@ -106,7 +94,8 @@ post-patch: @${GREP} -ERl '<(malloc|alloca)\.h>' ${WRKSRC} | ${XARGS} \ ${REINPLACE_CMD} -Ee 's|<(malloc\|alloca)\.h>|<stdlib.h>|' @${REINPLACE_CMD} -Ee \ - 's|^(CC[[:blank:]]*=).*|\1 ${CC}|; \ + 's|-m32||; s|-m64||; \ + s|^(CC[[:blank:]]*=).*|\1 ${CC}|; \ s|^(CCOPT =)|\1 ${CPPFLAGS} ${CFLAGS}|; \ s|^(LDOPT =)|\1 ${LDFLAGS}|;' \ -e 's|lib64|lib|' \ @@ -114,14 +103,4 @@ post-patch: @${REINPLACE_CMD} -e 's/gcc/${CC}/' -e 's|lib64|lib|' \ ${WRKSRC}/src/makefile.[lx]* -post-install: -.if defined(WITH_GPC) - ${INSTALL_DATA} ${WRKSRC}/pascal/grx.pas \ - ${PREFIX}/lib/gpc/gcc/${GNU_HOST}/${GCC_VER}/units -.if defined(WITH_BGI) - ${INSTALL_DATA} ${WRKSRC}/pascal/bgi/graph.pas \ - ${PREFIX}/lib/gpc/gcc/${GNU_HOST}/${GCC_VER}/units -.endif -.endif - .include <bsd.port.post.mk> diff --git a/graphics/grx/pkg-plist b/graphics/grx/pkg-plist index a6cf2aba840..0845f3daf18 100644 --- a/graphics/grx/pkg-plist +++ b/graphics/grx/pkg-plist @@ -5,8 +5,6 @@ include/grx20.h include/grxkeys.h %%PRINT%%include/grxprint.h include/libbcc.h -%%GPC%%%%BGI%%lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/units/graph.pas -%%GPC%%lib/gpc/gcc/%%GNU_HOST%%/%%GCC_VER%%/units/grx.pas lib/libgrx20X.a lib/libgrx20X.so lib/libgrx20X.so.2 |