mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

graphics/xli: actually fix staging/packaging issue

Browse Source 
- actually fix staging/packaging issue by removing desthack (it doesn't work
  for imake) and utilize DESTDIR in Imakefile instead
- add some more missing entries into PLIST_FILES
- bump PORTREVISION once again

since I still there:
- use DEBIAN shortcut in MASTER_SITES
- rename files/patch-aa to files/patch-Imakefile to conform PH

Reported by:    QAT (but not my poudriere)
Submitted by:	Zhihao Yuan <lichray@gmail.com> (maintainer, by email)
This commit is contained in:
Ruslan Makhmatkhanov 2014-03-04 23:06:31 +00:00
parent 53d50fb241
commit a6ce6282de
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=347085
2 changed files with 31 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
graphics/xli/Makefile
View File

@ -3,9 +3,9 @@
PORTNAME= xli
PORTVERSION= 1.17.0
PORTREVISION= 14
PORTREVISION= 15
CATEGORIES= graphics
MASTER_SITES= ${MASTER_SITE_DEBIAN}
MASTER_SITES= DEBIAN
MASTER_SITE_SUBDIR= pool/main/x/${PORTNAME}
DISTNAME= xli_${PORTVERSION}+${XLI_SNAPVER:C/-//g}.orig
@ -17,15 +17,20 @@ LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \
CONFLICTS_INSTALL= xloadimage-*
USES= imake desthack
USES= imake
USE_XORG= xi
WRKSRC= ${WRKDIR}/xli-${XLI_SNAPVER}
PLIST_FILES= bin/xli bin/xlito bin/xview bin/xsetbg \
lib/X11/app-defaults/Xli man/man1/xli.1.gz \
man/man1/xlito.1.gz man/man1/xview.1.gz man/man1/xsetbg.1.gz
XLI_SNAPVER= 2006-11-10
PLIST_FILES= bin/xli \
bin/xlito \
man/man1/xli.1.gz \
man/man1/xlito.1.gz
post-install:
${LN} -s ${MANPREFIX}/man/man1/xli.1.gz \
${STAGEDIR}${MANPREFIX}/man/man1/xview.1.gz
${LN} -s ${MANPREFIX}/man/man1/xli.1.gz \
${STAGEDIR}${MANPREFIX}/man/man1/xsetbg.1.gz
.include <bsd.port.mk>

24
graphics/xli/files/patch-aa → graphics/xli/files/patch-Imakefile
View File

@ -1,6 +1,6 @@
--- Imakefile-- Mon Mar 26 11:31:28 2001
+++ Imakefile Mon Mar 26 11:32:04 2001
@@ -12,8 +12,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 =
@@ -22,7 +22,7 @@
-SYSPATHFILE = $(XAPPLOADDIR)/Xli
+SYSPATHFILE = $(DESTDIR)$(XAPPLOADDIR)/Xli
DEPLIBS = $(DEPXLIB)
LOCAL_LIBRARIES = $(XLIB) $(JPEG_LDFLAGS) $(PNG_LDFLAGS) -ljpeg -lpng -lz
SYS_LIBRARIES = -lm
@ -20,7 +22,19 @@
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
@@ -47,7 +47,7 @@
@@ -37,9 +37,8 @@ ComplexProgramTarget_1(xli,$(DEFINES) $(
ComplexProgramTarget_2(xlito,,)
install:: $(SYSPATHFILE)
- $(RM) $(BINDIR)/xview $(BINDIR)/xsetbg
- $(LN) $(BINDIR)/xli $(BINDIR)/xview
- $(LN) $(BINDIR)/xli $(BINDIR)/xsetbg
+ $(LN) $(BINDIR)/xli $(DESTDIR)$(BINDIR)/xview
+ $(LN) $(BINDIR)/xli $(DESTDIR)$(BINDIR)/xsetbg
$(SYSPATHFILE):
@echo "*** Creating default $(SYSPATHFILE) since you"
@@ -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)