diff options
author | tv <tv> | 1998-07-12 04:05:50 +0000 |
---|---|---|
committer | tv <tv> | 1998-07-12 04:05:50 +0000 |
commit | 65cce730bafb7620a156442c8d5b194ba6eff0fa (patch) | |
tree | a1f097d1173a398c3a600777adc850bf966a8ffa /www/Mosaic/patches | |
parent | 421be42ef77bc7cc7690daa254f07626c31f4bd4 (diff) | |
download | pkgsrc-65cce730bafb7620a156442c8d5b194ba6eff0fa.tar.gz |
Add and activate Mosaic (XMosaic) pkg, based on the FreeBSD port.
Diffstat (limited to 'www/Mosaic/patches')
-rw-r--r-- | www/Mosaic/patches/patch-aa | 122 | ||||
-rw-r--r-- | www/Mosaic/patches/patch-ad | 2 | ||||
-rw-r--r-- | www/Mosaic/patches/patch-aj | 54 | ||||
-rw-r--r-- | www/Mosaic/patches/patch-ak | 10 | ||||
-rw-r--r-- | www/Mosaic/patches/patch-al | 10 | ||||
-rw-r--r-- | www/Mosaic/patches/patch-am | 10 | ||||
-rw-r--r-- | www/Mosaic/patches/patch-an | 10 |
7 files changed, 95 insertions, 123 deletions
diff --git a/www/Mosaic/patches/patch-aa b/www/Mosaic/patches/patch-aa deleted file mode 100644 index be98fd0675a..00000000000 --- a/www/Mosaic/patches/patch-aa +++ /dev/null @@ -1,122 +0,0 @@ -*** makefiles/Makefile.bsdi.orig Wed Jun 12 03:45:25 1996 ---- makefiles/Makefile.bsdi Fri Aug 2 20:40:18 1996 -*************** -*** 36,46 **** - sysconfigflags = -DMOTIF1_2 - - #### System libraries. -! syslibs = -lipc - - #### X include file locations -- if your platform puts the X include -! xinc = -I/usr/X11/include -! xlibs = -L/usr/X11/lib -lXm -lXmu -lXt -lXext -lSM -lICE -lXpm -lX11 - - - #### DTM AND HDF SUPPORT; READ CAREFULLY ---- 36,46 ---- - sysconfigflags = -DMOTIF1_2 - - #### System libraries. -! #syslibs = -lipc - - #### X include file locations -- if your platform puts the X include -! xinc = -I${X11BASE}/include -! xlibs = ${MOTIFLIB} -L${X11BASE}/lib -lXmu -lXt -lXext -lSM -lICE -lXpm -lX11 - - - #### DTM AND HDF SUPPORT; READ CAREFULLY -*************** -*** 73,82 **** - #### For inline PNG support, the following should be defined: - #### The libraries currently used are PNGLIB 0.81 and ZLIB 0.95 - -! pngdir = /xdev/mosaic/libpng/bsdi - pnglibdir = $(pngdir)/lib - pngincludedir = $(pngdir)/include -! pnglibs = $(pnglibdir)/libpng.a $(pnglibdir)/libz.a -lm - pngflags = -I$(pngincludedir) -DHAVE_PNG - - #pngdir = /work2/mosaic-libs/libpng ---- 73,82 ---- - #### For inline PNG support, the following should be defined: - #### The libraries currently used are PNGLIB 0.81 and ZLIB 0.95 - -! pngdir = ${LOCALBASE} - pnglibdir = $(pngdir)/lib - pngincludedir = $(pngdir)/include -! pnglibs = -L$(pnglibdir) -lpng -lz -lm - pngflags = -I$(pngincludedir) -DHAVE_PNG - - #pngdir = /work2/mosaic-libs/libpng -*************** -*** 90,98 **** - #### For inline JPEG support, the following should be defined: - #### The library used is Independent JPEG Group (IJG's) 5.0a. - -! jpegdir = /work2/mosaic-libs/libjpeg-6 -! jpeglibs = $(jpegdir)/libjpeg.a -! jpegflags = -I$(jpegdir) -DHAVE_JPEG - - - #### KERBEROS SUPPORT ---- 90,98 ---- - #### For inline JPEG support, the following should be defined: - #### The library used is Independent JPEG Group (IJG's) 5.0a. - -! jpegdir = ${LOCALBASE} -! jpeglibs = -L$(jpegdir) -ljpeg -! jpegflags = -I$(jpegdir)/include -DHAVE_JPEG - - - #### KERBEROS SUPPORT -*************** -*** 160,166 **** - #### modifying the Makefiles, so you may comment it out without harm. - ######## - ######## -! -include local-defines/$(DEV_ARCH) - - - ---- 160,166 ---- - #### modifying the Makefiles, so you may comment it out without harm. - ######## - ######## -! #-include local-defines/$(DEV_ARCH) - - - -*************** -*** 168,174 **** - # --------------------- Do Not Modify Below This Line ------------------------ - # - -! CFLAGS = -g $(sysconfigflags) $(prereleaseflags) - - # Don't worry about these -- for development purposes only. - PURIFY = purify ---- 168,174 ---- - # --------------------- Do Not Modify Below This Line ------------------------ - # - -! CFLAGS += $(sysconfigflags) $(prereleaseflags) - - # Don't worry about these -- for development purposes only. - PURIFY = purify -*************** -*** 199,205 **** - - src:: - @echo --- Building src -! cd src; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags) -I.. -I../libXmx -I../libwww2" AUX_CFLAGS=$(knrflag) X_LIBS="$(xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic" - - src-purifyd:: - @echo --- Building Purify'd src ---- 199,205 ---- - - src:: - @echo --- Building src -! cd src; $(MAKE) CC=$(CC) RANLIB=$(RANLIB) LDFLAGS="$(ldflags)" CFLAGS="$(CFLAGS) $(customflags) $(xinc) -I.. -I../libXmx -I../libwww2 $(jpegflags) $(dtmflags) $(hdfflags) $(pngflags) $(krbflags)" AUX_CFLAGS=$(knrflag) X_LIBS="$(xlibs)" SYS_LIBS="$(sockslibs) $(syslibs)" DTM_LIBS="$(dtmlibs)" HDF_LIBS="$(hdflibs)" WAIS_LIBS="$(waislibs)" LIBWWW_DIR=../libwww2 JPEG_LIBS="$(jpeglibs)" PNG_LIBS="$(pnglibs)" KRB_LIBS="$(krblibs)" LIBNUT_DIR=../libnut MOSAIC="Mosaic" - - src-purifyd:: - @echo --- Building Purify'd src diff --git a/www/Mosaic/patches/patch-ad b/www/Mosaic/patches/patch-ad index 4a86740c75b..42b9ddea218 100644 --- a/www/Mosaic/patches/patch-ad +++ b/www/Mosaic/patches/patch-ad @@ -5,7 +5,7 @@ offset (confirm_exit), XtRString, "True" }, /* THIS USED TO BE mailCommand BUT IS NOW sendmailCommand. */ -#ifdef __bsdi__ -+#if defined(__bsdi__) || defined(__FreeBSD__) ++#if defined(__bsdi__) || defined(__FreeBSD__) || defined(__NetBSD__) { "sendmailCommand", "SendmailCommand", XtRString, sizeof (char *), offset (sendmail_command), XtRString, "/usr/sbin/sendmail -t" }, #else diff --git a/www/Mosaic/patches/patch-aj b/www/Mosaic/patches/patch-aj new file mode 100644 index 00000000000..5e9460d31d9 --- /dev/null +++ b/www/Mosaic/patches/patch-aj @@ -0,0 +1,54 @@ +--- configure.orig Wed Jul 10 21:34:39 1996 ++++ configure Sat Jul 11 22:46:53 1998 +@@ -1887,7 +1887,7 @@ + fi + + echo $ac_n "checking for -lXpm""... $ac_c" 1>&6 +-ac_lib_var=`echo Xpm'_'_XpmFreeXpmImage | tr './+\055' '__p_'` ++ac_lib_var=`echo Xpm'_'XpmFreeXpmImage | tr './+\055' '__p_'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -1899,11 +1899,11 @@ + /* 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 _XpmFreeXpmImage(); ++char XpmFreeXpmImage(); + + int main() { return 0; } + int t() { +-_XpmFreeXpmImage() ++XpmFreeXpmImage() + ; return 0; } + EOF + if { (eval echo configure:1910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then +@@ -3038,7 +3038,7 @@ + LIBS="${withval}/libjpeg.a ${LIBS}" + else + if test -r ${withval}/lib/libjpeg.a ; then +- LIBS="${withval}/lib/libjpeg.a ${LIBS}" ++ LIBS="-L${withval}/lib -ljpeg ${LIBS}" + else + { echo "configure: error: Could not find libjpeg.a in ${withval}" 1>&2; exit 1; } + fi +@@ -3125,8 +3125,8 @@ + libz="${withval}/libz.a" + else + if test -r ${withval}/lib/libz.a ; then +- LIBS="${withval}/lib/libz.a ${LIBS}" +- libz="${withval}/lib/libz.a" ++ LIBS="-L${withval}/lib -lz ${LIBS}" ++ libz="-L${withval}/lib -lz" + else + { echo "configure: error: Could not find libz.a in ${withval}" 1>&2; exit 1; } + fi +@@ -3180,7 +3180,7 @@ + LIBS="${withval}/libpng.a ${libz} ${LIBS}" + else + if test -r ${withval}/lib/libpng.a ; then +- LIBS="${withval}/lib/libpng.a ${libz} ${LIBS}" ++ LIBS="-L${withval}/lib -lpng ${libz} ${LIBS}" + else + { echo "configure: error: Could not find libpng.a in ${withval}" 1>&2; exit 1; } + fi diff --git a/www/Mosaic/patches/patch-ak b/www/Mosaic/patches/patch-ak new file mode 100644 index 00000000000..7d16eaea38f --- /dev/null +++ b/www/Mosaic/patches/patch-ak @@ -0,0 +1,10 @@ +--- src/Makefile.in.orig Fri Jun 28 01:42:15 1996 ++++ src/Makefile.in Sat Jul 11 21:40:17 1998 +@@ -7,6 +7,7 @@ + CC= @CC@ + LIBS = ../libhtmlw/libhtmlw.a ../libwww2/libwww.a ../libnut/libnut.a ../libXmx/libXmx.a @LIBS@ + CPPFLAGS = @CPPFLAGS@ -I.. -I../libwww2 ++LDFLAGS = @LDFLAGS@ + CFLAGS = @CFLAGS@ + + LIBHTMLW_DIR = ../libhtmlw diff --git a/www/Mosaic/patches/patch-al b/www/Mosaic/patches/patch-al new file mode 100644 index 00000000000..e04bb3aeb4f --- /dev/null +++ b/www/Mosaic/patches/patch-al @@ -0,0 +1,10 @@ +--- libwww2/Makefile.in.orig Sat Jul 11 21:41:11 1998 ++++ libwww2/Makefile.in Sat Jul 11 21:41:30 1998 +@@ -7,6 +7,7 @@ + CC= @CC@ + LIBS = @LIBS@ + CFLAGS = @CFLAGS@ ++CPPFLAGS = @CPPFLAGS@ + + RANLIB = @RANLIB@ + diff --git a/www/Mosaic/patches/patch-am b/www/Mosaic/patches/patch-am new file mode 100644 index 00000000000..14aace40037 --- /dev/null +++ b/www/Mosaic/patches/patch-am @@ -0,0 +1,10 @@ +--- libXmx/Makefile.in.orig Tue Jun 25 04:29:07 1996 ++++ libXmx/Makefile.in Sat Jul 11 22:44:05 1998 +@@ -7,6 +7,7 @@ + CC= @CC@ + LIBS = @LIBS@ + CFLAGS = @CFLAGS@ ++CPPFLAGS = @CPPFLAGS@ + RANLIB = @RANLIB@ + + # You shouldn't need to edit below here. diff --git a/www/Mosaic/patches/patch-an b/www/Mosaic/patches/patch-an new file mode 100644 index 00000000000..d4edaa4715f --- /dev/null +++ b/www/Mosaic/patches/patch-an @@ -0,0 +1,10 @@ +--- libhtmlw/Makefile.in.orig Sat Jul 11 23:07:57 1998 ++++ libhtmlw/Makefile.in Sat Jul 11 23:19:38 1998 +@@ -6,6 +6,7 @@ + + CC= @CC@ + LIBS = @LIBS@ ++CPPFLAGS = @CPPFLAGS@ + CFLAGS = @CFLAGS@ + + RANLIB = @RANLIB@ |