kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added support for dynamic loading on NetBSD. Bumped PKGREVISION.

Browse source 
Fixed almost all pkglint -Wall warnings.
This commit is contained in:
rillig 2006-02-02 20:47:26 +00:00
parent 49c1f2197b
commit 1ba91f86d9
5 changed files with 33 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lang/ocaml/Makefile
View file

@ -1,7 +1,9 @@
# $NetBSD: Makefile,v 1.43 2006/01/16 09:41:48 adam Exp $ # $NetBSD: Makefile,v 1.44 2006/02/02 20:47:26 rillig Exp $
.include "Makefile.common" .include "Makefile.common"
PKGREVISION= 1
CONFIGURE_ARGS+= -no-tk CONFIGURE_ARGS+= -no-tk
CONFIGURE_ENV+= disable_x11=yes CONFIGURE_ENV+= disable_x11=yes
@ -18,7 +20,7 @@ PLIST_SRC+= ${PKGDIR}/PLIST.prof
PLIST_SRC+= ${PKGDIR}/PLIST PLIST_SRC+= ${PKGDIR}/PLIST
.endif .endif
.if ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly" .if ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD"
PLIST_SRC+= ${PKGDIR}/PLIST.stub PLIST_SRC+= ${PKGDIR}/PLIST.stub
.endif .endif

18
lang/ocaml/Makefile.common
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.13 2006/01/16 09:41:48 adam Exp $ # $NetBSD: Makefile.common,v 1.14 2006/02/02 20:47:26 rillig Exp $
DISTNAME= ocaml-3.09.1 DISTNAME= ocaml-3.09.1
CATEGORIES= lang CATEGORIES= lang
@ -14,11 +14,11 @@ PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches
USE_TOOLS+= gmake USE_TOOLS+= gmake
HAS_CONFIGURE= yes HAS_CONFIGURE= yes
CONFIGURE_ARGS+= -prefix ${PREFIX} CONFIGURE_ENV+= BDB_LIBS=${BDB_LIBS:Q}
CONFIGURE_ARGS+= -libs "${LDFLAGS}" CONFIGURE_ENV+= BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}:Q}
CONFIGURE_ARGS+= -prefix ${PREFIX:Q}
CONFIGURE_ARGS+= -libs ${LDFLAGS:Q}
CONFIGURE_ARGS+= -with-pthread CONFIGURE_ARGS+= -with-pthread
CONFIGURE_ENV+= BDB_LIBS=${BDB_LIBS:Q} \
BDB_BUILTIN=${USE_BUILTIN.${BDB_TYPE}}
CPPFLAGS+= -DDB_DBM_HSEARCH CPPFLAGS+= -DDB_DBM_HSEARCH
.include "../../mk/bsd.prefs.mk" .include "../../mk/bsd.prefs.mk"
@ -31,11 +31,13 @@ INSTALL_UNSTRIPPED= yes
post-extract: cp-power-bsd cp-gnu-config post-extract: cp-power-bsd cp-gnu-config
.PHONY: cp-power-bsd
cp-power-bsd: cp-power-bsd:
@${CP} ${WRKSRC}/asmrun/power-elf.S ${WRKSRC}/asmrun/power-bsd.S @${CP} ${WRKSRC:Q}/asmrun/power-elf.S ${WRKSRC:Q}/asmrun/power-bsd.S
.PHONY: cp-gnu-config
cp-gnu-config: cp-gnu-config:
@${CP} ${PKGSRCDIR}/mk/gnu-config/config.guess ${WRKSRC}/config/gnu/ @${CP} ${PKGSRCDIR:Q}/mk/gnu-config/config.guess ${WRKSRC:Q}/config/gnu/
@${CP} ${PKGSRCDIR}/mk/gnu-config/config.sub ${WRKSRC}/config/gnu/ @${CP} ${PKGSRCDIR:Q}/mk/gnu-config/config.sub ${WRKSRC:Q}/config/gnu/
.include "../../mk/pthread.buildlink3.mk" .include "../../mk/pthread.buildlink3.mk"

28
lang/ocaml/buildlink3.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.13 2006/01/27 19:03:16 tonio Exp $ # $NetBSD: buildlink3.mk,v 1.14 2006/02/02 20:47:26 rillig Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OCAML_BUILDLINK3_MK:= ${OCAML_BUILDLINK3_MK}+ OCAML_BUILDLINK3_MK:= ${OCAML_BUILDLINK3_MK}+
@ -28,22 +28,24 @@ OCAML_WRAPPERS= ocamlc ocamlc.opt ocamlcp ocamlmklib ocamlmktop \
ocamlopt ocamlopt.opt ocamlopt ocamlopt.opt
OCAMLBIN_WRAPPERS= ocaml OCAMLBIN_WRAPPERS= ocaml
.PHONY: ocaml-wrappers
ocaml-wrappers: ocaml-wrappers:
${_PKG_SILENT}${_PKG_DEBUG} \ ${_PKG_SILENT}${_PKG_DEBUG} set -e; \
for w in ${OCAML_WRAPPERS}; do \ for w in ${OCAML_WRAPPERS}; do \
${SED} -e 's|@SH@|${SH}|g' \ ${SED} -e 's|@SH@|${SH}|g' \
-e 's|@OCAML_PREFIX@|${BUILDLINK_PREFIX.ocaml}|g' \ -e 's|@OCAML_PREFIX@|${BUILDLINK_PREFIX.ocaml}|g' \
-e 's|@CFLAGS@|${CFLAGS}|g' \ -e 's|@CFLAGS@|${CFLAGS}|g' \
-e 's|@LDFLAGS@|${LDFLAGS}|g' \ -e 's|@LDFLAGS@|${LDFLAGS}|g' \
<${.CURDIR}/../../lang/ocaml/files/wrapper.sh \ < ${.CURDIR:Q}/../../lang/ocaml/files/wrapper.sh \
>${BUILDLINK_DIR}/bin/$$w; \ > ${BUILDLINK_DIR:Q}/bin/"$$w"; \
${CHMOD} +x ${BUILDLINK_DIR}/bin/$$w; \ ${CHMOD} +x ${BUILDLINK_DIR:Q}/bin/"$$w"; \
done done
for w in ${OCAMLBIN_WRAPPERS}; do \ ${_PKG_SILENT}${_PKG_DEBUG} set -e; \
${LN} -s ${BUILDLINK_PREFIX.ocaml}/bin/$$w \ for w in ${OCAMLBIN_WRAPPERS}; do \
${BUILDLINK_DIR}/bin/$$w; \ ${LN} -s ${BUILDLINK_PREFIX.ocaml:Q}/bin/"$$w" \
${BUILDLINK_DIR:Q}/bin/"$$w"; \
done done
.endif # OCAML_BUILDLINK3_MK .endif # OCAML_BUILDLINK3_MK
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//}

4
lang/ocaml/distinfo
View file

@ -1,4 +1,4 @@
$NetBSD: distinfo,v 1.33 2006/01/16 09:41:48 adam Exp $ $NetBSD: distinfo,v 1.34 2006/02/02 20:47:26 rillig Exp $
SHA1 (ocaml-3.09.1.tar.bz2) = e74ceeb623494bee08effac4a4cef301e71dd496 SHA1 (ocaml-3.09.1.tar.bz2) = e74ceeb623494bee08effac4a4cef301e71dd496
RMD160 (ocaml-3.09.1.tar.bz2) = 1c8f2056a0e4356d9a99561c297eb867bf96ef4f RMD160 (ocaml-3.09.1.tar.bz2) = 1c8f2056a0e4356d9a99561c297eb867bf96ef4f
@ -19,7 +19,7 @@ SHA1 (patch-ao) = dfdd58093e77db9c3d8507a51faa0320c56e3998
SHA1 (patch-ap) = def9bf7779e59844c4e4790363f040aa17aa8d86 SHA1 (patch-ap) = def9bf7779e59844c4e4790363f040aa17aa8d86
SHA1 (patch-aq) = c877ae103ba1e5c7a8c4c694627610d485d3f222 SHA1 (patch-aq) = c877ae103ba1e5c7a8c4c694627610d485d3f222
SHA1 (patch-ar) = 4f5df951be21c21f644e7f75f4e74bdf141ef0c5 SHA1 (patch-ar) = 4f5df951be21c21f644e7f75f4e74bdf141ef0c5
SHA1 (patch-at) = 753a907e52d69d72562a24a7841eb2abecc43906 SHA1 (patch-at) = 02331822fe7d87975b14f8f2294059c6d031e457
SHA1 (patch-au) = f1bf9e793c90a6e2fb8c8a058d7252646c870930 SHA1 (patch-au) = f1bf9e793c90a6e2fb8c8a058d7252646c870930
SHA1 (patch-av) = f56c8924b81a620602bc5a67b0c4459b721701d2 SHA1 (patch-av) = f56c8924b81a620602bc5a67b0c4459b721701d2
SHA1 (patch-aw) = a2dee7fa2181008fb9cc632032a9a07aec422afa SHA1 (patch-aw) = a2dee7fa2181008fb9cc632032a9a07aec422afa

4
lang/ocaml/patches/patch-at
View file

@ -1,4 +1,4 @@
$NetBSD: patch-at,v 1.8 2006/01/16 09:41:48 adam Exp $ $NetBSD: patch-at,v 1.9 2006/02/02 20:47:26 rillig Exp $
--- configure.orig 2006-01-04 10:26:42.000000000 +0100 --- configure.orig 2006-01-04 10:26:42.000000000 +0100
+++ configure +++ configure
@ -7,7 +7,7 @@ $NetBSD: patch-at,v 1.8 2006/01/16 09:41:48 adam Exp $
if test $withsharedlibs = "yes"; then if test $withsharedlibs = "yes"; then
case "$host" in case "$host" in
- *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*) - *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*)
+ *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-dragonfly*) + *-*-linux-gnu|*-*-linux|*-*-freebsd[3-9]*|*-*-netbsd*|*-*-dragonfly*)
sharedcccompopts="-fPIC" sharedcccompopts="-fPIC"
mksharedlib="$bytecc -shared -o" mksharedlib="$bytecc -shared -o"
bytecclinkopts="$bytecclinkopts -Wl,-E" bytecclinkopts="$bytecclinkopts -Wl,-E"