cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- make the compiler find its header files

Browse Source 
- set up paths correctly for extensions to work
from maintainer Deanna Phillips <deanna at sdf.lonestar.org>

clean up a bit while here.
This commit is contained in:
steven 2006-07-31 08:07:54 +00:00
parent 31d4571f0a
commit e75d24784d
4 changed files with 35 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lang/chicken/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.3 2006/07/30 12:25:19 steven Exp $
# $OpenBSD: Makefile,v 1.4 2006/07/31 08:07:54 steven Exp $
COMMENT= "practical and portable Scheme system"
DISTNAME= chicken-2.41
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
SHARED_LIBS= chicken 0.0 \
uchicken 0.0
CATEGORIES= lang
@ -38,11 +38,4 @@ EXTRA_CFLAGS= -O0
MAKE_FLAGS= NURSERY=131072 \
EXTRA_CFLAGS=${EXTRA_CFLAGS}
DOCDIR= ${PREFIX}/share/doc/chicken
DOCS= chicken.html ChangeLog README LICENSE
post-install:
${INSTALL_DATA_DIR} ${DOCDIR}
cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCDIR}
.include <bsd.port.mk>

58
lang/chicken/patches/patch-Makefile_in
View File

@ -1,25 +1,20 @@
$OpenBSD: patch-Makefile_in,v 1.3 2006/07/30 12:25:19 steven Exp $
$OpenBSD: patch-Makefile_in,v 1.4 2006/07/31 08:07:54 steven Exp $
--- Makefile.in.orig Mon Jul 17 19:18:42 2006
+++ Makefile.in Thu Jul 27 06:54:18 2006
@@ -20,7 +20,7 @@ srcdir = @srcdir@
+++ Makefile.in Mon Jul 31 10:38:02 2006
@@ -19,9 +19,10 @@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
+docdir = $(datadir)/doc/@PACKAGE@
pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
+pkglibdir = $(libdir)
pkgincludedir = $(includedir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(pkgdatadir)
+pkgincludedir = $(pkgdatadir)/include
top_builddir = .
@@ -200,7 +200,7 @@ chicken_static_SOURCES =
chicken_static_LDADD = chicken.o support.o easyffi.o compiler.o optimizer.o c-platform.o c-backend.o batch-driver.o libchicken.la $(MORE_STATIC_LIBS)
chicken_static_LDFLAGS = -static $(LINKFLAGS)
-BASE_CPPFLAGS = -DC_STACK_GROWS_DOWNWARD=$(STACK_GROWS_DOWNWARD) -DC_INSTALL_LIB_HOME='"$(pkglibdir)/$(BINARY_VERSION)"' \
+BASE_CPPFLAGS = -DC_STACK_GROWS_DOWNWARD=$(STACK_GROWS_DOWNWARD) -DC_INSTALL_LIB_HOME='"$(pkglibdir)"' \
-DC_INSTALL_HOME='"$(pkgdatadir)"' -DC_USE_C_DEFAULTS
INCLUDES = $(BASE_CPPFLAGS) -DC_NO_PIC_NO_DLL
@@ -678,13 +678,13 @@ libchicken_la-runtime.lo: runtime.c
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
@@ -678,13 +679,13 @@ libchicken_la-runtime.lo: runtime.c
$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libchicken_la_CFLAGS) $(CFLAGS) -c -o libchicken_la-runtime.lo `test -f 'runtime.c' || echo '$(srcdir)/'`runtime.c
libchicken_la-library.o: library.c
@ -35,29 +30,14 @@ $OpenBSD: patch-Makefile_in,v 1.3 2006/07/30 12:25:19 steven Exp $
libchicken_la-eval.o: eval.c
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libchicken_la_CFLAGS) $(CFLAGS) -c -o libchicken_la-eval.o `test -f 'eval.c' || echo '$(srcdir)/'`eval.c
@@ -1454,7 +1454,7 @@ info: info-am
@@ -1651,8 +1652,8 @@ regex.exports: $(regexexports)
info-am: $(INFO_DEPS)
# Install docs and sources.
install-data-local : chicken.html
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/doc
- -for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(pkgdatadir)/doc; done
+ $(mkinstalldirs) $(DESTDIR)$(docdir)
+ -for file in $(DOCFILES); do cp $(srcdir)/$$file $(DESTDIR)$(docdir); done
$(mkinstalldirs) $(DESTDIR)$(pkglibdir)/$(BINARY_VERSION)
-install-data-am: install-data-local install-includeHEADERS \
+install-data-am: install-includeHEADERS \
install-info-am install-man install-pkgdataDATA
install-exec-am: install-binPROGRAMS install-libLTLIBRARIES
@@ -1599,7 +1599,7 @@ chicken-defaults.h: nsample
echo "# define C_INSTALL_HOME \"${pkgdatadir}\"" >>chicken-defaults.h; \
echo "#endif" >> chicken-defaults.h; \
echo "#ifndef C_INSTALL_LIB_HOME" >> chicken-defaults.h; \
- echo "# define C_INSTALL_LIB_HOME \"${pkglibdir}/${BINARY_VERSION}\"" >>chicken-defaults.h; \
+ echo "# define C_INSTALL_LIB_HOME \"${pkglibdir}\"" >>chicken-defaults.h; \
echo "#endif" >> chicken-defaults.h; \
echo "#ifndef C_DEFAULT_TARGET_STACK_SIZE" >> chicken-defaults.h; \
echo "# define C_DEFAULT_TARGET_STACK_SIZE ($${nursery})" >>chicken-defaults.h; \
@@ -1848,7 +1848,6 @@ uninstall:
rm -f $(mandir)/man1/csi.1
rm -f $(libdir)/libchicken.*
rm -f $(libdir)/libuchicken.*
- rm -fr $(pkglibdir)
rm -fr $(pkgdatadir)
rm -f $(includedir)/chicken.h
rm -f $(includedir)/chicken-config.h
chicken.html: chicken.texi

12
lang/chicken/patches/patch-csc_scm_in Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-csc_scm_in,v 1.1 2006/07/31 08:07:54 steven Exp $
--- csc.scm.in.orig Fri Jul 28 05:24:18 2006
+++ csc.scm.in Fri Jul 28 05:24:32 2006
@@ -226,7 +226,7 @@ EOF
(define include-dir
(let ([id (prefix "" "include" "%includedir%")])
- (and (not (member id '("/usr/include" "/usr/local/include" "")))
+ (and (not (member id '("/usr/include" "")))
id) ) )
(define compile-options

3
lang/chicken/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2006/07/26 18:35:06 steven Exp $
@comment $OpenBSD: PLIST,v 1.3 2006/07/31 08:07:54 steven Exp $
%%SHARED%%
bin/chicken
bin/chicken-profile
@ -19,6 +19,7 @@ lib/libuchicken.la
@man man/man1/csc.1
@man man/man1/csi.1
share/chicken/
share/chicken/1/
share/chicken/banner.scm
share/chicken/chicken-ffi-macros.scm
share/chicken/chicken-more-macros.scm