summaryrefslogtreecommitdiff
path: root/lang
diff options
context:
space:
mode:
authorjtb <jtb@pkgsrc.org>2003-06-06 05:46:22 +0000
committerjtb <jtb@pkgsrc.org>2003-06-06 05:46:22 +0000
commit6b2fe27e3ae9eb7009371fac4b3b3a3a70246641 (patch)
tree6b4ed579d399fca0da07ebdd381677438adf19d9 /lang
parenta443e2a36f0976c4bd8e2c9e0e64a384384933a5 (diff)
downloadpkgsrc-6b2fe27e3ae9eb7009371fac4b3b3a3a70246641.tar.gz
* Allow gpc to use the base system gcc on NetBSD systems for linking
C and Pascal. * Remove dependencies on gmp, rx, ncurses. They're not needed for general Pascal programming, only for some of the units, and can be installed later if required. * Bump PKGREVISION.
Diffstat (limited to 'lang')
-rw-r--r--lang/gpc/Makefile31
-rw-r--r--lang/gpc/PLIST90
-rw-r--r--lang/gpc/PLIST.netbsd6
3 files changed, 68 insertions, 59 deletions
diff --git a/lang/gpc/Makefile b/lang/gpc/Makefile
index 0380ea883e3..44c6451f845 100644
--- a/lang/gpc/Makefile
+++ b/lang/gpc/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2003/06/02 14:05:06 abs Exp $
+# $NetBSD: Makefile,v 1.8 2003/06/06 05:46:22 jtb Exp $
DISTNAME= gpc-2.1
-PKGREVISION= 1
+PKGREVISION= 2
WRKSRC= ${WRKDIR}/gcc-2.95.3
CATEGORIES= lang
MASTER_SITES= http://www.gnu-pascal.de/current/ \
@@ -16,20 +16,25 @@ COMMENT= GNU Pascal Compiler
PATCH_SITES= ${MASTER_SITE_LOCAL}
PATCHFILES= gcc-2.95.3-diff-2002-08-29.gz
-DEPENDS+= gcc-2.95.3nb1:../../lang/gcc
-DEPENDS+= gmp-[0-9]*:../../devel/gmp
-DEPENDS+= ncurses-[0-9]*:../../devel/ncurses
-DEPENDS+= rx-[0-9]*:../../devel/rx
-
-BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
BUILD_DEPENDS+= gsed-[0-9]*:../../textproc/gsed
USE_GMAKE= # defined
USE_NCURSES= # defined
-USE_PKGSRC_GCC= # defined
+PLIST_SRC= PLIST
+
+.include "../../mk/bsd.prefs.mk"
+.if ${OPSYS} == "NetBSD"
+CFLAGS+= -DNETBSD_NATIVE
+GPC_PREFIX= ${PREFIX}
+GPC_SUBPREFIX=
+PLIST_SRC+= PLIST.netbsd
+.else
+DEPENDS+= gcc-2.95.3*:../../lang/gcc
+USE_PKGSRC_GCC= # defined
GPC_PREFIX= ${_GCC_PREFIX}
-GPC_SUBPREFIX= ${_GCC_SUBPREFIX}
+GPC_SUBPREFIX= ${_GCC_SUBPREFIX}/
+.endif
HAS_CONFIGURE= # defined
CONFIGURE_SCRIPT= ${WRKSRC}/configure
@@ -49,8 +54,6 @@ INSTALL_TARGET= pascal.install
INFO_FILES= gpc.info gpcs.info
-.include "../../mk/bsd.prefs.mk"
-
post-extract:
${MKDIR} ${WRKSRC}
${CP} ${.CURDIR}/../gcc/files/xm-netbsd.h ${WRKSRC}/gcc/config
@@ -70,10 +73,10 @@ pre-patch:
pre-configure:
${MKDIR} ${BUILD_DIRS}
- ${TOUCH} ${TOUCH_FLAGS} ${WRKSRC}/gcc/c-gperf.h
- ${ECHO} "bogus" > ${WRKSRC}/gcc/cstamp-h.in
+.if ${OPSYS} != "NetBSD"
.include "../../mk/gcc.buildlink2.mk"
+.endif
.include "../../mk/texinfo.mk"
.include "../../mk/bsd.pkg.install.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/gpc/PLIST b/lang/gpc/PLIST
index 2488245116b..ad7bef52938 100644
--- a/lang/gpc/PLIST
+++ b/lang/gpc/PLIST
@@ -1,47 +1,47 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/02/17 18:47:24 jtb Exp $
-${GPC_SUBPREFIX}/bin/gpc
-${GPC_SUBPREFIX}/bin/gpc-run
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/collect2
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/gpc1
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/gpcpp
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/include/gpc-in-c.h
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/libgpc.a
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/crt.inc
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/crt.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/crtc.c
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/crtc.h
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/crtdjgpp.h
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/crtlinux386.h
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/crtx.c
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/dos.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/dosunix.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/fileutils.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/gmp.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/gmpc.c
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/gpc-bp.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/gpc.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/gpcutil.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/heapmon.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/intl.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/intlc.c
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/md5.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/overlay.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/pipe.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/pipec.c
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/ports.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/printer.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/regex.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/regexc.c
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/rts-config.inc
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/strings.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/stringutils.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/system.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/trap.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/trapc.c
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/turbo3.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/wincrt.pas
-${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/windos.pas
-${GPC_SUBPREFIX}/man/man1/gpc.1
+@comment $NetBSD: PLIST,v 1.2 2003/06/06 05:46:22 jtb Exp $
+${GPC_SUBPREFIX}bin/gpc
+${GPC_SUBPREFIX}bin/gpc-run
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/collect2
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/gpc1
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/gpcpp
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/include/gpc-in-c.h
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/libgpc.a
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/crt.inc
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/crt.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/crtc.c
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/crtc.h
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/crtdjgpp.h
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/crtlinux386.h
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/crtx.c
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/dos.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/dosunix.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/fileutils.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/gmp.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/gmpc.c
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/gpc-bp.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/gpc.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/gpcutil.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/heapmon.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/intl.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/intlc.c
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/md5.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/overlay.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/pipe.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/pipec.c
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/ports.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/printer.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/regex.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/regexc.c
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/rts-config.inc
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/strings.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/stringutils.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/system.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/trap.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/trapc.c
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/turbo3.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/wincrt.pas
+${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units/windos.pas
+${GPC_SUBPREFIX}man/man1/gpc.1
@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gpc.info
@unexec ${INSTALL_INFO} --delete --info-dir=%D/info %D/info/gpcs.info
info/gpc.info
@@ -333,7 +333,7 @@ share/doc/gpc/docdemos/whiledemo.pas
share/doc/gpc/docdemos/wordbooldemo.pas
share/doc/gpc/docdemos/worddemo.pas
share/doc/gpc/docdemos/xordemo.pas
-@dirrm ${GPC_SUBPREFIX}/lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units
+@dirrm ${GPC_SUBPREFIX}lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/units
@dirrm share/doc/gpc/docdemos
@dirrm share/doc/gpc/demos
@dirrm share/doc/gpc
diff --git a/lang/gpc/PLIST.netbsd b/lang/gpc/PLIST.netbsd
new file mode 100644
index 00000000000..b86ca8e3b6b
--- /dev/null
+++ b/lang/gpc/PLIST.netbsd
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST.netbsd,v 1.1 2003/06/06 05:46:22 jtb Exp $
+lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/specs
+@dirrm lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3/include
+@dirrm lib/gcc-lib/${MACHINE_GNU_PLATFORM}/2.95.3
+@dirrm lib/gcc-lib/${MACHINE_GNU_PLATFORM}
+@dirrm lib/gcc-lib