diff options
author | jlam <jlam@pkgsrc.org> | 2001-05-26 07:16:16 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2001-05-26 07:16:16 +0000 |
commit | 95185453b5a576f51b52d5bae15f359e4e5c31fc (patch) | |
tree | 9226a09499f6d49c0f4440cc4a9670c020d83e8e | |
parent | 365b176070853881b66d6b0cb50cf9bf55b1c14a (diff) | |
download | pkgsrc-95185453b5a576f51b52d5bae15f359e4e5c31fc.tar.gz |
Use buildlink.mk files to get dependencies on cups and fltk, and add a
patch the configure script directly to remove the build dependency on
autoconf.
-rw-r--r-- | print/xpp/Makefile | 18 | ||||
-rw-r--r-- | print/xpp/distinfo | 3 | ||||
-rw-r--r-- | print/xpp/patches/patch-ab | 107 |
3 files changed, 117 insertions, 11 deletions
diff --git a/print/xpp/Makefile b/print/xpp/Makefile index e9629ea42b0..696de40bc71 100644 --- a/print/xpp/Makefile +++ b/print/xpp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2001/03/27 03:20:14 hubertf Exp $ +# $NetBSD: Makefile,v 1.8 2001/05/26 07:16:16 jlam Exp $ DISTNAME= xpp-1.0 CATEGORIES= print x11 @@ -8,24 +8,22 @@ MAINTAINER= jlam@netbsd.org HOMEPAGE= http://cups.sourceforge.net/xpp/index.html COMMENT= X Printing Panel -BUILD_DEPENDS+= autoconf-2.13:../../devel/autoconf -DEPENDS+= cups>=1.1.1:../../print/cups -DEPENDS+= fltk>=1.0.9:../../x11/fltk - USE_X11= # defined USE_GMAKE= # defined GNU_CONFIGURE= # defined CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}" -EVAL_PREFIX+= FLTKDIR=fltk -CPPFLAGS+= -I${FLTKDIR}/include # FL/Fl.h -CPPFLAGS+= -I${LOCALBASE}/include # cups/cups.h +.include "../../print/cups/buildlink.mk" +.include "../../x11/fltk/buildlink.mk" + +CPPFLAGS+= -I${BUILDLINK_INCDIR} +LDFLAGS+= -L${BUILDLINK_LIBDIR} DOCDIR= ${PREFIX}/share/doc/xpp -pre-configure: - cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf && touch aclocal.m4 Makefile.in +pre-configure: ${BUILDLINK_TARGETS} + cd ${WRKSRC}; ${TOUCH} Makefile.in aclocal.m4 configure post-install: ${INSTALL_DATA_DIR} ${DOCDIR} diff --git a/print/xpp/distinfo b/print/xpp/distinfo index e175537abe4..9455a87ed20 100644 --- a/print/xpp/distinfo +++ b/print/xpp/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.2 2001/04/20 12:41:54 agc Exp $ +$NetBSD: distinfo,v 1.3 2001/05/26 07:16:16 jlam Exp $ SHA1 (xpp-1.0.tar.gz) = de66f28a78a474eca5392a2a6914d08cd876ebb8 Size (xpp-1.0.tar.gz) = 75420 bytes SHA1 (patch-aa) = 7658afc3b1f2bff134f648aebf2ba26f2f7a8a29 +SHA1 (patch-ab) = 2168a159c0c245384e9c986596a2f2d64d70a2f3 diff --git a/print/xpp/patches/patch-ab b/print/xpp/patches/patch-ab new file mode 100644 index 00000000000..446af99677c --- /dev/null +++ b/print/xpp/patches/patch-ab @@ -0,0 +1,107 @@ +$NetBSD: patch-ab,v 1.1 2001/05/26 07:16:16 jlam Exp $ + +--- configure.orig Fri Jan 26 19:17:37 2001 ++++ configure +@@ -2126,8 +2126,51 @@ + echo "$ac_t""no" 1>&6 + fi + ++echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 ++echo "configure:2131: checking for main in -lm" >&5 ++ac_lib_var=`echo m'_'main | 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="-lm $LIBS" ++cat > conftest.$ac_ext <<EOF ++#line 2139 "configure" ++#include "confdefs.h" ++ ++int main() { ++main() ++; return 0; } ++EOF ++if { (eval echo configure:2146: \"$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 ++ ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \ ++ -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` ++ cat >> confdefs.h <<EOF ++#define $ac_tr_lib 1 ++EOF ++ ++ LIBS="-lm $LIBS" ++ ++else ++ echo "$ac_t""no" 1>&6 ++fi ++ + echo $ac_n "checking for main in -lGL""... $ac_c" 1>&6 +-echo "configure:2131: checking for main in -lGL" >&5 ++echo "configure:2174: checking for main in -lGL" >&5 + ac_lib_var=`echo GL'_'main | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -2280,49 +2323,6 @@ + if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then + echo "$ac_t""yes" 1>&6 + LIBS="$LIBFLTKA $LIBS" +-else +- echo "$ac_t""no" 1>&6 +-fi +- +-echo $ac_n "checking for main in -lm""... $ac_c" 1>&6 +-echo "configure:2289: checking for main in -lm" >&5 +-ac_lib_var=`echo m'_'main | 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="-lm $LIBS" +-cat > conftest.$ac_ext <<EOF +-#line 2297 "configure" +-#include "confdefs.h" +- +-int main() { +-main() +-; return 0; } +-EOF +-if { (eval echo configure:2304: \"$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 +- ac_tr_lib=HAVE_LIB`echo m | sed -e 's/[^a-zA-Z0-9_]/_/g' \ +- -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'` +- cat >> confdefs.h <<EOF +-#define $ac_tr_lib 1 +-EOF +- +- LIBS="-lm $LIBS" +- + else + echo "$ac_t""no" 1>&6 + fi |