From 151c032aad0340472dca16ab47577128edef9bba Mon Sep 17 00:00:00 2001 From: obrien Date: Tue, 10 Nov 1998 03:11:24 +0000 Subject: upgrade to 1.5.12a --- devel/xwpe/Makefile | 4 +- devel/xwpe/distinfo | 2 +- devel/xwpe/files/patch-02 | 22 +++------ devel/xwpe/files/patch-05 | 22 ++++----- devel/xwpe/files/patch-08 | 123 +++------------------------------------------- 5 files changed, 25 insertions(+), 148 deletions(-) (limited to 'devel') diff --git a/devel/xwpe/Makefile b/devel/xwpe/Makefile index 09e841ed58da..27a65cdccd64 100644 --- a/devel/xwpe/Makefile +++ b/devel/xwpe/Makefile @@ -4,10 +4,10 @@ # Date created: Fri Jan 24, 1997 # Whom: David O'Brien (obrien@FreeBSD.org) # -# $Id: Makefile,v 1.5 1998/05/09 18:52:33 obrien Exp $ +# $Id: Makefile,v 1.6 1998/08/13 03:35:24 asami Exp $ # -DISTNAME= xwpe-1.5.9a +DISTNAME= xwpe-1.5.12a CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SUNSITE} \ http://www.rpi.edu/~payned/xwpe/ \ diff --git a/devel/xwpe/distinfo b/devel/xwpe/distinfo index 38033ebc36ee..8832ac04d70f 100644 --- a/devel/xwpe/distinfo +++ b/devel/xwpe/distinfo @@ -1 +1 @@ -MD5 (xwpe-1.5.9a.tgz) = 1607a758ed9c45fd9725f233e263c56d +MD5 (xwpe-1.5.12a.tgz) = 3d59c2e921cf9bd82b591655dadd2b1e diff --git a/devel/xwpe/files/patch-02 b/devel/xwpe/files/patch-02 index b8d586f8d5f8..691b15882565 100644 --- a/devel/xwpe/files/patch-02 +++ b/devel/xwpe/files/patch-02 @@ -1,14 +1,6 @@ ---- Makefile.in.orig Wed May 6 11:03:13 1998 -+++ Makefile.in Fri May 8 10:10:38 1998 -@@ -1,6 +1,6 @@ - #C-Compiler (gcc if exist): - CC= @CC@ --CFLAGS= @CFLAGS@ @X_CFLAGS@ -+CFLAGS= @CFLAGS@ -DLIBRARY_DIR=\"$(XWPELIBDIR)\" -DINFO_DIR=\"$(INFODIR)\" -DX_INC=\"$(X_INC)\"@X_CFLAGS@ - #CFLAGS= @CFLAGS@ @EXTRA_CFLAGS@ @X_CFLAGS@ - - #Source Directory: -@@ -9,13 +9,16 @@ +--- Makefile.in.orig Sat Sep 5 06:57:17 1998 ++++ Makefile.in Mon Nov 9 15:03:57 1998 +@@ -9,12 +9,13 @@ #Destination Directory prefix=@prefix@ DESTDIR= $(prefix)/bin @@ -16,13 +8,11 @@ +LIBDIR= $(prefix)/share XWPELIBDIR= $(LIBDIR)/xwpe MANDIR= $(prefix)/man -+INFODIR= $(prefix)/info ++#INFODIR= $(prefix)/info LIBS=@X_LIBS@ @X_PRE_LIBS@ @LIBS@ @X_EXTRA_LIBS@ - DEFS=@DEFS@ +-DEFS=@DEFS@ -DLIBRARY_DIR=\"$(XWPELIBDIR)\" ++DEFS=@DEFS@ -DLIBRARY_DIR=\"$(XWPELIBDIR)\" -DINFO_DIR=\"$(INFODIR)\" -DX_INC=\"@X_INC@\" INSTALL= cp -+ -+X_INC= @X_INC@ # In case configure fails a description of many of the compilation options - # are provided below so that administrators can determine the proper flags. diff --git a/devel/xwpe/files/patch-05 b/devel/xwpe/files/patch-05 index 2c0ab6518952..780d5ddab995 100644 --- a/devel/xwpe/files/patch-05 +++ b/devel/xwpe/files/patch-05 @@ -1,5 +1,5 @@ ---- we_prog.c.orig Wed May 6 11:03:14 1998 -+++ we_prog.c Fri May 8 10:09:49 1998 +--- we_prog.c.orig Sat Sep 5 06:57:18 1998 ++++ we_prog.c Sun Nov 8 01:53:20 1998 @@ -15,6 +15,9 @@ #include #include @@ -10,20 +10,16 @@ int e_run_sh(FENSTER *f); int e_make_library(char *library, char *ofile, FENSTER *f); -@@ -944,7 +947,15 @@ - e_prog.exedir = WpeStringMake("."); +@@ -943,7 +946,11 @@ + e_prog.exedir = WpeStringMake("."); if (e_prog.sys_include) FREE(e_prog.sys_include); - e_prog.sys_include = WpeStringMake( -- "/usr/include:/usr/5include:/usr/include/X11"); -+#if (defined(BSD) && (BSD >= 199306)) || (defined(sun) && defined(__svr4__)) -+ "/usr/include:/usr/local/include" -+#else -+ "/usr/include:/usr/5include" -+#endif + e_prog.sys_include = +- WpeStringMake("/usr/include:/usr/local/include:/usr/include/X11"); ++ WpeStringMake("/usr/include:/usr/local/include" +#if !defined(NO_XWINDOWS) + ":"X_INC +#endif -+ ); ++ ); if(e_prog.comp == NULL) - e_prog.comp = MALLOC(e_prog.num * sizeof(struct e_s_prog *)); + e_prog.comp = MALLOC(e_prog.num * sizeof(struct e_s_prog *)); else diff --git a/devel/xwpe/files/patch-08 b/devel/xwpe/files/patch-08 index 962ab424a4f6..f1a0e72016a9 100644 --- a/devel/xwpe/files/patch-08 +++ b/devel/xwpe/files/patch-08 @@ -1,119 +1,10 @@ ---- configure.orig Wed May 6 11:03:15 1998 -+++ configure Fri May 8 10:28:36 1998 -@@ -1374,63 +1374,63 @@ - set dummy lpr; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 - echo "configure:1377: checking for $ac_word" >&5 --if eval "test \"`echo '$''{'ac_cv_prog_PRINTER'+set}'`\" = set"; then -+if eval "test \"`echo '$''{'ac_cv_prog_PNTR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -- if test -n "$PRINTER"; then -- ac_cv_prog_PRINTER="$PRINTER" # Let the user override the test. -+ if test -n "$PNTR"; then -+ ac_cv_prog_PNTR="$PNTR" # Let the user override the test. - else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then -- ac_cv_prog_PRINTER="lpr" -+ ac_cv_prog_PNTR="lpr" - break - fi - done - IFS="$ac_save_ifs" - fi - fi --PRINTER="$ac_cv_prog_PRINTER" --if test -n "$PRINTER"; then -- echo "$ac_t""$PRINTER" 1>&6 -+PNTR="$ac_cv_prog_PNTR" -+if test -n "$PNTR"; then -+ echo "$ac_t""$PNTR" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - --if test -z "${PRINTER}"; then -+if test -z "${PNTR}"; then - # Extract the first word of "lp", so it can be a program name with args. - set dummy lp; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 - echo "configure:1406: checking for $ac_word" >&5 --if eval "test \"`echo '$''{'ac_cv_prog_PRINTER'+set}'`\" = set"; then -+if eval "test \"`echo '$''{'ac_cv_prog_PNTR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -- if test -n "$PRINTER"; then -- ac_cv_prog_PRINTER="$PRINTER" # Let the user override the test. -+ if test -n "$PNTR"; then -+ ac_cv_prog_PNTR="$PNTR" # Let the user override the test. - else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then -- ac_cv_prog_PRINTER="lp" -+ ac_cv_prog_PNTR="lp" - break - fi - done - IFS="$ac_save_ifs" - fi - fi --PRINTER="$ac_cv_prog_PRINTER" --if test -n "$PRINTER"; then -- echo "$ac_t""$PRINTER" 1>&6 -+PNTR="$ac_cv_prog_PNTR" -+if test -n "$PNTR"; then -+ echo "$ac_t""$PNTR" 1>&6 - else - echo "$ac_t""no" 1>&6 - fi - - fi --if test -n "${PRINTER}"; then -+if test -n "${PNTR}"; then - cat >> confdefs.h <x11-servers/driglide
Commit message (Expand)AuthorAgeFilesLines
* Mark this ONLY_FOR_ARCHS=i386 until it's ported to other platforms.Eric Anholt2003-03-131-0/+2
* Update driglide to 0.9.1 after a repocopy from graphics/glide3. This is a forkEric Anholt2003-03-0624-763/+19
* Change email to anholt@freebsd.org and move local distfiles.Eric Anholt2002-07-311-2/+2
* Take maintainership of glide3, update to a more recent CVS snapshot,Eric Anholt2002-06-07