diff options
| author | ade <ade@FreeBSD.org> | 2006-02-23 18:40:44 +0800 |
|---|---|---|
| committer | ade <ade@FreeBSD.org> | 2006-02-23 18:40:44 +0800 |
| commit | da880765886f48c0ac8fd253e5601d04ea853215 (patch) | |
| tree | 55155f50e8a40ea2e2a16e2331e8cbb919b7d04f /graphics/pixie | |
| parent | ba4beb1ea11e6147a9b30969be42685d1c709e56 (diff) | |
| download | freebsd-ports-gnome-da880765886f48c0ac8fd253e5601d04ea853215.tar.gz freebsd-ports-gnome-da880765886f48c0ac8fd253e5601d04ea853215.tar.zst freebsd-ports-gnome-da880765886f48c0ac8fd253e5601d04ea853215.zip | |
Conversion to a single libtool environment.
Approved by: portmgr (kris)
Diffstat (limited to 'graphics/pixie')
| -rw-r--r-- | graphics/pixie/Makefile | 4 | ||||
| -rw-r--r-- | graphics/pixie/files/patch-configure.in | 27 |
2 files changed, 13 insertions, 18 deletions
diff --git a/graphics/pixie/Makefile b/graphics/pixie/Makefile index fdc4971e68d9..22005cba9d21 100644 --- a/graphics/pixie/Makefile +++ b/graphics/pixie/Makefile @@ -22,7 +22,7 @@ LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ USE_REINPLACE= yes USE_GL= yes USE_X_PREFIX= yes -USE_AUTOTOOLS= automake:15:env autoconf:213 libtool:13 +USE_AUTOTOOLS= automake:15:env autoconf:253 libtool:15 CONFIGURE_TARGET= --build=${MACHINE_ARCH}-portbld-freebsd${OSREL} CONFIGURE_ENV= CFLAGS="${CFLAGS} -O -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \ CXXFLAGS="${CXXFLAGS} -O -fPIC -I${LOCALBASE}/include -I${X11BASE}/include" \ @@ -52,10 +52,12 @@ post-patch: @${FIND} -X ${WRKSRC} -name '*.cpp' -or -name '*.h' | \ ${XARGS} ${REINPLACE_CMD} -i '' -e 's|malloc\.h|stdlib\.h|g' + pre-configure: @(cd ${WRKSRC} && ${ACLOCAL} && \ ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} --add-missing && \ ${SETENV} ${AUTOTOOLS_ENV} ${AUTOMAKE} -i) + @${REINPLACE_CMD} -e '/^_LT_AC_SHELL_INIT/d' ${WRKSRC}/aclocal.m4 do-install: # exes diff --git a/graphics/pixie/files/patch-configure.in b/graphics/pixie/files/patch-configure.in index ed2b9d16c61d..d62e365896ca 100644 --- a/graphics/pixie/files/patch-configure.in +++ b/graphics/pixie/files/patch-configure.in @@ -1,8 +1,6 @@ ---- configure.in.orig Fri Jul 16 00:52:52 2004 -+++ configure.in Sun Aug 29 22:09:21 2004 -@@ -21,9 +21,9 @@ - dnl --------------------------------------------------- - dnl Check standard libraries +--- configure.in.orig Tue Nov 22 06:30:25 2005 ++++ configure.in Wed Jan 25 00:38:57 2006 +@@ -23,5 +23,5 @@ dnl -AC_CHECK_LIB(dl, dlopen,,[AC_MSG_ERROR([dl library is not found])],) +dnl AC_CHECK_LIB(dl, dlopen,,[AC_MSG_ERROR([dl library is not found])],) @@ -10,11 +8,7 @@ -AC_CHECK_LIB(pthread, pthread_create,,[AC_MSG_ERROR([pthread library is not found])],) +dnl AC_CHECK_LIB(pthread, pthread_create,,[AC_MSG_ERROR([pthread library is not found])],) - dnl --------------------------------------------------- - dnl Find X -@@ -50,9 +50,13 @@ - dnl Find FLTK - dnl +@@ -52,5 +52,9 @@ +saved_LIBS="${LIBS}" + @@ -25,14 +19,13 @@ -AC_CHECK_LIB(fltk_gl,main,[LIBFLTKGL="-lfltk_gl -lGL" have_fltk=true]) +AC_CHECK_LIB(fltk_gl,main,[LIBFLTKGL="-lfltk_gl -lGL -lstdc++" have_fltk=true]) AM_CONDITIONAL(BUILD_SHOW, test x$have_fltk = xtrue) - - dnl --------------------------------------------------- -@@ -61,7 +65,7 @@ - - saved_LIBS="$LIBS" +@@ -63,3 +67,3 @@ -AC_CHECK_HEADER(tiffio.h,,AC_MSG_ERROR([tiffio.h not found])) +dnl AC_CHECK_HEADER(tiffio.h,,AC_MSG_ERROR([tiffio.h not found])) AC_CHECK_LIB(tiff,TIFFOpen,,[AC_MSG_ERROR([libtiff not found])],) - - TIFF_LIBS="$LIBS" +@@ -100,3 +104,3 @@ + AC_ARG_ENABLE(selfcontained, +-AS_HELP_STRING([--enable-selfcontained],[Build for a selfcontained setup]), ++AC_HELP_STRING([--enable-selfcontained],[Build for a selfcontained setup]), + [case "${enableval}" in |