mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-22 08:58:47 +00:00
Code Issues Releases Activity

Fix Imakefile breakage under XFree86 4.x

Browse Source 
Respect CFLAGS

PR:		21976
Submitted by:	Ports Fury
This commit is contained in:
Ade Lovett 2000-10-14 19:49:18 +00:00
parent 5e6a693f47
commit e20215f357
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=33836
2 changed files with 47 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
games/xoids/Makefile
View File

@ -5,25 +5,25 @@
# $FreeBSD$
#
PORTNAME= xoids
PORTVERSION= 1.5
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
PORTNAME= xoids
PORTVERSION= 1.5
CATEGORIES= games
MASTER_SITES= ${MASTER_SITE_XCONTRIB}
MASTER_SITE_SUBDIR= games
MAINTAINER= ports@FreeBSD.org
MAINTAINER= ports@FreeBSD.org
USE_IMAKE= yes
USE_XPM= yes
MAN6= xoids.6
MANCOMPRESSED= no
USE_IMAKE= yes
USE_XPM= yes
MAN6= xoids.6
do-install:
@ ${INSTALL_PROGRAM} ${WRKSRC}/xoids ${PREFIX}/bin
@ ${INSTALL_DATA} ${WRKSRC}/xoids.1x ${PREFIX}/man/man6/xoids.6
post-extract:
@${CP} ${WRKSRC}/xoids.1x ${WRKSRC}/xoids.man
post-install:
.if !defined(NOPORTDOCS)
@ ${MKDIR} ${PREFIX}/share/doc/xoids
@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xoids
@${MKDIR} ${PREFIX}/share/doc/xoids
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xoids
.endif
.include <bsd.port.mk>

37
games/xoids/files/patch-aa
View File

@ -1,6 +1,20 @@
--- Imakefile.orig Tue Jun 25 01:42:14 1996
+++ Imakefile Sun Jun 20 19:18:26 1999
@@ -19,11 +19,13 @@
--- Imakefile.orig Tue Jun 25 15:42:14 1996
+++ Imakefile Sat Oct 14 00:59:00 2000
@@ -6,11 +6,12 @@
XPM_INC_FLAGS = -I/usr/local/xpm/include
XPM_LIB_FLAGS = -L/usr/local/xpm/lib -lXpm
+MANSUFFIX = 6
+
XCOMM You shouldn't have to change anything below unless you need to
XCOMM add a new architecture.
#define MyNull
-CDEBUGFLAGS = -O
OS_C_FLAGS =
OS_LIB_FLAGS =
OS_DEFINES =
@@ -19,25 +20,23 @@
#if defined(SunArchitecture)
#endif
@ -10,8 +24,23 @@
#endif
#if defined(FreeBSDArchitecture)
+XPM_INC_FLAGS = -I$(X11BASE)/include/X11
+XPM_INC_FLAGS = -I$(INCROOT)/X11
+XPM_LIB_FLAGS = -lXpm
#endif
SRCS = init.c oids.c oids_x.c
OBJS = init.o oids.o oids_x.o
INCLUDES = $(XPM_INC_FLAGS)
-CCOPTIONS = $(OS_C_FLAGS)
DEFINES = $(OS_DEFINES)
EXTRA_LIBRARIES = $(XPM_LIB_FLAGS) -lX11 -lm $(OS_LIB_FLAGS)
-AllTarget(xoids)
-NormalProgramTarget(xoids, $(OBJS), MyNull, MyNull, MyNull)
-InstallProgram(xoids,$(BINDIR))
-DependTarget()
+ComplexProgramTarget(xoids)
XCOMM End of Imakefile