diff options
| -rw-r--r-- | astro/xplanet/Makefile | 2 | ||||
| -rw-r--r-- | graphics/mpegedit/Makefile | 2 | ||||
| -rw-r--r-- | graphics/mpegedit/files/patch-aj | 6 | ||||
| -rw-r--r-- | multimedia/mpegedit/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/mpegedit/files/patch-aj | 6 | ||||
| -rw-r--r-- | palm/imgvtopgm/Makefile | 3 | ||||
| -rw-r--r-- | palm/imgvtopgm/files/patch-aa | 109 | ||||
| -rw-r--r-- | palm/ppmtoTbmp/Makefile | 2 | ||||
| -rw-r--r-- | palm/ppmtoTbmp/files/patch-Makefile | 8 |
9 files changed, 127 insertions, 13 deletions
diff --git a/astro/xplanet/Makefile b/astro/xplanet/Makefile index be7a2f547b02..3585d97468eb 100644 --- a/astro/xplanet/Makefile +++ b/astro/xplanet/Makefile @@ -18,7 +18,7 @@ LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ - pnm.1:${PORTSDIR}/graphics/netpbm + netpbm.1:${PORTSDIR}/graphics/netpbm RUN_DEPENDS= wish8.3:${PORTSDIR}/x11-toolkits/tk83 diff --git a/graphics/mpegedit/Makefile b/graphics/mpegedit/Makefile index 975422aac4d1..9957d24059f3 100644 --- a/graphics/mpegedit/Makefile +++ b/graphics/mpegedit/Makefile @@ -13,7 +13,7 @@ DISTNAME= ${PORTNAME}_v${PORTVERSION} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= pnm.1:${PORTSDIR}/graphics/netpbm +LIB_DEPENDS= netpbm.1:${PORTSDIR}/graphics/netpbm USE_X_PREFIX= yes diff --git a/graphics/mpegedit/files/patch-aj b/graphics/mpegedit/files/patch-aj index 99b05d98e172..5f6ad7158183 100644 --- a/graphics/mpegedit/files/patch-aj +++ b/graphics/mpegedit/files/patch-aj @@ -1,5 +1,5 @@ ---- Makefile.orig Mon Jul 24 01:00:40 1995 -+++ Makefile Thu Jun 15 08:53:48 2000 +--- Makefile.orig Mon Jul 24 02:00:40 1995 ++++ Makefile Sat Jul 6 13:53:51 2002 @@ -23,8 +23,8 @@ # # Mr A S R Ashley B.Eng (Hons) 23rd July 1995 @@ -16,7 +16,7 @@ OBJS = main.o globals/version.o ARCHIVES = editor/editor.a ui/ui.a MpegCodec/mpeg.a - LIBS = -lXext -lX11 -lpnm -lppm -lpbm -lpgm -lm -+ LIBS = -L$(X11BASE)/lib -L$(LOCALBASE)/lib -lXext -lX11 -lpnm -lppm -lpbm -lpgm -lm ++ LIBS = -L$(X11BASE)/lib -L$(LOCALBASE)/lib -lXext -lX11 -lnetpbm -lm # # CPPFLAGS -Wall all warnings # -pipe speeds up compilation (remove only if not using g++) diff --git a/multimedia/mpegedit/Makefile b/multimedia/mpegedit/Makefile index 975422aac4d1..9957d24059f3 100644 --- a/multimedia/mpegedit/Makefile +++ b/multimedia/mpegedit/Makefile @@ -13,7 +13,7 @@ DISTNAME= ${PORTNAME}_v${PORTVERSION} MAINTAINER= ports@FreeBSD.org -LIB_DEPENDS= pnm.1:${PORTSDIR}/graphics/netpbm +LIB_DEPENDS= netpbm.1:${PORTSDIR}/graphics/netpbm USE_X_PREFIX= yes diff --git a/multimedia/mpegedit/files/patch-aj b/multimedia/mpegedit/files/patch-aj index 99b05d98e172..5f6ad7158183 100644 --- a/multimedia/mpegedit/files/patch-aj +++ b/multimedia/mpegedit/files/patch-aj @@ -1,5 +1,5 @@ ---- Makefile.orig Mon Jul 24 01:00:40 1995 -+++ Makefile Thu Jun 15 08:53:48 2000 +--- Makefile.orig Mon Jul 24 02:00:40 1995 ++++ Makefile Sat Jul 6 13:53:51 2002 @@ -23,8 +23,8 @@ # # Mr A S R Ashley B.Eng (Hons) 23rd July 1995 @@ -16,7 +16,7 @@ OBJS = main.o globals/version.o ARCHIVES = editor/editor.a ui/ui.a MpegCodec/mpeg.a - LIBS = -lXext -lX11 -lpnm -lppm -lpbm -lpgm -lm -+ LIBS = -L$(X11BASE)/lib -L$(LOCALBASE)/lib -lXext -lX11 -lpnm -lppm -lpbm -lpgm -lm ++ LIBS = -L$(X11BASE)/lib -L$(LOCALBASE)/lib -lXext -lX11 -lnetpbm -lm # # CPPFLAGS -Wall all warnings # -pipe speeds up compilation (remove only if not using g++) diff --git a/palm/imgvtopgm/Makefile b/palm/imgvtopgm/Makefile index aebb2ed6d8a5..9ce563522952 100644 --- a/palm/imgvtopgm/Makefile +++ b/palm/imgvtopgm/Makefile @@ -12,9 +12,10 @@ MASTER_SITES= http://www.trends.net/~mu/srcs/ MAINTAINER= sumikawa@FreeBSD.org -LIB_DEPENDS= pbm.1:${PORTSDIR}/graphics/netpbm +LIB_DEPENDS= netpbm.1:${PORTSDIR}/graphics/netpbm GNU_CONFIGURE= yes +CONFIGUR_ARGS= --libdir=${PREFIX} MAN1= imgvinfo.1 imgvtopnm.1 imgvview.1 pbmtoimgv.1 \ pgmtoimgv.1 ppmimgvquant.1 diff --git a/palm/imgvtopgm/files/patch-aa b/palm/imgvtopgm/files/patch-aa index b9d8d5208a12..24d9d860783d 100644 --- a/palm/imgvtopgm/files/patch-aa +++ b/palm/imgvtopgm/files/patch-aa @@ -1,5 +1,23 @@ ---- configure- Tue May 9 00:19:53 2000 -+++ configure Tue May 9 00:21:16 2000 +--- configure.orig Thu May 13 01:54:50 1999 ++++ configure Sat Jul 6 13:45:25 2002 +@@ -2248,7 +2248,7 @@ + mu_pnm_save_CPPFLAGS="$CPPFLAGS" + mu_pnm_save_LDFLAGS="$LDFLAGS" + +- LIBS="-lpbm $LIBS" ++ LIBS="-lnetpbm $LIBS" + CFLAGS="$X_CFLAGS $CFLAGS" + CPPFLAGS="$X_CFLAGS $CPPFLAGS" + LDFLAGS="$X_LDFLAGS $LDFLAGS" +@@ -2299,7 +2299,7 @@ + /usr/lib/* \ + /usr/local/lib/*; do + if test -d "$dir" \ +- && test "`ls $dir/libpbm.* 2>/dev/null`" != ""; then ++ && test "`ls $dir/libnetpbm.* 2>/dev/null`" != ""; then + mu_cv_pnm_libraries="$dir" + break + fi @@ -2330,11 +2330,10 @@ X_CFLAGS="-I$pnm_includes $X_CFLAGS" fi @@ -13,3 +31,90 @@ fi pnm_libraries_result="$pnm_libraries" +@@ -2358,14 +2357,14 @@ + LDFLAGS="$LDFLAGS $X_LIBS" + + PBM_LIBS="" +-echo $ac_n "checking for pbm_init in -lpbm""... $ac_c" 1>&6 +-echo "configure:2363: checking for pbm_init in -lpbm" >&5 ++echo $ac_n "checking for pbm_init in -lnetpbm""... $ac_c" 1>&6 ++echo "configure:2363: checking for pbm_init in -lnetpbm" >&5 + ac_lib_var=`echo pbm'_'pbm_init | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + ac_save_LIBS="$LIBS" +-LIBS="-lpbm $LIBS" ++LIBS="-lnetpbm $LIBS" + cat > conftest.$ac_ext <<EOF + #line 2371 "configure" + #include "confdefs.h" +@@ -2393,66 +2392,19 @@ + fi + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 +- PBM_LIBS="$PNM_LIBS -lpbm" ++ PBM_LIBS="$PNM_LIBS -lnetpbm" + else + echo "$ac_t""no" 1>&6 + fi + + if test "$PBM_LIBS" = ""; then +-{ echo "configure: error: The PBM library '-lpbm' could not be found. ++{ echo "configure: error: The PBM library '-lnetpbm' could not be found. + Please use the configure options '--with-pnm-includes=DIR' + and '--with-pnm-libraries=DIR' to specify the netpbm location. + See the 'config.log' file for further diagnostics." 1>&2; exit 1; } + fi + + +-PGM_LIBS="" +-echo $ac_n "checking for pgm_init in -lpgm""... $ac_c" 1>&6 +-echo "configure:2412: checking for pgm_init in -lpgm" >&5 +-ac_lib_var=`echo pgm'_'pgm_init | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-lpgm $PNM_LIBS ${PBM_LIBS} $LIBS" +-cat > conftest.$ac_ext <<EOF +-#line 2420 "configure" +-#include "confdefs.h" +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char pgm_init(); +- +-int main() { +-pgm_init() +-; return 0; } +-EOF +-if { (eval echo configure:2431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- PGM_LIBS="$PNM_LIBS -lpgm" +-else +- echo "$ac_t""no" 1>&6 +-fi +- +-if test "$PGM_LIBS" = ""; then +-{ echo "configure: error: The PGM library '-lpgm' could not be found. +- Please use the configure options '--with-pnm-includes=DIR' +- and '--with-pnm-libraries=DIR' to specify the netpbm location. +- See the 'config.log' file for further diagnostics." 1>&2; exit 1; } +-fi + + + echo $ac_n "checking whether we need -DSYSV""... $ac_c" 1>&6 diff --git a/palm/ppmtoTbmp/Makefile b/palm/ppmtoTbmp/Makefile index 3b301ccff128..7cc225d621bb 100644 --- a/palm/ppmtoTbmp/Makefile +++ b/palm/ppmtoTbmp/Makefile @@ -12,7 +12,7 @@ MASTER_SITES= http://www.isaac.cs.berkeley.edu/pilot/ MAINTAINER= noway@nohow.demon.co.uk -LIB_DEPENDS= pbm.1:${PORTSDIR}/graphics/netpbm +LIB_DEPENDS= netpbm.1:${PORTSDIR}/graphics/netpbm post-patch: ${PERL} -pi -e "s|^CFLAGS.+|CFLAGS += -I${LOCALBASE}/include|g; \ diff --git a/palm/ppmtoTbmp/files/patch-Makefile b/palm/ppmtoTbmp/files/patch-Makefile new file mode 100644 index 000000000000..8d3b7fba0f32 --- /dev/null +++ b/palm/ppmtoTbmp/files/patch-Makefile @@ -0,0 +1,8 @@ +--- Makefile.old Sat Jul 6 13:24:04 2002 ++++ Makefile Sat Jul 6 13:24:12 2002 +@@ -1,5 +1,5 @@ + CFLAGS = -Wall -O2 -I/opt/netpbm/include +-LDLIBS = -lpnm -lppm -lpgm -lpbm ++LDLIBS = -lnetpbm + + BINS = ppmtoTbmp Tbmptopnm |