freebsd/ports
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Respect prefix. Make this build on -current by changing

Browse Source 
"cc /usr/lib/libz.a" to "cc -lz".
This commit is contained in:
Tim Vanderhoek
1998-08-21 21:40:02 +00:00
parent 3ed18311fd
commit 9ba070b296
10 changed files with 35 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/hdf/Makefile
View File

@@ -3,7 +3,7 @@
# Date created: 17 November 1996
# Whom: mi
#
# $Id: Makefile,v 1.3 1998/04/08 12:53:43 tg Exp $
# $Id: Makefile,v 1.4 1998/06/04 23:18:46 steve Exp $
#
DISTNAME= HDF4.1r2
@@ -18,12 +18,16 @@ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg
GNU_CONFIGURE= yes
FC?= f77 # Can also be g77 for the newer one
MAKE_FLAGS= CC="$(CC)" FC="${FC}" -f
MAKE_ENV= pwrkdir=${WRKDIR}
#"wrkdir" doesn't work for some reason in the above
# This will create dummy Makefiles and some links in the jpeg and libz
# subdirectories. This way, we do not need to hunt all the dependencies
# out. Shame on the lib's developers, though, this can not be done through
# `configure'. -mi
pre-build:
${AR} -r ${WRKDIR}/libz.a /dev/null
${RANLIB} ${WRKDIR}/libz.a
test -d ${WRKSRC}/hdf/jpeg.came-with-HDF || \
${MV} -f ${WRKSRC}/hdf/jpeg ${WRKSRC}/hdf/jpeg.came-with-HDF
-${MKDIR} ${WRKSRC}/hdf/jpeg

4
graphics/hdf/scripts/post-patch
View File

@@ -39,7 +39,7 @@ patch -p << END_OF_PATCH
-ZLIBINC=\$(srcdir)/../zlib
-ZLIBLIB=\$(srcdir)/../zlib
+ZLIBINC=/usr/include
+ZLIBLIB=/usr/lib
+ZLIBLIB=-lz \$(pwrkdir)
END_OF_PATCH
done
@@ -51,7 +51,7 @@ patch -p << END_OF_PATCH
@@ -72,2 +72,2 @@
-ZLIBLIB=\$(srcdir)/../zlib
-ZLIBINC=\$(srcdir)/../zlib
+ZLIBLIB=/usr/lib
+ZLIBLIB=-lz \$(pwrkdir)
+ZLIBINC=/usr/include
END_OF_PATCH
done

6
graphics/hdf5/Makefile
View File

@@ -3,7 +3,7 @@
# Date created: 17 November 1996
# Whom: mi
#
# $Id: Makefile,v 1.3 1998/04/08 12:53:43 tg Exp $
# $Id: Makefile,v 1.4 1998/06/04 23:18:46 steve Exp $
#
DISTNAME= HDF4.1r2
@@ -18,12 +18,16 @@ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg
GNU_CONFIGURE= yes
FC?= f77 # Can also be g77 for the newer one
MAKE_FLAGS= CC="$(CC)" FC="${FC}" -f
MAKE_ENV= pwrkdir=${WRKDIR}
#"wrkdir" doesn't work for some reason in the above
# This will create dummy Makefiles and some links in the jpeg and libz
# subdirectories. This way, we do not need to hunt all the dependencies
# out. Shame on the lib's developers, though, this can not be done through
# `configure'. -mi
pre-build:
${AR} -r ${WRKDIR}/libz.a /dev/null
${RANLIB} ${WRKDIR}/libz.a
test -d ${WRKSRC}/hdf/jpeg.came-with-HDF || \
${MV} -f ${WRKSRC}/hdf/jpeg ${WRKSRC}/hdf/jpeg.came-with-HDF
-${MKDIR} ${WRKSRC}/hdf/jpeg

4
graphics/hdf5/scripts/post-patch
View File

@@ -39,7 +39,7 @@ patch -p << END_OF_PATCH
-ZLIBINC=\$(srcdir)/../zlib
-ZLIBLIB=\$(srcdir)/../zlib
+ZLIBINC=/usr/include
+ZLIBLIB=/usr/lib
+ZLIBLIB=-lz \$(pwrkdir)
END_OF_PATCH
done
@@ -51,7 +51,7 @@ patch -p << END_OF_PATCH
@@ -72,2 +72,2 @@
-ZLIBLIB=\$(srcdir)/../zlib
-ZLIBINC=\$(srcdir)/../zlib
+ZLIBLIB=/usr/lib
+ZLIBLIB=-lz \$(pwrkdir)
+ZLIBINC=/usr/include
END_OF_PATCH
done

6
science/hdf/Makefile
View File

@@ -3,7 +3,7 @@
# Date created: 17 November 1996
# Whom: mi
#
# $Id: Makefile,v 1.3 1998/04/08 12:53:43 tg Exp $
# $Id: Makefile,v 1.4 1998/06/04 23:18:46 steve Exp $
#
DISTNAME= HDF4.1r2
@@ -18,12 +18,16 @@ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg
GNU_CONFIGURE= yes
FC?= f77 # Can also be g77 for the newer one
MAKE_FLAGS= CC="$(CC)" FC="${FC}" -f
MAKE_ENV= pwrkdir=${WRKDIR}
#"wrkdir" doesn't work for some reason in the above
# This will create dummy Makefiles and some links in the jpeg and libz
# subdirectories. This way, we do not need to hunt all the dependencies
# out. Shame on the lib's developers, though, this can not be done through
# `configure'. -mi
pre-build:
${AR} -r ${WRKDIR}/libz.a /dev/null
${RANLIB} ${WRKDIR}/libz.a
test -d ${WRKSRC}/hdf/jpeg.came-with-HDF || \
${MV} -f ${WRKSRC}/hdf/jpeg ${WRKSRC}/hdf/jpeg.came-with-HDF
-${MKDIR} ${WRKSRC}/hdf/jpeg

4
science/hdf/scripts/post-patch
View File

@@ -39,7 +39,7 @@ patch -p << END_OF_PATCH
-ZLIBINC=\$(srcdir)/../zlib
-ZLIBLIB=\$(srcdir)/../zlib
+ZLIBINC=/usr/include
+ZLIBLIB=/usr/lib
+ZLIBLIB=-lz \$(pwrkdir)
END_OF_PATCH
done
@@ -51,7 +51,7 @@ patch -p << END_OF_PATCH
@@ -72,2 +72,2 @@
-ZLIBLIB=\$(srcdir)/../zlib
-ZLIBINC=\$(srcdir)/../zlib
+ZLIBLIB=/usr/lib
+ZLIBLIB=-lz \$(pwrkdir)
+ZLIBINC=/usr/include
END_OF_PATCH
done

6
science/hdf5-18/Makefile
View File

@@ -3,7 +3,7 @@
# Date created: 17 November 1996
# Whom: mi
#
# $Id: Makefile,v 1.3 1998/04/08 12:53:43 tg Exp $
# $Id: Makefile,v 1.4 1998/06/04 23:18:46 steve Exp $
#
DISTNAME= HDF4.1r2
@@ -18,12 +18,16 @@ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg
GNU_CONFIGURE= yes
FC?= f77 # Can also be g77 for the newer one
MAKE_FLAGS= CC="$(CC)" FC="${FC}" -f
MAKE_ENV= pwrkdir=${WRKDIR}
#"wrkdir" doesn't work for some reason in the above
# This will create dummy Makefiles and some links in the jpeg and libz
# subdirectories. This way, we do not need to hunt all the dependencies
# out. Shame on the lib's developers, though, this can not be done through
# `configure'. -mi
pre-build:
${AR} -r ${WRKDIR}/libz.a /dev/null
${RANLIB} ${WRKDIR}/libz.a
test -d ${WRKSRC}/hdf/jpeg.came-with-HDF || \
${MV} -f ${WRKSRC}/hdf/jpeg ${WRKSRC}/hdf/jpeg.came-with-HDF
-${MKDIR} ${WRKSRC}/hdf/jpeg

4
science/hdf5-18/scripts/post-patch
View File

@@ -39,7 +39,7 @@ patch -p << END_OF_PATCH
-ZLIBINC=\$(srcdir)/../zlib
-ZLIBLIB=\$(srcdir)/../zlib
+ZLIBINC=/usr/include
+ZLIBLIB=/usr/lib
+ZLIBLIB=-lz \$(pwrkdir)
END_OF_PATCH
done
@@ -51,7 +51,7 @@ patch -p << END_OF_PATCH
@@ -72,2 +72,2 @@
-ZLIBLIB=\$(srcdir)/../zlib
-ZLIBINC=\$(srcdir)/../zlib
+ZLIBLIB=/usr/lib
+ZLIBLIB=-lz \$(pwrkdir)
+ZLIBINC=/usr/include
END_OF_PATCH
done

6
science/hdf5/Makefile
View File

@@ -3,7 +3,7 @@
# Date created: 17 November 1996
# Whom: mi
#
# $Id: Makefile,v 1.3 1998/04/08 12:53:43 tg Exp $
# $Id: Makefile,v 1.4 1998/06/04 23:18:46 steve Exp $
#
DISTNAME= HDF4.1r2
@@ -18,12 +18,16 @@ LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg
GNU_CONFIGURE= yes
FC?= f77 # Can also be g77 for the newer one
MAKE_FLAGS= CC="$(CC)" FC="${FC}" -f
MAKE_ENV= pwrkdir=${WRKDIR}
#"wrkdir" doesn't work for some reason in the above
# This will create dummy Makefiles and some links in the jpeg and libz
# subdirectories. This way, we do not need to hunt all the dependencies
# out. Shame on the lib's developers, though, this can not be done through
# `configure'. -mi
pre-build:
${AR} -r ${WRKDIR}/libz.a /dev/null
${RANLIB} ${WRKDIR}/libz.a
test -d ${WRKSRC}/hdf/jpeg.came-with-HDF || \
${MV} -f ${WRKSRC}/hdf/jpeg ${WRKSRC}/hdf/jpeg.came-with-HDF
-${MKDIR} ${WRKSRC}/hdf/jpeg

4
science/hdf5/scripts/post-patch
View File

@@ -39,7 +39,7 @@ patch -p << END_OF_PATCH
-ZLIBINC=\$(srcdir)/../zlib
-ZLIBLIB=\$(srcdir)/../zlib
+ZLIBINC=/usr/include
+ZLIBLIB=/usr/lib
+ZLIBLIB=-lz \$(pwrkdir)
END_OF_PATCH
done
@@ -51,7 +51,7 @@ patch -p << END_OF_PATCH
@@ -72,2 +72,2 @@
-ZLIBLIB=\$(srcdir)/../zlib
-ZLIBINC=\$(srcdir)/../zlib
+ZLIBLIB=/usr/lib
+ZLIBLIB=-lz \$(pwrkdir)
+ZLIBINC=/usr/include
END_OF_PATCH
done