svn commit: r363322 - in head: palm/imgvtopgm/files palm/pilot_makedoc/files polish/libtlen polish/libtlen/files print/asprint/files print/bibview/files print/dviselect/files print/freetype2 print/...
Adam Weinberger
adamw at FreeBSD.org
Tue Jul 29 14:02:23 UTC 2014
Author: adamw
Date: Tue Jul 29 14:02:16 2014
New Revision: 363322
URL: http://svnweb.freebsd.org/changeset/ports/363322
QAT: https://qat.redports.org/buildarchive/r363322/
Log:
Rename p*/ patch-xy patches to reflect the files they modify.
Added:
head/palm/imgvtopgm/files/patch-configure
- copied unchanged from r363316, head/palm/imgvtopgm/files/patch-aa
head/palm/pilot_makedoc/files/patch-makedoc7.cpp
- copied unchanged from r363316, head/palm/pilot_makedoc/files/patch-aa
head/polish/libtlen/files/patch-lib_Makefile.in
- copied unchanged from r363316, head/polish/libtlen/files/patch-aa
head/print/asprint/files/patch-asprint.c
- copied unchanged from r363316, head/print/asprint/files/patch-ab
head/print/asprint/files/patch-makefile
- copied unchanged from r363316, head/print/asprint/files/patch-aa
head/print/bibview/files/patch-ComboBo.h
- copied unchanged from r363316, head/print/bibview/files/patch-ah
head/print/bibview/files/patch-FileNom.c
- copied unchanged from r363316, head/print/bibview/files/patch-ac
head/print/bibview/files/patch-FileNom.h
- copied unchanged from r363316, head/print/bibview/files/patch-ag
head/print/bibview/files/patch-Imakefile
- copied unchanged from r363316, head/print/bibview/files/patch-aa
head/print/bibview/files/patch-bibview.c
- copied unchanged from r363316, head/print/bibview/files/patch-ab
head/print/bibview/files/patch-ctl_card.c
- copied unchanged from r363316, head/print/bibview/files/patch-af
head/print/bibview/files/patch-gui_card.c
- copied unchanged from r363316, head/print/bibview/files/patch-ae
head/print/bibview/files/patch-gui_widg.c
- copied unchanged from r363316, head/print/bibview/files/patch-ad
head/print/dviselect/files/patch-dviselect.c
- copied unchanged from r363316, head/print/dviselect/files/patch-aa
head/print/dviselect/files/patch-lib_Makefile
- copied unchanged from r363316, head/print/dviselect/files/patch-lib::Makefile
head/print/dviselect/files/patch-lib_error.c
- copied unchanged from r363316, head/print/dviselect/files/patch-lib::error.c
head/print/dviselect/files/patch-lib_font.c
- copied unchanged from r363316, head/print/dviselect/files/patch-ac
head/print/dviselect/files/patch-lib_pkfont.c
- copied unchanged from r363316, head/print/dviselect/files/patch-lib::pkfont.c
head/print/dviselect/files/patch-lib_pxlfont.c
- copied unchanged from r363316, head/print/dviselect/files/patch-lib::pxlfont.c
head/print/dviselect/files/patch-lib_rotate.c
- copied unchanged from r363316, head/print/dviselect/files/patch-lib::rotate.c
head/print/dviselect/files/patch-lib_search.c
- copied unchanged from r363316, head/print/dviselect/files/patch-lib::search.c
head/print/dviselect/files/patch-lib_seek.c
- copied unchanged from r363316, head/print/dviselect/files/patch-ad
head/print/dviselect/files/patch-lib_tfm.c
- copied unchanged from r363316, head/print/dviselect/files/patch-lib::tfm.c
head/print/dviselect/files/patch-lib_tfmfont.c
- copied unchanged from r363316, head/print/dviselect/files/patch-lib::tfmfont.c
head/print/freetype2/files/patch-builds_unix_detect.mk
- copied unchanged from r363316, head/print/freetype2/files/patch-aa
head/print/hp2xx/files/patch-Makefile
- copied unchanged from r363316, head/print/hp2xx/files/patch-aa
head/print/hp2xx/files/patch-doc_hp2xxinf.tex
- copied unchanged from r363316, head/print/hp2xx/files/patch-ab
head/print/html2latex/files/patch-add-comment
- copied unchanged from r363316, head/print/html2latex/files/patch-aa
head/print/html2latex/files/patch-html2latex.1
- copied unchanged from r363316, head/print/html2latex/files/patch-ac
head/print/libppd/files/patch-src_Makefile.in
- copied unchanged from r363316, head/print/libppd/files/patch-aa
head/print/lprps/files/patch-INSTALL
- copied unchanged from r363316, head/print/lprps/files/patch-ae
head/print/mp-letter/files/patch-mp.common.ps
- copied unchanged from r363316, head/print/mp-letter/files/patch-ad
head/print/mp-letter/files/patch-mp.man
- copied unchanged from r363316, head/print/mp-letter/files/patch-ac
head/print/muttprint/files/patch-doc_manpages_Makefile
- copied unchanged from r363316, head/print/muttprint/files/patch-ad
head/print/muttprint/files/patch-doc_manual_Makefile
- copied unchanged from r363316, head/print/muttprint/files/patch-ac
head/print/muttprint/files/patch-langinfo_Makefile
- copied unchanged from r363316, head/print/muttprint/files/patch-langinfo::Makefile
head/print/muttprint/files/patch-muttprint
- copied unchanged from r363316, head/print/muttprint/files/patch-ab
head/print/muttprint/files/patch-pics_Beastie.eps
- copied unchanged from r363316, head/print/muttprint/files/patch-ae
head/print/pcal/files/patch-Makefile
- copied unchanged from r363316, head/print/pcal/files/patch-aa
head/print/pcal/files/patch-html_pcal.cgi
- copied unchanged from r363316, head/print/pcal/files/patch-ab
head/print/pcal/files/patch-html_pcal.html
- copied unchanged from r363316, head/print/pcal/files/patch-ac
head/print/pcal/files/patch-html_pcalw.html
- copied unchanged from r363316, head/print/pcal/files/patch-ad
head/print/pic2fig/files/patch-FORMAT3.2
- copied unchanged from r363316, head/print/pic2fig/files/patch-aa
head/print/pic2fig/files/patch-Makefile
- copied unchanged from r363316, head/print/pic2fig/files/patch-ab
head/print/pic2fig/files/patch-figd.c
- copied unchanged from r363316, head/print/pic2fig/files/patch-ac
head/print/pic2fig/files/patch-main.c
- copied unchanged from r363316, head/print/pic2fig/files/patch-ad
head/print/pic2fig/files/patch-pic.h
- copied unchanged from r363316, head/print/pic2fig/files/patch-ae
head/print/pic2fig/files/patch-pic2fig.1
- copied unchanged from r363316, head/print/pic2fig/files/patch-af
head/print/pic2fig/files/patch-picl.c
- copied unchanged from r363316, head/print/pic2fig/files/patch-ag
head/print/pic2fig/files/patch-plfig.c
- copied unchanged from r363316, head/print/pic2fig/files/patch-ah
head/print/poster/files/patch-poster.c
- copied unchanged from r363316, head/print/poster/files/patch-aa
head/print/tex/files/patch-configure
- copied unchanged from r363316, head/print/tex/files/patch-ab
head/print/tex/files/patch-kpathsea_config.h
- copied unchanged from r363316, head/print/tex/files/patch-af
head/print/tex/files/patch-kpathsea_configure
- copied unchanged from r363316, head/print/tex/files/patch-ac
head/print/tex/files/patch-make_common.make
- copied unchanged from r363316, head/print/tex/files/patch-aa
head/print/tex/files/patch-web2c_configure
- copied unchanged from r363316, head/print/tex/files/patch-ad
head/print/tex/files/patch-web2c_web2c_web2c.y
- copied unchanged from r363316, head/print/tex/files/patch-ae
head/print/transfig/files/patch-fig2dev_Imakefile
- copied unchanged from r363316, head/print/transfig/files/patch-ac
head/print/transfig/files/patch-fig2dev_dev_korean.ps
- copied unchanged from r363316, head/print/transfig/files/patch-ba
head/print/xmbibtex/files/patch-Imakefile
- copied unchanged from r363316, head/print/xmbibtex/files/patch-aa
Deleted:
head/palm/imgvtopgm/files/patch-aa
head/palm/pilot_makedoc/files/patch-aa
head/polish/libtlen/files/patch-aa
head/print/asprint/files/patch-aa
head/print/asprint/files/patch-ab
head/print/bibview/files/patch-aa
head/print/bibview/files/patch-ab
head/print/bibview/files/patch-ac
head/print/bibview/files/patch-ad
head/print/bibview/files/patch-ae
head/print/bibview/files/patch-af
head/print/bibview/files/patch-ag
head/print/bibview/files/patch-ah
head/print/dviselect/files/patch-aa
head/print/dviselect/files/patch-ac
head/print/dviselect/files/patch-ad
head/print/dviselect/files/patch-lib::Makefile
head/print/dviselect/files/patch-lib::error.c
head/print/dviselect/files/patch-lib::pkfont.c
head/print/dviselect/files/patch-lib::pxlfont.c
head/print/dviselect/files/patch-lib::rotate.c
head/print/dviselect/files/patch-lib::search.c
head/print/dviselect/files/patch-lib::tfm.c
head/print/dviselect/files/patch-lib::tfmfont.c
head/print/freetype2/files/patch-aa
head/print/hp2xx/files/patch-aa
head/print/hp2xx/files/patch-ab
head/print/html2latex/files/patch-aa
head/print/html2latex/files/patch-ac
head/print/libppd/files/patch-aa
head/print/lprps/files/patch-ae
head/print/mp-letter/files/patch-ac
head/print/mp-letter/files/patch-ad
head/print/muttprint/files/patch-ab
head/print/muttprint/files/patch-ac
head/print/muttprint/files/patch-ad
head/print/muttprint/files/patch-ae
head/print/muttprint/files/patch-langinfo::Makefile
head/print/pcal/files/patch-aa
head/print/pcal/files/patch-ab
head/print/pcal/files/patch-ac
head/print/pcal/files/patch-ad
head/print/pic2fig/files/patch-aa
head/print/pic2fig/files/patch-ab
head/print/pic2fig/files/patch-ac
head/print/pic2fig/files/patch-ad
head/print/pic2fig/files/patch-ae
head/print/pic2fig/files/patch-af
head/print/pic2fig/files/patch-ag
head/print/pic2fig/files/patch-ah
head/print/poster/files/patch-aa
head/print/tex/files/patch-aa
head/print/tex/files/patch-ab
head/print/tex/files/patch-ac
head/print/tex/files/patch-ad
head/print/tex/files/patch-ae
head/print/tex/files/patch-af
head/print/transfig/files/patch-ac
head/print/transfig/files/patch-ba
head/print/xmbibtex/files/patch-aa
Modified:
head/polish/libtlen/Makefile
head/print/freetype2/Makefile
head/print/hp2xx/Makefile
head/print/html2latex/Makefile
head/print/pcal/Makefile
head/print/pcal/pkg-plist
head/print/pic2fig/Makefile
Copied: head/palm/imgvtopgm/files/patch-configure (from r363316, head/palm/imgvtopgm/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/palm/imgvtopgm/files/patch-configure Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/palm/imgvtopgm/files/patch-aa)
@@ -0,0 +1,120 @@
+--- 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
+
+- PNM_LIBS=""
+ if test "$pnm_libraries" != "" \
+ && test "$pnm_libraries" != "$x_libraries" \
+ && test "$pnm_libraries" != "no"; then
+- PNM_LIBS="-L$pnm_libraries"
++ X_LIBS="-L$pnm_libraries"
+ 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
Copied: head/palm/pilot_makedoc/files/patch-makedoc7.cpp (from r363316, head/palm/pilot_makedoc/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/palm/pilot_makedoc/files/patch-makedoc7.cpp Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/palm/pilot_makedoc/files/patch-aa)
@@ -0,0 +1,18 @@
+--- makedoc7.cpp.orig Wed Mar 13 21:37:41 2002
++++ makedoc7.cpp Wed Mar 13 21:39:39 2002
+@@ -589,7 +589,7 @@
+ printf("\n -n builds the .prc file without compression");
+ printf("\n -b option compresses/decompresses binary");
+ #if UNIX
+- printf("\n");
++ printf("\n\n");
+ #endif
+ exit(1);
+ }
+@@ -746,5 +746,6 @@
+ fclose(fin);
+ fclose(fout);
+ }
++ printf("\n");
+ exit(0);
+ }
Modified: head/polish/libtlen/Makefile
==============================================================================
--- head/polish/libtlen/Makefile Tue Jul 29 13:43:43 2014 (r363321)
+++ head/polish/libtlen/Makefile Tue Jul 29 14:02:16 2014 (r363322)
@@ -14,14 +14,10 @@ USE_LDCONFIG= yes
OPTIONS_DEFINE= DOCS
-.include <bsd.port.options.mk>
-
post-install:
-.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for f in libtlen.html libtlen.css AUTHORS TODO
@${INSTALL_DATA} ${WRKSRC}/docs/${f} ${STAGEDIR}${DOCSDIR}
.endfor
-.endif
.include <bsd.port.mk>
Copied: head/polish/libtlen/files/patch-lib_Makefile.in (from r363316, head/polish/libtlen/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/polish/libtlen/files/patch-lib_Makefile.in Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/polish/libtlen/files/patch-aa)
@@ -0,0 +1,38 @@
+--- lib/Makefile.in.orig Mon Sep 26 14:46:55 2003
++++ lib/Makefile.in Mon Sep 26 14:54:07 2003
+@@ -10,7 +10,7 @@
+ # incerased with ABI changes
+ VERSION_MAJOR=1
+ # incerased with API changes
+-VERSION_MINOR=5
++#VERSION_MINOR=5
+
+ CC = @CC@
+ CFLAGS = @CFLAGS_LIBTLEN@ -I.. -fPIC -Wall -ggdb
+@@ -27,7 +27,7 @@
+
+ SHAREDMM = libtlen.so
+ SHAREDM = $(SHAREDMM).$(VERSION_MAJOR)
+-SHARED = $(SHAREDM).$(VERSION_MINOR)
++SHARED = $(SHAREDMM).$(VERSION_MAJOR)
+ STATIC = libtlen.a
+
+ HEADERS = *.h
+@@ -54,7 +54,7 @@
+
+ $(SHARED): $(OBJS)
+ $(CC) -g -O2 -shared -Wl,-soname,libtlen.so.$(VERSION_MAJOR) -o $(SHARED) $(OBJS) $(LIBS) -lc
+- $(LN_S) -f $(SHARED) $(SHAREDM)
++# $(LN_S) -f $(SHARED) $(SHAREDM)
+ $(LN_S) -f $(SHARED) $(SHAREDMM)
+
+ install: install-shared install-static install-devel
+@@ -62,7 +62,7 @@
+ install-shared:
+ $(INSTALL) -d $(DESTDIR)$(libdir)
+ $(INSTALL) -m 755 $(SHARED) $(DESTDIR)$(libdir)
+- cd $(DESTDIR)$(libdir) && $(LN_S) -f $(SHARED) $(SHAREDM)
++# cd $(DESTDIR)$(libdir) && $(LN_S) -f $(SHARED) $(SHAREDM)
+ cd $(DESTDIR)$(libdir) && $(LN_S) -f $(SHARED) $(SHAREDMM)
+
+ install-static:
Copied: head/print/asprint/files/patch-asprint.c (from r363316, head/print/asprint/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/asprint/files/patch-asprint.c Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/asprint/files/patch-ab)
@@ -0,0 +1,10 @@
+--- asprint.c~ Tue Mar 11 22:52:39 1997
++++ asprint.c Sat Aug 16 20:00:57 1997
+@@ -19,6 +19,7 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <sys/stat.h>
++#include <limits.h>
+ #include <dirent.h>
+ #include <unistd.h>
+
Copied: head/print/asprint/files/patch-makefile (from r363316, head/print/asprint/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/asprint/files/patch-makefile Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/asprint/files/patch-aa)
@@ -0,0 +1,30 @@
+--- makefile.orig Fri Mar 14 19:34:48 1997
++++ makefile Wed Jun 21 02:59:31 2000
+@@ -1,18 +1,17 @@
+ .KEEP_STATE:
+
+-CFLAGS = -O2
+-CC = gcc
+-XLIB = -L/usr/X11/lib -lXaw3d -lXmu -lXt
+-
++CFLAGS ?= -O2
++CC ?= gcc
++XLIB = -L$(LOCALBASE)/lib -lXaw -lXmu -lXt
++XLIB+= -Wl,-rpath,$(LOCALBASE)/lib
+ OBJS = asprint.o
+-INCS =
+-
+-default : asprint ./makefile
+-clean:
+- rm -f $(OBJS) *~ asprint core
++INCS = -I$(LOCALBASE)/include
+
+ asprint: $(OBJS)
+ $(CC) -o asprint $(CFLAGS) $(OBJS) $(XLIB)
+
++clean:
++ rm -f $(OBJS) *~ asprint core
++
+ .c.o:
+- $(CC) $(CFLAGS) -c $<
++ $(CC) $(CFLAGS) -c $(INCS) $<
Copied: head/print/bibview/files/patch-ComboBo.h (from r363316, head/print/bibview/files/patch-ah)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/bibview/files/patch-ComboBo.h Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/bibview/files/patch-ah)
@@ -0,0 +1,12 @@
+--- ComboBo.h.orig Thu Nov 25 08:11:05 1993
++++ ComboBo.h Tue Sep 23 20:03:24 1997
+@@ -23,7 +23,9 @@
+
+ #define XtNselectCallback "selectCallback"
+ #define XtNselectMenu "selectMenu"
++#ifndef XtNcancelCallback
+ #define XtNcancelCallback "cancelCallback"
++#endif
+ #define XtNmargin "margin"
+ #define XtNnumberRows "numberRows"
+ #define XtNshowDotFiles "showDotFiles"
Copied: head/print/bibview/files/patch-FileNom.c (from r363316, head/print/bibview/files/patch-ac)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/bibview/files/patch-FileNom.c Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/bibview/files/patch-ac)
@@ -0,0 +1,37 @@
+--- FileNom.c.orig Thu May 4 18:15:11 1995
++++ FileNom.c Thu Sep 11 13:08:28 1997
+@@ -822,20 +822,20 @@
+ Dimension height, internalHeight, rowSpacing;
+ int num, newNum, idx;
+ struct dirent **namelist;
+- #ifndef HAVE_DIR
++#ifndef HAVE_DIR
+ DIR *dirp;
+ struct dirent *direntp;
+ int direntp_size;
+- #else
++#else
+ extern int alphasort();
+- #endif
++#endif
+ char buf[MAXPATHLEN], *bp;
+ String name;
+ struct stat fstats;
+ unsigned int namlen;
+- #ifdef HAVE_DIR
++#ifdef HAVE_DIR
+ num = scandir(CurrentDir(fnw), &namelist, (int(*)())0, alphasort);
+- #else
++#else
+ /* Read the directory `CurrentDir(fnw)'
+ and set the `dirent's in `namelist'. */
+ dirp = opendir( CurrentDir(fnw) );
+@@ -860,7 +860,7 @@
+
+ /* Sort the directory entries in `namelist'. */
+ qsort( namelist, num, sizeof(struct dirent*), direntpcmp );
+- #endif
++#endif
+
+ if (num <= 0)
+ {
Copied: head/print/bibview/files/patch-FileNom.h (from r363316, head/print/bibview/files/patch-ag)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/bibview/files/patch-FileNom.h Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/bibview/files/patch-ag)
@@ -0,0 +1,12 @@
+--- FileNom.h.orig Thu Nov 25 08:11:06 1993
++++ FileNom.h Tue Sep 23 20:03:16 1997
+@@ -52,7 +52,9 @@
+
+ #define XtNselectCallback "selectCallback"
+ #define XtNselectMenu "selectMenu"
++#ifndef XtNcancelCallback
+ #define XtNcancelCallback "cancelCallback"
++#endif
+ #define XtNmargin "margin"
+ #define XtNnumberRows "numberRows"
+ #define XtNshowDotFiles "showDotFiles"
Copied: head/print/bibview/files/patch-Imakefile (from r363316, head/print/bibview/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/bibview/files/patch-Imakefile Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/bibview/files/patch-aa)
@@ -0,0 +1,20 @@
+--- Imakefile.orig Mon Feb 27 08:41:19 1995
++++ Imakefile Sun Apr 19 13:51:51 1998
+@@ -9,7 +9,7 @@
+
+
+ /* nothing needs to be modified below this point */
+-CFLAGS = $(STD_CPP_DEFINES)
++/* CFLAGS = $(STD_CPP_DEFINES) */
+ #ifdef NeXTArchitecture
+
+ SYS_LIBRARIES = XawClientLibs -lm -lsys_s
+@@ -33,7 +33,7 @@
+
+ #else /* Others */ /* END SGIArchitecture */
+
+-CC = gcc -fstrength-reduce -fpcc-struct-return
++/* CC = gcc -fstrength-reduce -fpcc-struct-return */
+
+ #endif
+ #endif
Copied: head/print/bibview/files/patch-bibview.c (from r363316, head/print/bibview/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/bibview/files/patch-bibview.c Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/bibview/files/patch-ab)
@@ -0,0 +1,32 @@
+--- bibview.c.orig Fri Apr 21 10:49:15 1995
++++ bibview.c Sun Apr 19 07:33:25 1998
+@@ -170,9 +170,9 @@
+ /* fallback resources */
+ static char *fallback_resources[] = {
+ #ifdef GERMAN
+- #include "fb_ger.h"
++#include "fb_ger.h"
+ #else
+- #include "fb_res.h"
++#include "fb_res.h"
+ #endif
+ NULL
+ };
+@@ -824,7 +824,7 @@
+
+ /* install signal handler */
+ for (i = 1; i<= 15; i++)
+- signal(i, signalHandler);
++ signal(i, (sig_t)signalHandler);
+
+ /* install Xtoolkit handlers */
+ XtSetWarningHandler((XtErrorHandler)Xt_warningHandler);
+@@ -891,7 +891,7 @@
+ static void
+ signalHandler (int s, int code)
+ {
+- signal(s, signalHandler);
++ signal(s, (sig_t)signalHandler);
+ }
+
+
Copied: head/print/bibview/files/patch-ctl_card.c (from r363316, head/print/bibview/files/patch-af)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/bibview/files/patch-ctl_card.c Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/bibview/files/patch-af)
@@ -0,0 +1,22 @@
+--- ctl_card.c.orig Mon May 8 18:25:53 1995
++++ ctl_card.c Thu Sep 11 13:08:32 1997
+@@ -659,15 +659,15 @@
+ sprintf(aw->shellName, "%s: NEW", glbFldToName(nannote));
+ else
+ sprintf(aw->shellName, "%s: %s", glbFldToName(nannote), cp->cd->mainkey);
+- #ifdef ACTION_PROBLEM
++#ifdef ACTION_PROBLEM
+ if (first_in){
+- #endif
++#endif
+ XtAppAddActions(XtWidgetToApplicationContext(topLevel), annote_actions,
+ XtNumber(annote_actions));
+- #ifdef ACTION_PROBLEM
++#ifdef ACTION_PROBLEM
+ first_in = 0;
+ }
+- #endif
++#endif
+ aw->annoteShell = XtVaCreatePopupShell("AnnoteShell",
+ topLevelShellWidgetClass, topLevel,
+ XtNtitle, aw->shellName,
Copied: head/print/bibview/files/patch-gui_card.c (from r363316, head/print/bibview/files/patch-ae)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/bibview/files/patch-gui_card.c Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/bibview/files/patch-ae)
@@ -0,0 +1,22 @@
+--- gui_card.c.orig Mon May 8 18:24:55 1995
++++ gui_card.c Thu Sep 11 13:08:31 1997
+@@ -370,15 +370,15 @@
+ CardWidgetsPtr cwp;
+ Dimension height;
+
+- #ifdef ACTION_PROBLEM
++#ifdef ACTION_PROBLEM
+ if (first_in){
+- #endif
++#endif
+ XtAppAddActions(XtWidgetToApplicationContext(topLevel), actions,
+ XtNumber(actions));
+- #ifdef ACTION_PROBLEM
++#ifdef ACTION_PROBLEM
+ first_in = 0;
+ }
+- #endif
++#endif
+ reqback = options.reqColor;
+ auth_ed_back = options.authedColor;
+
Copied: head/print/bibview/files/patch-gui_widg.c (from r363316, head/print/bibview/files/patch-ad)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/bibview/files/patch-gui_widg.c Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/bibview/files/patch-ad)
@@ -0,0 +1,18 @@
+--- gui_widg.c.orig Thu Nov 25 14:11:15 1993
++++ gui_widg.c Thu Sep 11 13:08:30 1997
+@@ -330,12 +330,12 @@
+ XtNfromHoriz, warnIcon, NULL);
+ sprintf(textLabel, "msgText%d", abs((int)errcode));
+ if (errcode >= 200){
+- #ifdef GERMAN
++#ifdef GERMAN
+ sprintf(warnLabel, "Karte unvollstaendig: kein %s",
+ glbFldToName(errcode-200));
+- #else
++#else
+ sprintf(warnLabel, "Card incomplete: no %s", glbFldToName(errcode-200));
+- #endif
++#endif
+ warnText = XtVaCreateManagedWidget(textLabel,
+ labelWidgetClass, warnForm,
+ XtNjustify, XtJustifyLeft,
Copied: head/print/dviselect/files/patch-dviselect.c (from r363316, head/print/dviselect/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/dviselect/files/patch-dviselect.c Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/dviselect/files/patch-aa)
@@ -0,0 +1,44 @@
+--- dviselect.c.orig 1989-11-15 13:19:15.000000000 +0100
++++ dviselect.c 2012-11-30 14:56:42.000000000 +0100
+@@ -122,7 +122,6 @@
+ /* save some string space: we use this a lot */
+ char writeerr[] = "error writing DVI file";
+
+-char *malloc(), *realloc(), *sprintf();
+
+ /*
+ * lint gets rather confused with the current definitions of getc and putc,
+@@ -136,6 +135,9 @@
+ #define getc(f) (*(f)->_ptr++)
+ #endif
+
++void HandleDVIFile (void);
++void EndPage (void);
++
+ /*
+ * Return true iff the 10 \counts are one of the desired output pages.
+ */
+@@ -190,6 +192,7 @@
+ /*
+ * Start a page (process a DVI_BOP).
+ */
++void
+ BeginPage()
+ {
+ register i32 *i;
+@@ -243,6 +246,7 @@
+ /*
+ * End a page (process a DVI_EOP).
+ */
++void
+ EndPage()
+ {
+ if (!ExpectEOP)
+@@ -815,6 +819,7 @@
+ * output DVI file. We also keep track of font changes, handle font
+ * definitions, and perform some other housekeeping.
+ */
++void
+ HandleDVIFile()
+ {
+ register int c, l;
Copied: head/print/dviselect/files/patch-lib_Makefile (from r363316, head/print/dviselect/files/patch-lib::Makefile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/dviselect/files/patch-lib_Makefile Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/dviselect/files/patch-lib::Makefile)
@@ -0,0 +1,14 @@
+--- lib/Makefile.orig Wed Nov 15 13:19:54 1989
++++ lib/Makefile Wed Dec 13 23:00:00 2006
+@@ -10,9 +10,8 @@
+ DESTDIR=
+ # Alas, -R makes ALL initialised variables read-only, and we cannot
+ # use it on font files; hence, FCFLAGS.
+-CC=cc
+-CFLAGS= -O -I../h
+-FCFLAGS=-O -I../h
++CFLAGS+= -I../h
++FCFLAGS+= -I../h
+
+ # 4.1BSD Vax:
+ #ASSRC= bcopy.s bzero.s
Copied: head/print/dviselect/files/patch-lib_error.c (from r363316, head/print/dviselect/files/patch-lib::error.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/dviselect/files/patch-lib_error.c Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/dviselect/files/patch-lib::error.c)
@@ -0,0 +1,53 @@
+--- lib/error.c.orig Wed Nov 15 04:19:40 1989
++++ lib/error.c Wed Oct 15 06:38:57 2003
+@@ -18,7 +18,8 @@
+ */
+
+ #include <stdio.h>
+-#include <varargs.h>
++#include <stdarg.h>
++#include <errno.h>
+
+ #ifdef lint
+
+@@ -31,20 +32,15 @@
+ #else lint
+
+ extern char *ProgName;
+-extern int errno;
+-extern char *sys_errlist[];
+-extern int sys_nerr;
+
+-error(va_alist)
+- va_dcl
++error(char *fmt,...)
+ {
+ va_list l;
+ int quit, e;
+- char *fmt;
+
+ (void) fflush(stdout); /* sync error messages */
+ (void) fprintf(stderr, "%s: ", ProgName);
+- va_start(l);
++ va_start(l,fmt);
+ /* pick up the constant arguments: quit, errno, printf format */
+ quit = va_arg(l, int);
+ e = va_arg(l, int);
+@@ -69,15 +65,13 @@
+ exit(quit);
+ }
+
+-panic(va_alist)
+- va_dcl
++panic(char *fmt,...)
+ {
+ va_list l;
+- char *fmt;
+
+ (void) fflush(stdout);
+ (void) fprintf(stderr, "%s: panic: ", ProgName);
+- va_start(l);
++ va_start(l,fmt);
+ /* pick up the constant argument: printf format */
+ fmt = va_arg(l, char *);
+ #if defined(sys5) || defined(HAVE_VPRINTF)
Copied: head/print/dviselect/files/patch-lib_font.c (from r363316, head/print/dviselect/files/patch-ac)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/dviselect/files/patch-lib_font.c Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/dviselect/files/patch-ac)
@@ -0,0 +1,12 @@
+--- lib/font.c~ Wed Nov 15 13:19:43 1989
++++ lib/font.c Mon Jul 3 00:39:32 2000
+@@ -67,9 +67,6 @@
+ */
+ extern int errno;
+ char *getenv(), *malloc(), *strsave();
+-#ifndef sys5
+-char *sprintf();
+-#endif
+
+ static readconf();
+ static setfont();
Copied: head/print/dviselect/files/patch-lib_pkfont.c (from r363316, head/print/dviselect/files/patch-lib::pkfont.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/dviselect/files/patch-lib_pkfont.c Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/dviselect/files/patch-lib::pkfont.c)
@@ -0,0 +1,22 @@
+--- lib/pkfont.c.orig 1989-11-15 13:19:52.000000000 +0100
++++ lib/pkfont.c 2012-11-30 14:59:23.000000000 +0100
+@@ -183,7 +183,7 @@
+ /*
+ * Skip over special commands (PK_XXX?, PK_YYY).
+ */
+-static
++static void
+ skip_specials(f)
+ struct font *f;
+ {
+@@ -781,8 +781,8 @@
+ if (pk != NULL) {
+ free(pk->pk_base); pk -> pk_base = 0;
+ if (pk->pk_morec != NULL) {
+- free((char *) pk->pk_morec); (char *) pk->pk_morec = 0;
++ free((char *) pk->pk_morec); pk->pk_morec = 0;
+ }
+- free((char *) pk); (char *) pk = 0;
++ free((char *) pk); pk = 0;
+ }
+ }
Copied: head/print/dviselect/files/patch-lib_pxlfont.c (from r363316, head/print/dviselect/files/patch-lib::pxlfont.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/dviselect/files/patch-lib_pxlfont.c Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/dviselect/files/patch-lib::pxlfont.c)
@@ -0,0 +1,28 @@
+--- lib/pxlfont.c~ Wed Nov 15 13:19:53 1989
++++ lib/pxlfont.c Wed Dec 13 23:03:21 2006
+@@ -156,7 +156,7 @@
+ if (pd->pd_ras) {
+ free(pd->pd_ras); pd->pd_ras = 0;
+ }
+- free((char *) pd); (char *) pd = 0;
++ free((char *) pd); pd = 0;
+ }
+ if (fp)
+ (void) fclose(fp);
+@@ -286,7 +286,7 @@
+ pd->pd_nconv += h - l;
+ if (pd->pd_nconv == 128) {
+ free(pd->pd_ras); pd->pd_ras = 0;
+- free((char *) pd); (char *) pd = 0;
++ free((char *) pd); pd = 0;
+ f->f_details = NULL;
+ }
+ return (0);
+@@ -305,6 +305,6 @@
+ if (pd->pd_ras != NULL) {
+ free(pd->pd_ras); pd->pd_ras = 0;
+ }
+- free((char *) pd); (char *) pd = 0;
++ free((char *) pd); pd = 0;
+ }
+ }
Copied: head/print/dviselect/files/patch-lib_rotate.c (from r363316, head/print/dviselect/files/patch-lib::rotate.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/dviselect/files/patch-lib_rotate.c Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/dviselect/files/patch-lib::rotate.c)
@@ -0,0 +1,10 @@
+--- lib/rotate.c.orig 2012-11-30 14:57:39.000000000 +0100
++++ lib/rotate.c 2012-11-30 14:58:50.000000000 +0100
+@@ -31,6 +31,7 @@
+ /*
+ * Set the rotation of glyph g to r.
+ */
++void
+ SetRotation(g, r)
+ register struct glyph *g;
+ int r;
Copied: head/print/dviselect/files/patch-lib_search.c (from r363316, head/print/dviselect/files/patch-lib::search.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/dviselect/files/patch-lib_search.c Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/dviselect/files/patch-lib::search.c)
@@ -0,0 +1,11 @@
+--- lib/search.c~ Wed Nov 15 13:19:58 1989
++++ lib/search.c Wed Dec 13 22:53:51 2006
+@@ -72,7 +72,7 @@
+ s->s_space = 10; /* initially, room for 10 objects */
+ s->s_n = 0; /* and none in the table */
+ if ((s->s_data = malloc(s->s_space * dsize)) == 0) {
+- free((char *) s); (char *) s = 0;
++ free((char *) s); s = 0;
+ return (0);
+ }
+ return (s);
Copied: head/print/dviselect/files/patch-lib_seek.c (from r363316, head/print/dviselect/files/patch-ad)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/dviselect/files/patch-lib_seek.c Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/dviselect/files/patch-ad)
@@ -0,0 +1,10 @@
+--- lib/seek.c~ Wed Nov 15 13:19:59 1989
++++ lib/seek.c Tue Aug 19 18:46:13 1997
+@@ -25,7 +25,6 @@
+ #include <sys/file.h>
+ #include <sys/stat.h>
+
+-long lseek();
+ char *getenv();
+
+ int
Copied: head/print/dviselect/files/patch-lib_tfm.c (from r363316, head/print/dviselect/files/patch-lib::tfm.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/dviselect/files/patch-lib_tfm.c Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/dviselect/files/patch-lib::tfm.c)
@@ -0,0 +1,23 @@
+--- lib/tfm.c~ Wed Nov 15 13:20:02 1989
++++ lib/tfm.c Wed Dec 13 22:56:44 2006
+@@ -63,16 +63,16 @@
+
+ bad:
+ if (t->t_ci != NULL) {
+- free((char *) t->t_ci); (char *) t->t_ci = 0;
++ free((char *) t->t_ci); t->t_ci = 0;
+ }
+ if (t->t_width != NULL) {
+- free((char *) t->t_width); (char *) t->t_width = 0;
++ free((char *) t->t_width); t->t_width = 0;
+ }
+ if (t->t_height != NULL) {
+- free((char *) t->t_height); (char *) t->t_height = 0;
++ free((char *) t->t_height); t->t_height = 0;
+ }
+ if (t->t_depth != NULL) {
+- free((char *) t->t_depth); (char *) t->t_depth = 0;
++ free((char *) t->t_depth); t->t_depth = 0;
+ }
+ return (-1);
+ }
Copied: head/print/dviselect/files/patch-lib_tfmfont.c (from r363316, head/print/dviselect/files/patch-lib::tfmfont.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/dviselect/files/patch-lib_tfmfont.c Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/dviselect/files/patch-lib::tfmfont.c)
@@ -0,0 +1,20 @@
+--- lib/tfmfont.c.orig 1989-11-15 13:20:03.000000000 +0100
++++ lib/tfmfont.c 2012-11-30 15:00:41.000000000 +0100
+@@ -139,7 +139,7 @@
+ fail:
+ (void) fclose(fd);
+ if (tfm != NULL) {
+- free((char *) tfm); (char *) tfm = 0;
++ free((char *) tfm); tfm = 0;
+ }
+ return (-1);
+ }
+@@ -199,7 +199,7 @@
+ #define EDGE 2
+
+ if (tfm->tfm_edge == 0)
+- return;
++ return (-1);
+ if (tfm->tfm_edge != 2) panic("tfm_rasterise");
+ for (i = l; i < h; i++) {
+ g = f->f_gly[i];
Modified: head/print/freetype2/Makefile
==============================================================================
--- head/print/freetype2/Makefile Tue Jul 29 13:43:43 2014 (r363321)
+++ head/print/freetype2/Makefile Tue Jul 29 14:02:16 2014 (r363322)
@@ -29,17 +29,10 @@ OPTIONS_DEFINE= LCD_FILTERING PNG
LCD_FILTERING_DESC?= Sub-pixel rendering (patented)
PNG_DESC= Png compressed OpenType embedded bitmaps support
-.include <bsd.port.options.mk>
+LCD_FILTERING_CFLAGS= -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
-.if ${PORT_OPTIONS:MLCD_FILTERING}
-CFLAGS+= -DFT_CONFIG_OPTION_SUBPIXEL_RENDERING
-.endif
-
-.if ${PORT_OPTIONS:MPNG}
-LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png
-.else
-CONFIGURE_ARGS+=--without-png
-.endif
+PNG_LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png
+PNG_CONFIGURE_OFF= --without-png
pre-patch:
@${REINPLACE_CMD} -e 's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
Copied: head/print/freetype2/files/patch-builds_unix_detect.mk (from r363316, head/print/freetype2/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/freetype2/files/patch-builds_unix_detect.mk Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/freetype2/files/patch-aa)
@@ -0,0 +1,24 @@
+--- builds/unix/detect.mk.orig 2013-03-21 13:55:46.000000000 -0500
++++ builds/unix/detect.mk 2013-05-12 17:58:34.000000000 -0500
+@@ -22,6 +22,9 @@
+ $(wildcard /usr/sbin/init) \
+ $(wildcard /dev/null) \
+ $(wildcard /hurd/auth))
++ # FreeBSD is "unix" so just mandate this to fix the build in
++ # jails that do not have init (see PR#113470).
++ is_unix := true
+ ifneq ($(is_unix),)
+
+ PLATFORM := unix
+@@ -81,9 +84,9 @@
+ ifdef must_configure
+ ifneq ($(have_Makefile),)
+ # we are building FT2 not in the src tree
+- $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
++ # $(CONFIG_SHELL) $(TOP_DIR)/builds/unix/configure $(value CFG)
+ else
+- cd builds/unix; $(CONFIG_SHELL) ./configure $(value CFG)
++ # cd builds/unix; $(CONFIG_SHELL) ./configure $(value CFG)
+ endif
+ endif
+
Modified: head/print/hp2xx/Makefile
==============================================================================
--- head/print/hp2xx/Makefile Tue Jul 29 13:43:43 2014 (r363321)
+++ head/print/hp2xx/Makefile Tue Jul 29 14:02:16 2014 (r363322)
@@ -17,8 +17,7 @@ LIB_DEPENDS= libpng15.so:${PORTSDIR}/gra
WRKSRC= ${WRKDIR}/${DISTNAME}/sources
USES= makeinfo
-MAKE_ENV= DEFINES="${CPPFLAGS}" ALL_LIBS="${LDFLAGS}" \
- PREVIEWER="${PREVIEWER}"
+MAKE_ENV= DEFINES="${CPPFLAGS}" ALL_LIBS="${LDFLAGS}"
PLIST_FILES= bin/hp2xx man/man1/hp2xx.1.gz
INFO= hp2xx
@@ -32,14 +31,8 @@ OPTIONS_DEFAULT=X11
X11_USE= XORG=x11
X11_CPPFLAGS= -DHAS_UNIX_X11 -I${LOCALBASE}/include
X11_LDFLAGS= -L${LOCALBASE}/lib -lX11
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MX11}
-PREVIEWER= to_x11
-.else
-PREVIEWER= no_prev
-.endif
+X11_MAKE_ENV= PREVIEWER=to_x11
+X11_MAKE_ENV_OFF= PREVIEWER=no_prev
post-patch:
@${REINPLACE_CMD} -E 's,(bin|info|man1)dir),DESTDIR)$$(&,' \
Copied: head/print/hp2xx/files/patch-Makefile (from r363316, head/print/hp2xx/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/hp2xx/files/patch-Makefile Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/hp2xx/files/patch-aa)
@@ -0,0 +1,100 @@
+--- Makefile.orig Sun Jun 22 00:16:34 2003
++++ Makefile Tue Jun 24 07:53:46 2003
+@@ -35,7 +35,7 @@
+
+ # Installation sites (GNU conventions):
+ #
+-prefix = /usr/local
++prefix = ${PREFIX}
+ bindir = $(prefix)/bin
+ includedir = $(prefix)/include
+ mandir = $(prefix)/man
+@@ -45,14 +45,14 @@
+ # CC and CFLAGS set for gcc, but any ANSI-C compiler should work.
+ # For non-gcc compilers, simply set CFLAGS = -O (to start with)
+ #
+-CC = gcc
+-CFLAGS = -O2 -g -I/usr/X11R6/include $(DEFINES) $(EX_DEFS) -Wall -pedantic -Wuninitialized -Wunused -Wreturn-type -Wmissing-prototypes -Wstrict-prototypes
++#CC = gcc
++#CFLAGS = -O2 -g -I/usr/X11R6/include $(DEFINES) $(EX_DEFS) -Wall -pedantic -Wuninitialized -Wunused -Wreturn-type -Wmissing-prototypes -Wstrict-prototypes
+ LINT = splint
+ LINTFLAGS = -weak -initallelements +posixlib -I/usr/X11R6/include $(DEFINES) $(EX_DEFS)
+
+ #CFLAGS = +O1 -Aa -D_HPUX_SOURCE -DSYSV -I/usr/include/X11R5 -I/usr/include/X11R4 $(DEFINES) $(EX_DEFS)
+
+-LFLAGS = -L/usr/X11R6/lib # only sometimes needed; see below for examples
++#LFLAGS = -L/usr/X11R6/lib # only sometimes needed; see below for examples
+ CPPFLAGS = -I. # only sometimes needed; see below for examples
+ BINDCMD = # only needed for EMX and DJGPP DOS extenders
+
+@@ -65,9 +65,9 @@
+ #
+ # Generic UNIX + X11 previewer (default)
+ #
+-DEFINES = -DUNIX -DHAS_UNIX_X11
+-PREVIEWER = to_x11
+-ALL_LIBS = -L/usr/lib/X11R6 -lX11 -lm
++#DEFINES = -DUNIX -DHAS_UNIX_X11
++#PREVIEWER = to_x11
++#ALL_LIBS = -L/usr/lib/X11R6 -lX11 -lm
+ #
+ # for experimental truetype font support
+ #
+@@ -230,13 +230,13 @@
+
+ # $(SRCS) NOT USED YET:
+ SRCS = clip.c fillpoly.c\
+- hp2xx.c hpgl.c picbuf.c bresnham.c murphy.c chardraw.c getopt.c getopt1.c \
++ hp2xx.c hpgl.c picbuf.c bresnham.c murphy.c chardraw.c \
+ $(ALL_INCS)\
+ to_vec.c to_pcx.c to_pcl.c to_eps.c to_img.c to_pbm.c \
+ to_rgip.c to_fig.c std_main.c $(PREVIEWER).c pendef.c lindef.c $(EX_SRC)
+
+ OBJS = clip.o fillpoly.o\
+- hp2xx.o hpgl.o picbuf.o bresnham.o murphy.o chardraw.o getopt.o getopt1.o \
++ hp2xx.o hpgl.o picbuf.o bresnham.o murphy.o chardraw.o \
+ to_vec.o to_pcx.o to_pcl.o to_eps.o to_img.o to_pbm.o \
+ to_rgip.o to_fig.o std_main.o $(PREVIEWER).o pendef.o lindef.o $(EX_OBJ)
+
+@@ -244,7 +244,8 @@
+
+ $(PROGRAM): $(OBJS)
+ $(CC) $(LFLAGS) $(OBJS) $(ALL_LIBS) $(EX_LIBS) -o $(PROGRAM)
+- $(BINDCMD)
++
++all: $(PROGRAM) hp2xx.info
+
+ default:
+ @echo "This makefile needs manual configuration! Edit it now!
+@@ -268,9 +269,9 @@
+ # #
+ #########################################################################
+
+-# .c.o: $< $(COMMON_INCS)
+-# -$(RMCMD) $@
+-# $(CC) $(DEFINES) $(EX_DEFS) $(ALL_CFLAGS) $(CPPFLAGS) $<
++.c.o: $< $(COMMON_INCS)
++ -$(RMCMD) $@
++ $(CC) $(DEFINES) $(EX_DEFS) $(ALL_CFLAGS) $(CPPFLAGS) $<
+
+
+ #########################################################################
+@@ -330,15 +331,11 @@
+ install: install-bin install-info install-man
+
+ install-bin: $(PROGRAM)
+- -$(STRIP) $(PROGRAM)
+- -$(CP) $(PROGRAM) $(bindir)
+- -$(CHMOD) 755 $(bindir)/$(PROGRAM)
++ ${BSD_INSTALL_PROGRAM} $(PROGRAM) $(bindir)
+
+ install-info: hp2xx.info
+- -$(CP) hp2xx.info $(infodir)
+- -$(CHMOD) 644 $(infodir)/hp2xx.info
++ ${BSD_INSTALL_DATA} hp2xx.info $(infodir)
+
+ install-man: ../doc/hp2xx.1
+- -$(CP) ../doc/hp2xx.1 $(man1dir)
+- -$(CHMOD) 644 $(man1dir)/hp2xx.1
++ ${BSD_INSTALL_MAN} ../doc/hp2xx.1 $(man1dir)
+
Copied: head/print/hp2xx/files/patch-doc_hp2xxinf.tex (from r363316, head/print/hp2xx/files/patch-ab)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/hp2xx/files/patch-doc_hp2xxinf.tex Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/hp2xx/files/patch-ab)
@@ -0,0 +1,29 @@
+--- ../doc/hp2xxinf.tex.orig Sun Dec 30 20:18:00 2001
++++ ../doc/hp2xxinf.tex Wed Jan 30 20:01:28 2002
+@@ -5,6 +5,11 @@
+ @setfilename hp2xx.info
+ @settitle HP2XX, A HP-GL Converter
+ @setchapternewpage odd
++ at dircategory Miscellaneous
++ at direntry
++* HP2XX:(hp2xx). Conversion of HP-GL graphics into raster and
++ vector graphics formats
++ at end direntry
+ @c @smallbook
+ @c @cropmarks
+ @c %**end of header
+@@ -35,14 +40,6 @@
+ @c 00/09/20 V 1.2 MK fixed INFO-DIR-ENTRY, updates for 3.4.0
+ @c THIS MANUAL REQUIRES TEXINFO-2 macros and info-makers to format properly.
+
+- at ifinfo
+- at format
+-START-INFO-DIR-ENTRY
+-* HP2XX:(hp2xx). Conversion of HP-GL graphics into raster and
+- vector graphics formats
+-END-INFO-DIR-ENTRY
+- at end format
+- at end ifinfo
+ @c
+ @ifinfo
+ This file documents the HP-GL converter HP2XX
Modified: head/print/html2latex/Makefile
==============================================================================
--- head/print/html2latex/Makefile Tue Jul 29 13:43:43 2014 (r363321)
+++ head/print/html2latex/Makefile Tue Jul 29 14:02:16 2014 (r363322)
@@ -6,11 +6,11 @@ PORTVERSION= 0.9c
CATEGORIES= print
# I can't seem to find the original dist site
MASTER_SITES= ftp://ftp.interface-business.de/pub/outgoing/
-EXTRACT_SUFX= .tar.Z
MAINTAINER= joerg at FreeBSD.org
COMMENT= Convert HTML document into LaTeX
+USES= tar:Z
PLIST_FILES= bin/html2latex man/man1/html2latex.1.gz
.include <bsd.port.mk>
Copied: head/print/html2latex/files/patch-add-comment (from r363316, head/print/html2latex/files/patch-aa)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/print/html2latex/files/patch-add-comment Tue Jul 29 14:02:16 2014 (r363322, copy of r363316, head/print/html2latex/files/patch-aa)
@@ -0,0 +1,60 @@
+diff -u ../html2latex-0.9c.old/HTMLparse.c ./HTMLparse.c
+--- ../html2latex-0.9c.old/HTMLparse.c Fri Mar 19 04:52:24 1993
++++ ./HTMLparse.c Fri Mar 29 16:36:35 1996
+@@ -67,7 +67,8 @@
+ "title", "h1", "h2", "h3", "h4", "h5", "h6", "a", "p", "address",
+ "xmp", "ul", "li", "dl", "dt", "dd", "pre", "plaintext", "listing",
+ "isindex", "menu", "dir", "img", "ol", "em", "tt", "b", "i", "u",
+- "strong", "code", "samp", "kbd", "var", "dfn", "cite", "gnat"
++ "strong", "code", "samp", "kbd", "var", "dfn", "cite", "gnat",
++ "!"
+ };
+
+ /*
+@@ -454,7 +455,8 @@
+ {
+ if (*ptr == '<')
+ {
+- if (isalpha((int)(*(ptr + 1))))
++ if (isalpha((int)(*(ptr + 1))) ||
++ *(ptr + 1) == '!')
+ {
+ break;
+ }
+diff -u ../html2latex-0.9c.old/HTMLparse.h ./HTMLparse.h
+--- ../html2latex-0.9c.old/HTMLparse.h Fri Mar 19 04:43:34 1993
++++ ./HTMLparse.h Fri Mar 29 16:25:48 1996
+@@ -52,7 +52,7 @@
+ M_DESC_TITLE, M_DESC_TEXT, M_PREFORMAT, M_PLAIN_FILE, M_LISTING_TEXT,
+ M_INDEX, M_MENU, M_DIRECTORY, M_IMAGE, M_NUM_LIST, M_EM,
+ M_TT, M_B, M_I, M_U, M_STRONG, M_CODE, M_SAMP, M_KBD, M_VAR, M_DFN,
+- M_CITE, M_SENTINEL
++ M_CITE, M_SENTINEL, M_COMMENT
+ } mark_t;
+
+ /* amperstand escapes */
+diff -u ../html2latex-0.9c.old/html2latex.c ./html2latex.c
+--- ../html2latex-0.9c.old/html2latex.c Wed Jun 16 05:55:10 1993
++++ ./html2latex.c Fri Mar 29 16:41:17 1996
+@@ -9,7 +9,13 @@
+ #include "HTMLparse.h"
+ #include <stdio.h>
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list