Index: head/graphics/xfig/Makefile =================================================================== --- head/graphics/xfig/Makefile (revision 85463) +++ head/graphics/xfig/Makefile (revision 85464) @@ -1,49 +1,50 @@ # New ports collection makefile for: xfig # Date created: 4 January 1995 # Whom: roberto # # $FreeBSD$ # PORTNAME= xfig PORTVERSION= 3.2.4 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.xfig.org/xfigdist/ \ ftp://www-epb.lbl.gov/xfig/%SUBDIR%/ MASTER_SITE_SUBDIR= . previous_versions DISTNAME= ${PORTNAME}.${PORTVERSION}.full MAINTAINER= ports@FreeBSD.org COMMENT= A drawing program for X11 LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION} USE_REINPLACE= yes USE_IMAKE= yes USE_XPM= yes MAN1= xfig.1 .if !defined(NOPORTDOCS) INSTALL_TARGET= install install.all .endif pre-everything:: .if !defined(WITHOUT_GHOSTSCRIPT) @${ECHO_MSG} "To build this port without Ghostscript support," @${ECHO_MSG} "define \"WITHOUT_GHOSTSCRIPT\"." .endif post-extract: @${CP} ${WRKSRC}/Doc/xfig.man ${WRKSRC} post-patch: .if defined(WITHOUT_GHOSTSCRIPT) @${REINPLACE_CMD} -e 's|-DGSBIT ||g' ${WRKSRC}/Imakefile .endif .include Property changes on: head/graphics/xfig/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.50 \ No newline at end of property +1.51 \ No newline at end of property Index: head/graphics/xfig/files/patch-aa =================================================================== --- head/graphics/xfig/files/patch-aa (revision 85463) +++ head/graphics/xfig/files/patch-aa (revision 85464) @@ -1,100 +1,94 @@ ---- Imakefile.orig Fri Dec 20 02:57:11 2002 -+++ Imakefile Wed Jan 8 09:07:47 2003 +--- Imakefile.orig Thu Dec 19 18:57:11 2002 ++++ Imakefile Wed Jul 23 16:27:24 2003 @@ -48,8 +48,8 @@ XCOMM Redefine the following if your PNG library and/or include file XCOMM are in different places -PNGLIBDIR = $(USRLIBDIR) -PNGINC = -I/usr/local/include +PNGLIBDIR = ${LOCALBASE}/lib +PNGINC = -I${LOCALBASE}/include/libpng XCOMM If don't want JPEG support, comment out the #define USEJPEG line XCOMM Uncomment the #define for USEJPEG if you want to be able to import @@ -68,8 +68,8 @@ #ifdef USEJPEG #ifdef USEINSTALLEDJPEG -JPEGLIBDIR = /usr/local/lib -JPEGINC = -I/usr/include/X11 +JPEGLIBDIR = ${LOCALBASE}/lib +JPEGINC = -I${LOCALBASE}/include #else JPEGLIBDIR = ../jpeg JPEGINC = -I$(JPEGLIBDIR) -@@ -87,28 +87,28 @@ +@@ -87,12 +87,12 @@ XCOMM Change XPMLIBDIR if necessary to point to the xpm library (libXpm) XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h) -XCOMM #define USEXPM -XCOMM #define USEXPM_ICON +#define USEXPM +#define USEXPM_ICON #ifdef USEXPM XPMLIBDIR = $(USRLIBDIR) -XPMINC = -I/usr/include/X11 +XPMINC = -I$(INCDIR)/X11 #endif XCOMM Uncomment the following definiton if you want to use the small icons - XCOMM for the panel buttons. Use this if you have a 800x600 or smaller screen. - --XCOMM #define USESMALLICONS -+#define USESMALLICONS - - XCOMM Uncomment the following definition for XAW3D if you want to use - XCOMM the 3d Athena Widget Set (highly recommended!) +@@ -105,10 +105,10 @@ XCOMM Then be sure to change the XAW3DINC to point to the directory where your XCOMM 3D Athena widget headers are located -XCOMM #define XAW3D +#define XAW3D #ifdef XAW3D -XAW3DINC = -I/usr/include/X11/Xaw3d +XAW3DINC = -I$(INCDIR)/X11/Xaw3d DUSEXAW3D = -DXAW3D XAWLIB = -lXaw3d #endif @@ -154,7 +154,7 @@ XCOMM inline functions. With the "INLINE" keyword, you should notice that XCOMM the display will be a bit faster in complex figures -XCOMM USEINLINE = -DUSE_INLINE +USEINLINE = -DUSE_INLINE XCOMM use (and change) the following if you want the multi-key data base file XCOMM somewhere other than the standard X11 library directory @@ -166,7 +166,7 @@ XCOMM XFIGDOCDIR tells where the html and pdf documentation should go XCOMM XFIGDOCDIR = $(DOCDIR)/xfig -XFIGDOCDIR = /usr/share/doc/xfig +XFIGDOCDIR = $(LIBDIR)/xfig XCOMM MANDIR tells where the standard man pages should go (no need to change it XCOMM if you want the man pages installed in the standard place on your system @@ -234,7 +234,7 @@ #endif /* USEJPEG */ #ifdef I18N -I18N_DEFS = -DI18N -DSETLOCALE +I18N_DEFS = -DI18N #-DSETLOCALE I18N_SRC = w_i18n.c I18N_OBJ = w_i18n.o #endif @@ -251,11 +251,13 @@ $(HAVE_NO_STRCASECMP) \ $(NEED_STRERROR) +/* #ifdef InstallManPage #undef InstallManPage #endif #define InstallManPage(file,dest) @@\ InstallManPageLong(file,dest,file) +*/ #ifdef USESMALLICONS DUSESMALLICONS = -DUSE_SMALL_ICONS Property changes on: head/graphics/xfig/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.14 \ No newline at end of property +1.15 \ No newline at end of property Index: head/graphics/xfig-devel/Makefile =================================================================== --- head/graphics/xfig-devel/Makefile (revision 85463) +++ head/graphics/xfig-devel/Makefile (revision 85464) @@ -1,49 +1,50 @@ # New ports collection makefile for: xfig # Date created: 4 January 1995 # Whom: roberto # # $FreeBSD$ # PORTNAME= xfig PORTVERSION= 3.2.4 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.xfig.org/xfigdist/ \ ftp://www-epb.lbl.gov/xfig/%SUBDIR%/ MASTER_SITE_SUBDIR= . previous_versions DISTNAME= ${PORTNAME}.${PORTVERSION}.full MAINTAINER= ports@FreeBSD.org COMMENT= A drawing program for X11 LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig WRKSRC= ${WRKDIR}/${PORTNAME}.${PORTVERSION} USE_REINPLACE= yes USE_IMAKE= yes USE_XPM= yes MAN1= xfig.1 .if !defined(NOPORTDOCS) INSTALL_TARGET= install install.all .endif pre-everything:: .if !defined(WITHOUT_GHOSTSCRIPT) @${ECHO_MSG} "To build this port without Ghostscript support," @${ECHO_MSG} "define \"WITHOUT_GHOSTSCRIPT\"." .endif post-extract: @${CP} ${WRKSRC}/Doc/xfig.man ${WRKSRC} post-patch: .if defined(WITHOUT_GHOSTSCRIPT) @${REINPLACE_CMD} -e 's|-DGSBIT ||g' ${WRKSRC}/Imakefile .endif .include Property changes on: head/graphics/xfig-devel/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.50 \ No newline at end of property +1.51 \ No newline at end of property Index: head/graphics/xfig-devel/files/patch-aa =================================================================== --- head/graphics/xfig-devel/files/patch-aa (revision 85463) +++ head/graphics/xfig-devel/files/patch-aa (revision 85464) @@ -1,100 +1,94 @@ ---- Imakefile.orig Fri Dec 20 02:57:11 2002 -+++ Imakefile Wed Jan 8 09:07:47 2003 +--- Imakefile.orig Thu Dec 19 18:57:11 2002 ++++ Imakefile Wed Jul 23 16:27:24 2003 @@ -48,8 +48,8 @@ XCOMM Redefine the following if your PNG library and/or include file XCOMM are in different places -PNGLIBDIR = $(USRLIBDIR) -PNGINC = -I/usr/local/include +PNGLIBDIR = ${LOCALBASE}/lib +PNGINC = -I${LOCALBASE}/include/libpng XCOMM If don't want JPEG support, comment out the #define USEJPEG line XCOMM Uncomment the #define for USEJPEG if you want to be able to import @@ -68,8 +68,8 @@ #ifdef USEJPEG #ifdef USEINSTALLEDJPEG -JPEGLIBDIR = /usr/local/lib -JPEGINC = -I/usr/include/X11 +JPEGLIBDIR = ${LOCALBASE}/lib +JPEGINC = -I${LOCALBASE}/include #else JPEGLIBDIR = ../jpeg JPEGINC = -I$(JPEGLIBDIR) -@@ -87,28 +87,28 @@ +@@ -87,12 +87,12 @@ XCOMM Change XPMLIBDIR if necessary to point to the xpm library (libXpm) XCOMM Change XPMINC if necessary to point to the include file for xpm (xpm.h) -XCOMM #define USEXPM -XCOMM #define USEXPM_ICON +#define USEXPM +#define USEXPM_ICON #ifdef USEXPM XPMLIBDIR = $(USRLIBDIR) -XPMINC = -I/usr/include/X11 +XPMINC = -I$(INCDIR)/X11 #endif XCOMM Uncomment the following definiton if you want to use the small icons - XCOMM for the panel buttons. Use this if you have a 800x600 or smaller screen. - --XCOMM #define USESMALLICONS -+#define USESMALLICONS - - XCOMM Uncomment the following definition for XAW3D if you want to use - XCOMM the 3d Athena Widget Set (highly recommended!) +@@ -105,10 +105,10 @@ XCOMM Then be sure to change the XAW3DINC to point to the directory where your XCOMM 3D Athena widget headers are located -XCOMM #define XAW3D +#define XAW3D #ifdef XAW3D -XAW3DINC = -I/usr/include/X11/Xaw3d +XAW3DINC = -I$(INCDIR)/X11/Xaw3d DUSEXAW3D = -DXAW3D XAWLIB = -lXaw3d #endif @@ -154,7 +154,7 @@ XCOMM inline functions. With the "INLINE" keyword, you should notice that XCOMM the display will be a bit faster in complex figures -XCOMM USEINLINE = -DUSE_INLINE +USEINLINE = -DUSE_INLINE XCOMM use (and change) the following if you want the multi-key data base file XCOMM somewhere other than the standard X11 library directory @@ -166,7 +166,7 @@ XCOMM XFIGDOCDIR tells where the html and pdf documentation should go XCOMM XFIGDOCDIR = $(DOCDIR)/xfig -XFIGDOCDIR = /usr/share/doc/xfig +XFIGDOCDIR = $(LIBDIR)/xfig XCOMM MANDIR tells where the standard man pages should go (no need to change it XCOMM if you want the man pages installed in the standard place on your system @@ -234,7 +234,7 @@ #endif /* USEJPEG */ #ifdef I18N -I18N_DEFS = -DI18N -DSETLOCALE +I18N_DEFS = -DI18N #-DSETLOCALE I18N_SRC = w_i18n.c I18N_OBJ = w_i18n.o #endif @@ -251,11 +251,13 @@ $(HAVE_NO_STRCASECMP) \ $(NEED_STRERROR) +/* #ifdef InstallManPage #undef InstallManPage #endif #define InstallManPage(file,dest) @@\ InstallManPageLong(file,dest,file) +*/ #ifdef USESMALLICONS DUSESMALLICONS = -DUSE_SMALL_ICONS Property changes on: head/graphics/xfig-devel/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.14 \ No newline at end of property +1.15 \ No newline at end of property