mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-29 01:13:08 +00:00
Code Issues Releases Activity

Correctly define the jpeg tool location.

Browse Source 
PR:		4573
Submitted by:	the port maintainer
This commit is contained in:
Masafumi Max NAKANE 1997-09-19 03:47:36 +00:00
parent c3ac2aa391
commit 5b5fb5b697
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=7957
4 changed files with 87 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
graphics/imlib/files/patch-aa
View File

@ -1,7 +1,7 @@
*** Imakefile.orig Thu Aug 28 21:36:09 1997
--- Imakefile Mon Sep 15 04:31:02 1997
*** Imakefile.orig Thu Aug 28 20:36:09 1997
--- Imakefile Fri Sep 19 03:29:21 1997
***************
*** 6,20 ****
*** 6,27 ****
/* ---------------------------------------------------------------- */
LIBNAME=Im
@ -17,7 +17,14 @@
#endif /* def UseEtcX11 */
CNFDIR = $(ETCDIR)
--- 6,20 ----
DEFINES = -DSYSTEM_IMRC=\"$(ETCDIR)/imrc\" \
-DCONVERT_PATH=\"$(CONVERT_DIR)\" \
! -DNETPBM_PATH=\"$(NETPBM_DIR)\"
SRCS = load.c rend.c misc.c colors.c cache.c
OBJS = load.o rend.o misc.o colors.o cache.o
--- 6,29 ----
/* ---------------------------------------------------------------- */
LIBNAME=Im
@ -25,6 +32,7 @@
! CONVERT_DIR=/usr/X11R6/bin
! NETPBM_DIR=/usr/X11R6/bin
! JPEG_DIR=/usr/local/bin
#ifdef UseEtcX11
ETCDIR=/etc/X11/$(LIBNAME)
@ -33,7 +41,15 @@
#endif /* def UseEtcX11 */
CNFDIR = $(ETCDIR)
***************
DEFINES = -DSYSTEM_IMRC=\"$(ETCDIR)/imrc\" \
-DCONVERT_PATH=\"$(CONVERT_DIR)\" \
! -DNETPBM_PATH=\"$(NETPBM_DIR)\" \
! -DJPEG_PATH=\"$(JPEG_DIR)\"
SRCS = load.c rend.c misc.c colors.c cache.c
OBJS = load.o rend.o misc.o colors.o cache.o
*************** InstallMultiple($(HDRS),$(INCROOT)/X11)
*** 64,70 ****
CNFSRC = ./sys_conf
CNFS = $(CNFSRC)/imrc
@ -42,7 +58,7 @@
InstallMultipleFlags($(CNFS) $(PALS),$(CNFDIR),$(CNFFLAGS))
DependTarget()
--- 64,70 ----
--- 66,72 ----
CNFSRC = ./sys_conf
CNFS = $(CNFSRC)/imrc
PALS = $(CNFSRC)/im_palette.pal

21
graphics/imlib/files/patch-ac Normal file
View File

@ -0,0 +1,21 @@
*** load.c.orig Fri Sep 19 03:24:04 1997
--- load.c Fri Sep 19 03:25:28 1997
*************** Image *ImlibLoadImage(ImlibData *id, cha
*** 157,164 ****
if (needs_conv) pclose(p);
else fclose(p);
}
! if (!strcasecmp(s,"jpeg")) sprintf(cmd,"%s/djpeg %s", NETPBM_PATH, file);
! else if (!strcasecmp(s,"jpg")) sprintf(cmd,"%s/djpeg %s", NETPBM_PATH, file);
else if (!strcasecmp(s,"bmp")) sprintf(cmd,"%s/bmptoppm %s", NETPBM_PATH, file);
else if (!strcasecmp(s,"ilbm")) sprintf(cmd,"%s/ilbmtoppm %s", NETPBM_PATH, file);
else if (!strcasecmp(s,"ilb")) sprintf(cmd,"%s/ilbmtoppm %s", NETPBM_PATH, file);
--- 157,164 ----
if (needs_conv) pclose(p);
else fclose(p);
}
! if (!strcasecmp(s,"jpeg")) sprintf(cmd,"%s/djpeg %s", JPEG_PATH, file);
! else if (!strcasecmp(s,"jpg")) sprintf(cmd,"%s/djpeg %s", JPEG_PATH, file);
else if (!strcasecmp(s,"bmp")) sprintf(cmd,"%s/bmptoppm %s", NETPBM_PATH, file);
else if (!strcasecmp(s,"ilbm")) sprintf(cmd,"%s/ilbmtoppm %s", NETPBM_PATH, file);
else if (!strcasecmp(s,"ilb")) sprintf(cmd,"%s/ilbmtoppm %s", NETPBM_PATH, file);

28
graphics/imlib2-tmp/files/patch-aa
View File

@ -1,7 +1,7 @@
*** Imakefile.orig Thu Aug 28 21:36:09 1997
--- Imakefile Mon Sep 15 04:31:02 1997
*** Imakefile.orig Thu Aug 28 20:36:09 1997
--- Imakefile Fri Sep 19 03:29:21 1997
***************
*** 6,20 ****
*** 6,27 ****
/* ---------------------------------------------------------------- */
LIBNAME=Im
@ -17,7 +17,14 @@
#endif /* def UseEtcX11 */
CNFDIR = $(ETCDIR)
--- 6,20 ----
DEFINES = -DSYSTEM_IMRC=\"$(ETCDIR)/imrc\" \
-DCONVERT_PATH=\"$(CONVERT_DIR)\" \
! -DNETPBM_PATH=\"$(NETPBM_DIR)\"
SRCS = load.c rend.c misc.c colors.c cache.c
OBJS = load.o rend.o misc.o colors.o cache.o
--- 6,29 ----
/* ---------------------------------------------------------------- */
LIBNAME=Im
@ -25,6 +32,7 @@
! CONVERT_DIR=/usr/X11R6/bin
! NETPBM_DIR=/usr/X11R6/bin
! JPEG_DIR=/usr/local/bin
#ifdef UseEtcX11
ETCDIR=/etc/X11/$(LIBNAME)
@ -33,7 +41,15 @@
#endif /* def UseEtcX11 */
CNFDIR = $(ETCDIR)
***************
DEFINES = -DSYSTEM_IMRC=\"$(ETCDIR)/imrc\" \
-DCONVERT_PATH=\"$(CONVERT_DIR)\" \
! -DNETPBM_PATH=\"$(NETPBM_DIR)\" \
! -DJPEG_PATH=\"$(JPEG_DIR)\"
SRCS = load.c rend.c misc.c colors.c cache.c
OBJS = load.o rend.o misc.o colors.o cache.o
*************** InstallMultiple($(HDRS),$(INCROOT)/X11)
*** 64,70 ****
CNFSRC = ./sys_conf
CNFS = $(CNFSRC)/imrc
@ -42,7 +58,7 @@
InstallMultipleFlags($(CNFS) $(PALS),$(CNFDIR),$(CNFFLAGS))
DependTarget()
--- 64,70 ----
--- 66,72 ----
CNFSRC = ./sys_conf
CNFS = $(CNFSRC)/imrc
PALS = $(CNFSRC)/im_palette.pal

28
graphics/imlib2/files/patch-aa
View File

@ -1,7 +1,7 @@
*** Imakefile.orig Thu Aug 28 21:36:09 1997
--- Imakefile Mon Sep 15 04:31:02 1997
*** Imakefile.orig Thu Aug 28 20:36:09 1997
--- Imakefile Fri Sep 19 03:29:21 1997
***************
*** 6,20 ****
*** 6,27 ****
/* ---------------------------------------------------------------- */
LIBNAME=Im
@ -17,7 +17,14 @@
#endif /* def UseEtcX11 */
CNFDIR = $(ETCDIR)
--- 6,20 ----
DEFINES = -DSYSTEM_IMRC=\"$(ETCDIR)/imrc\" \
-DCONVERT_PATH=\"$(CONVERT_DIR)\" \
! -DNETPBM_PATH=\"$(NETPBM_DIR)\"
SRCS = load.c rend.c misc.c colors.c cache.c
OBJS = load.o rend.o misc.o colors.o cache.o
--- 6,29 ----
/* ---------------------------------------------------------------- */
LIBNAME=Im
@ -25,6 +32,7 @@
! CONVERT_DIR=/usr/X11R6/bin
! NETPBM_DIR=/usr/X11R6/bin
! JPEG_DIR=/usr/local/bin
#ifdef UseEtcX11
ETCDIR=/etc/X11/$(LIBNAME)
@ -33,7 +41,15 @@
#endif /* def UseEtcX11 */
CNFDIR = $(ETCDIR)
***************
DEFINES = -DSYSTEM_IMRC=\"$(ETCDIR)/imrc\" \
-DCONVERT_PATH=\"$(CONVERT_DIR)\" \
! -DNETPBM_PATH=\"$(NETPBM_DIR)\" \
! -DJPEG_PATH=\"$(JPEG_DIR)\"
SRCS = load.c rend.c misc.c colors.c cache.c
OBJS = load.o rend.o misc.o colors.o cache.o
*************** InstallMultiple($(HDRS),$(INCROOT)/X11)
*** 64,70 ****
CNFSRC = ./sys_conf
CNFS = $(CNFSRC)/imrc
@ -42,7 +58,7 @@
InstallMultipleFlags($(CNFS) $(PALS),$(CNFDIR),$(CNFFLAGS))
DependTarget()
--- 64,70 ----
--- 66,72 ----
CNFSRC = ./sys_conf
CNFS = $(CNFSRC)/imrc
PALS = $(CNFSRC)/im_palette.pal