[Midnightbsd-cvs] mports [23839] U trunk/graphics/xli/files: fix build

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sun Aug 26 14:28:40 EDT 2018 

Revision: 23839
          http://svnweb.midnightbsd.org/mports/?rev=23839
Author:   laffer1
Date:     2018-08-26 14:28:40 -0400 (Sun, 26 Aug 2018)
Log Message:
-----------
fix build

Modified Paths:
--------------
    trunk/graphics/xli/Makefile
    trunk/graphics/xli/files/patch-Imakefile

Property Changed:
----------------
    trunk/graphics/xli/files/patch-Imakefile
    trunk/graphics/xli/files/patch-png.c
    trunk/graphics/xli/files/patch-reduce.c
    trunk/graphics/xli/files/patch-rotate.c
    trunk/graphics/xli/files/patch-tga.c
    trunk/graphics/xli/files/patch-xli.c
    trunk/graphics/xli/files/patch-xli.h
    trunk/graphics/xli/files/patch-xpixmap.c
    trunk/graphics/xli/files/patch-zoom.c

Modified: trunk/graphics/xli/Makefile
===================================================================
--- trunk/graphics/xli/Makefile	2018-08-26 18:27:03 UTC (rev 23838)
+++ trunk/graphics/xli/Makefile	2018-08-26 18:28:40 UTC (rev 23839)
@@ -2,10 +2,9 @@
 
 PORTNAME=	xli
 PORTVERSION=	1.17.0
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	graphics
 MASTER_SITES=	DEBIAN
-MASTER_SITE_SUBDIR=	pool/main/x/${PORTNAME}
 DISTNAME=	xli_${PORTVERSION}+${XLI_SNAPVER:C/-//g}.orig
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -13,15 +12,13 @@
 
 LICENSE=	unknown 
 
-LIB_DEPENDS=	libpng.so:${PORTSDIR}/graphics/png \
-		libjpeg.so:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS=	libpng.so:graphics/png
 
 CONFLICTS_INSTALL=	xloadimage-*
 
 FAKE_MAKEARGS+=	DESTDIR=${FAKE_DESTDIR}
 USE_XORG=	xi
-USE_GCC=	any
-USES=		imake
+USES=		imake jpeg
 WRKSRC=		${WRKDIR}/xli-${XLI_SNAPVER}
 
 PLIST_FILES=	bin/xli bin/xlito bin/xview bin/xsetbg \

Modified: trunk/graphics/xli/files/patch-Imakefile
===================================================================
--- trunk/graphics/xli/files/patch-Imakefile	2018-08-26 18:27:03 UTC (rev 23838)
+++ trunk/graphics/xli/files/patch-Imakefile	2018-08-26 18:28:40 UTC (rev 23839)
@@ -1,6 +1,6 @@
---- ./Imakefile.orig	Mon Sep  5 01:01:30 2005
-+++ ./Imakefile	Sun Apr 29 00:59:16 2007
-@@ -13,8 +13,8 @@
+--- Imakefile.orig	2006-11-11 00:52:14.000000000 -0500
++++ Imakefile	2014-03-04 16:46:47.791670751 -0500
+@@ -13,17 +13,17 @@
        CCOPTIONS = -Aa -D_HPUX_SOURCE
  #endif
  
@@ -11,7 +11,9 @@
  
  PNG_INCLUDES = 
  PNG_LDFLAGS = 
-@@ -23,7 +23,7 @@
+ 
+-SYSPATHFILE = $(XAPPLOADDIR)/Xli
++SYSPATHFILE = $(DESTDIR)$(XAPPLOADDIR)/Xli
  DEPLIBS = $(DEPXLIB)
  LOCAL_LIBRARIES = $(XLIB) $(JPEG_LDFLAGS) $(PNG_LDFLAGS) -ljpeg -lpng -lz
  SYS_LIBRARIES = -lm
@@ -20,35 +22,24 @@
  EXTRA_INCLUDES = $(JPEG_INCLUDES) $(PNG_INCLUDES)
  
  SRCS1 = bright.c clip.c cmuwmrast.c compress.c dither.c faces.c fbm.c fill.c  g3.c gif.c halftone.c imagetypes.c img.c mac.c mcidas.c mc_tables.c merge.c misc.c new.c options.c path.c pbm.c pcx.c reduce.c jpeg.c rle.c rlelib.c root.c rotate.c send.c smooth.c sunraster.c  value.c window.c xbitmap.c xli.c xpixmap.c xwd.c zio.c zoom.c ddxli.c tga.c bmp.c pcd.c png.c
-@@ -36,21 +36,21 @@
- ComplexProgramTarget_1(xli,$(DEFINES) $(LOCAL_LIBRARIES),)
+@@ -37,9 +37,8 @@ ComplexProgramTarget_1(xli,$(DEFINES) $(
  ComplexProgramTarget_2(xlito,,)
  
--install:: $(SYSPATHFILE)
+ install:: $(SYSPATHFILE)
 -	$(RM) $(BINDIR)/xview $(BINDIR)/xsetbg
 -	$(LN) $(BINDIR)/xli $(BINDIR)/xview
 -	$(LN) $(BINDIR)/xli $(BINDIR)/xsetbg
-+install:: $(DESTDIR)$(SYSPATHFILE)
-+	$(RM) $(DESTDIR)$(BINDIR)/xview $(DESTDIR)$(BINDIR)/xsetbg
-+	$(LN) $(DESTDIR)$(BINDIR)/xli $(DESTDIR)$(BINDIR)/xview
-+	$(LN) $(DESTDIR)$(BINDIR)/xli $(DESTDIR)$(BINDIR)/xsetbg
++	$(LN) $(BINDIR)/xli $(DESTDIR)$(BINDIR)/xview
++	$(LN) $(BINDIR)/xli $(DESTDIR)$(BINDIR)/xsetbg
  
--$(SYSPATHFILE):
-+$(DESTDIR)$(SYSPATHFILE):
+ $(SYSPATHFILE):
  	@echo "*** Creating default $(SYSPATHFILE) since you"
- 	@echo "*** don't have one. This file is used to set up default places"
- 	@echo "*** and names to look for images.  You probably want to edit"
+@@ -48,7 +47,7 @@ $(SYSPATHFILE):
  	@echo "*** it for your site.  See the xloadimage manual page for"
  	@echo "*** details on the contents of this file."
--	cp /dev/null $(SYSPATHFILE)
+ 	cp /dev/null $(SYSPATHFILE)
 -	echo "path=$(INCDIR)/bitmaps $(INCDIR)/images" \
--		>> $(SYSPATHFILE)
-+	mkdir -p $(DESTDIR)/usr/local/lib/X11/app-defaults; cp /dev/null $(DESTDIR)$(SYSPATHFILE)
 +	echo "path=$(INCDIR)/X11/bitmaps $(INCDIR)/X11/pixmaps" \
-+		>> $(DESTDIR)$(SYSPATHFILE)
+ 		>> $(SYSPATHFILE)
  	echo "extension=.gif .jpg .rle .csun .msun .sun .face .xbm .bm" \
--		>>$(SYSPATHFILE)
--	chmod a+r $(SYSPATHFILE)
-+		>> $(DESTDIR)$(SYSPATHFILE)
-+	chmod a+r $(DESTDIR)$(SYSPATHFILE)
- 
+ 		>>$(SYSPATHFILE)


Property changes on: trunk/graphics/xli/files/patch-Imakefile
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.2
\ No newline at end of property
Index: trunk/graphics/xli/files/patch-png.c
===================================================================
--- trunk/graphics/xli/files/patch-png.c	2018-08-26 18:27:03 UTC (rev 23838)
+++ trunk/graphics/xli/files/patch-png.c	2018-08-26 18:28:40 UTC (rev 23839)

Property changes on: trunk/graphics/xli/files/patch-png.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/graphics/xli/files/patch-reduce.c
===================================================================
--- trunk/graphics/xli/files/patch-reduce.c	2018-08-26 18:27:03 UTC (rev 23838)
+++ trunk/graphics/xli/files/patch-reduce.c	2018-08-26 18:28:40 UTC (rev 23839)

Property changes on: trunk/graphics/xli/files/patch-reduce.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Index: trunk/graphics/xli/files/patch-rotate.c
===================================================================
--- trunk/graphics/xli/files/patch-rotate.c	2018-08-26 18:27:03 UTC (rev 23838)
+++ trunk/graphics/xli/files/patch-rotate.c	2018-08-26 18:28:40 UTC (rev 23839)

Property changes on: trunk/graphics/xli/files/patch-rotate.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Index: trunk/graphics/xli/files/patch-tga.c
===================================================================
--- trunk/graphics/xli/files/patch-tga.c	2018-08-26 18:27:03 UTC (rev 23838)
+++ trunk/graphics/xli/files/patch-tga.c	2018-08-26 18:28:40 UTC (rev 23839)

Property changes on: trunk/graphics/xli/files/patch-tga.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property
Index: trunk/graphics/xli/files/patch-xli.c
===================================================================
--- trunk/graphics/xli/files/patch-xli.c	2018-08-26 18:27:03 UTC (rev 23838)
+++ trunk/graphics/xli/files/patch-xli.c	2018-08-26 18:28:40 UTC (rev 23839)

Property changes on: trunk/graphics/xli/files/patch-xli.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/graphics/xli/files/patch-xli.h
===================================================================
--- trunk/graphics/xli/files/patch-xli.h	2018-08-26 18:27:03 UTC (rev 23838)
+++ trunk/graphics/xli/files/patch-xli.h	2018-08-26 18:28:40 UTC (rev 23839)

Property changes on: trunk/graphics/xli/files/patch-xli.h
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/graphics/xli/files/patch-xpixmap.c
===================================================================
--- trunk/graphics/xli/files/patch-xpixmap.c	2018-08-26 18:27:03 UTC (rev 23838)
+++ trunk/graphics/xli/files/patch-xpixmap.c	2018-08-26 18:28:40 UTC (rev 23839)

Property changes on: trunk/graphics/xli/files/patch-xpixmap.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Index: trunk/graphics/xli/files/patch-zoom.c
===================================================================
--- trunk/graphics/xli/files/patch-zoom.c	2018-08-26 18:27:03 UTC (rev 23838)
+++ trunk/graphics/xli/files/patch-zoom.c	2018-08-26 18:28:40 UTC (rev 23839)

Property changes on: trunk/graphics/xli/files/patch-zoom.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.3
\ No newline at end of property

More information about the Midnightbsd-cvs mailing list