aboutsummaryrefslogtreecommitdiffstats
path: root/devel
diff options
context:
space:
mode:
authorijliao <ijliao@FreeBSD.org>2004-08-18 16:04:36 +0800
committerijliao <ijliao@FreeBSD.org>2004-08-18 16:04:36 +0800
commitb926e1eb8c245f076ff50b4bb54c8e53a64340ba (patch)
treea7d84a6e1521a5b7effa8b383bd494ee4c64b5de /devel
parentbe12095564eccace1906b92d2f8312e12df94c79 (diff)
downloadfreebsd-ports-gnome-b926e1eb8c245f076ff50b4bb54c8e53a64340ba.tar.gz
freebsd-ports-gnome-b926e1eb8c245f076ff50b4bb54c8e53a64340ba.tar.zst
freebsd-ports-gnome-b926e1eb8c245f076ff50b4bb54c8e53a64340ba.zip
unbreak by upgrading to 0.7.1
Diffstat (limited to 'devel')
-rw-r--r--devel/ocaml-sdl/Makefile21
-rw-r--r--devel/ocaml-sdl/distinfo4
-rw-r--r--devel/ocaml-sdl/files/patch-configure35
-rw-r--r--devel/ocaml-sdl/files/patch-makefile.config.gcc.in9
-rw-r--r--devel/ocaml-sdl/pkg-install9
5 files changed, 28 insertions, 50 deletions
diff --git a/devel/ocaml-sdl/Makefile b/devel/ocaml-sdl/Makefile
index 815da8f2ccd7..a7a440a910a1 100644
--- a/devel/ocaml-sdl/Makefile
+++ b/devel/ocaml-sdl/Makefile
@@ -7,7 +7,7 @@
#
PORTNAME= sdl
-PORTVERSION= 0.6.3
+PORTVERSION= 0.7.1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ocamlsdl
@@ -17,17 +17,18 @@ DISTNAME= ocamlsdl-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An OCaml interface to the SDL
-BROKEN= Does not build
-
BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml \
ocamlfind:${PORTSDIR}/devel/ocaml-findlib \
lablgl:${PORTSDIR}/graphics/ocaml-lablgl
-USE_BZIP2= yes
USE_SDL= sdl ttf image mixer
GNU_CONFIGURE= yes
+CONFIGURE_ENV= LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS= --with-findlib
USE_GMAKE= yes
+PKGDEINSTALL= ${PKGINSTALL}
+
.if !defined(NOPORTDOCS)
PORTDOCS= *
@@ -36,19 +37,13 @@ EXAMPLESDIR= ${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
.endif
post-install:
- @${FIND} ${PREFIX}/lib/ocaml/sdl ! -type d | \
- ${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
- @${ECHO_CMD} "@dirrm lib/ocaml/sdl" >> ${TMPPLIST}
- @${FIND} ${PREFIX}/lib/ocaml/stublibs -name "dllsdl*.so" | \
+ @${FIND} ${PREFIX}/lib/ocaml/site-lib/sdl ! -type d | \
${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
+ @${ECHO_CMD} "@dirrm lib/ocaml/site-lib/${PORTNAME}" >> ${TMPPLIST}
+ @${ECHO_CMD} "@unexec ocamlfind remove ${PORTNAME} 2>/dev/null || true" >> ${TMPPLIST}
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
${CP} -R ${WRKSRC}/doc/html/ ${DOCSDIR}
- @${MKDIR} ${EXAMPLESDIR}
- ${CP} -R ${WRKSRC}/samples/ ${EXAMPLESDIR}
- @${FIND} ${EXAMPLESDIR} ! -type d | \
- ${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
- @${ECHO_CMD} "@dirrm ${EXAMPLESDIR:S,^${PREFIX}/,,}" >> ${TMPPLIST}
.endif
.include <bsd.port.mk>
diff --git a/devel/ocaml-sdl/distinfo b/devel/ocaml-sdl/distinfo
index 1f432dc84af4..69aee11bb307 100644
--- a/devel/ocaml-sdl/distinfo
+++ b/devel/ocaml-sdl/distinfo
@@ -1,2 +1,2 @@
-MD5 (ocamlsdl-0.6.3.tar.bz2) = 9e99ba5675b2d113ce2e3e139c2c8dc3
-SIZE (ocamlsdl-0.6.3.tar.bz2) = 335489
+MD5 (ocamlsdl-0.7.1.tar.gz) = 3829b20bd975e3bef5195a54e2cd04cb
+SIZE (ocamlsdl-0.7.1.tar.gz) = 213802
diff --git a/devel/ocaml-sdl/files/patch-configure b/devel/ocaml-sdl/files/patch-configure
deleted file mode 100644
index 767d2114a6d8..000000000000
--- a/devel/ocaml-sdl/files/patch-configure
+++ /dev/null
@@ -1,35 +0,0 @@
---- configure.orig Tue Jun 1 09:27:55 2004
-+++ configure Tue Jun 1 09:28:03 2004
-@@ -2652,19 +2652,19 @@
- fi;
- echo "$as_me:$LINENO: checking lablGL directory" >&5
- echo $ECHO_N "checking lablGL directory... $ECHO_C" >&6
--TMPF=conftest.ml
--cat > $TMPF << EOF
--open Gl
--EOF
--_LABLGLDIR=$LABLGLDIR
--unset LABLGLDIR
--for dir in $_LABLGLDIR +lablGL ; do
-- if $OCAMLC -c -I $dir $TMPF >& /dev/null ; then
-- LABLGLDIR="$dir"
-- break
-- fi
--done
--rm -f $TMPF
-+#TMPF=conftest.ml
-+#cat > $TMPF << EOF
-+#open Gl
-+#EOF
-+#_LABLGLDIR=$LABLGLDIR
-+#unset LABLGLDIR
-+#for dir in $_LABLGLDIR +lablGL ; do
-+# if $OCAMLC -c -I $dir $TMPF >& /dev/null ; then
-+# LABLGLDIR="$dir"
-+# break
-+# fi
-+#done
-+#rm -f $TMPF
- if test -n $LABLGLDIR ; then
- echo "$as_me:$LINENO: result: $LABLGLDIR" >&5
- echo "${ECHO_T}$LABLGLDIR" >&6
diff --git a/devel/ocaml-sdl/files/patch-makefile.config.gcc.in b/devel/ocaml-sdl/files/patch-makefile.config.gcc.in
new file mode 100644
index 000000000000..606d46ea00bc
--- /dev/null
+++ b/devel/ocaml-sdl/files/patch-makefile.config.gcc.in
@@ -0,0 +1,9 @@
+--- makefile.config.gcc.in.orig Wed Aug 18 15:51:25 2004
++++ makefile.config.gcc.in Wed Aug 18 15:52:03 2004
+@@ -44,5 +44,5 @@
+
+ MKCMA = $(OCAMLMKLIB) -v -o $(1) -oc $(2) $(3) $(4)
+ MKCMXA = $(OCAMLMKLIB) -v -o $(1) -oc $(2) $(3) $(4)
+-MKCLIB = $(OCAMLMKLIB) -v -o $(1) -oc $(2) $(3) $(4)
++MKCLIB = $(OCAMLMKLIB) -v -o $(1) -L${LOCALBASE}/lib -oc $(2) $(3) $(4)
+ endif
diff --git a/devel/ocaml-sdl/pkg-install b/devel/ocaml-sdl/pkg-install
new file mode 100644
index 000000000000..c87492b34ffa
--- /dev/null
+++ b/devel/ocaml-sdl/pkg-install
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+if [ "$2" = "POST-INSTALL" ]; then
+ echo "${PKG_PREFIX}/lib/ocaml/site-lib/sdl" >> ${PKG_PREFIX}/lib/ocaml/ld.conf
+elif [ "$2" = "DEINSTALL" ]; then
+ mv ${PKG_PREFIX}/lib/ocaml/ld.conf ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp
+ grep -v sdl ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp > ${PKG_PREFIX}/lib/ocaml/ld.conf
+ rm -f ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp
+fi