1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-14 23:46:10 +00:00
freebsd-ports/audio/workman/files/patch-aa
Justin M. Seger a9953d0862 Unbreak for ELF.
Partially submitted by:	ken@plutotech.com
1998-10-13 03:30:30 +00:00

208 lines
5.3 KiB
Plaintext

diff -c --recursive ./Makefile ../workman.new/./Makefile
*** ./Makefile Tue Jun 13 22:37:18 1995
--- ../workman.new/./Makefile Sun Nov 26 03:26:56 1995
***************
*** 4,12 ****
# If you want to use gcc, tell make about it here.
#
! CC = gcc
#CC = cc
#
# Uncomment the following if you're compiling on Solaris 2.x.
#
--- 4,14 ----
# If you want to use gcc, tell make about it here.
#
! CC = gcc -O2 -m486
#CC = cc
+ RM=rm -f
+
#
# Uncomment the following if you're compiling on Solaris 2.x.
#
***************
*** 18,26 ****
# SOL2 line.
#
! SOL2 = -DSYSV -DCODEC
! LIBLOC = -R$(LIBDIR)
! EXTRA_LIBS = -lsocket
#
# Uncomment the following if you want fast database lookups using the
--- 20,28 ----
# SOL2 line.
#
! #SOL2 = -DSYSV -DCODEC
! #LIBLOC = -R$(LIBDIR)
! #EXTRA_LIBS = -lsocket
#
# Uncomment the following if you want fast database lookups using the
***************
*** 29,58 ****
# to match your system type as listed in libdb's PORT directory.
#
! DBCFLAGS = -DLIBDB -Idb.1.85/PORT/include -Idb.1.85/PORT/sunos.5.2
! DBLIB = db.1.85/PORT/sunos.5.2/libdb.a
#
# Set these to the locations of your XView include files and libraries.
#
! INCDIR = $(OPENWINHOME)/include
! LIBDIR = $(OPENWINHOME)/lib
#
# Set these to the directory names in which to install the software and
# help files.
#
! BINDIR = $(OPENWINHOME)/bin
! HLPDIR = $(OPENWINHOME)/lib/help
#
# Set this to the directory containing manual pages. Manual pages will only
# be installed if you "make install.man".
#
! MANDIR = $(OPENWINHOME)/man
#
# Set these to the manual sections (e.g. 1, 4, 5, l) for the program and
--- 31,60 ----
# to match your system type as listed in libdb's PORT directory.
#
! #DBCFLAGS = -DLIBDB -Idb.1.85/PORT/include -Idb.1.85/PORT/sunos.5.2
! #DBLIB = db.1.85/PORT/sunos.5.2/libdb.a
#
# Set these to the locations of your XView include files and libraries.
#
! INCDIR = /usr/include
! LIBDIR = /usr/X11R6/lib
#
# Set these to the directory names in which to install the software and
# help files.
#
! BINDIR = ${PREFIX}/bin
! HLPDIR = ${PREFIX}/lib/help
#
# Set this to the directory containing manual pages. Manual pages will only
# be installed if you "make install.man".
#
! MANDIR = ${PREFIX}/man
#
# Set these to the manual sections (e.g. 1, 4, 5, l) for the program and
***************
*** 83,89 ****
CFLAGS = -g
CPPFLAGS = -I$(INCDIR) $(SOL2)
LDFLAGS = -L$(LIBDIR) $(LIBLOC)
! LDLIBS = -lxview -lolgx -lX11 $(EXTRA_LIBS) $(DBLIB) -ldl
# Standard targets.
--- 85,91 ----
CFLAGS = -g
CPPFLAGS = -I$(INCDIR) $(SOL2)
LDFLAGS = -L$(LIBDIR) $(LIBLOC)
! LDLIBS = -lxview -lolgx -lX11 $(EXTRA_LIBS) $(DBLIB) #-ldl
# Standard targets.
***************
*** 96,110 ****
$(CC) $(LDFLAGS) $(DBCFLAGS) buildindex.c $(DBLIB) -o $@
clean:
! $(RM) $(OBJECTS) *.BAK *.delta core
! install: $(PROGRAM)
cp $(PROGRAM) $(BINDIR)
chmod 755 $(BINDIR)/$(PROGRAM)
cp $(PROGRAM).info $(HLPDIR)
chmod 644 $(HLPDIR)/$(PROGRAM).info
-
- install.man: workman.man workmandb.man $(MANDIR)/man$(PEXT) $(MANDIR)/man$(DEXT)
cp workman.man $(MANDIR)/man$(PEXT)/workman.$(PEXT)
chmod 644 $(MANDIR)/man$(PEXT)/workman.$(PEXT)
cp workmandb.man $(MANDIR)/man$(DEXT)/workmandb.$(DEXT)
--- 98,111 ----
$(CC) $(LDFLAGS) $(DBCFLAGS) buildindex.c $(DBLIB) -o $@
clean:
! $(RM) $(OBJECTS) *.BAK *.delta *.core workman
! install: $(PROGRAM) workman.man workmandb.man \
! $(MANDIR)/man$(PEXT) $(MANDIR)/man$(DEXT)
cp $(PROGRAM) $(BINDIR)
chmod 755 $(BINDIR)/$(PROGRAM)
cp $(PROGRAM).info $(HLPDIR)
chmod 644 $(HLPDIR)/$(PROGRAM).info
cp workman.man $(MANDIR)/man$(PEXT)/workman.$(PEXT)
chmod 644 $(MANDIR)/man$(PEXT)/workman.$(PEXT)
cp workmandb.man $(MANDIR)/man$(DEXT)/workmandb.$(DEXT)
diff -c --recursive ./workman.man ../workman.new/./workman.man
*** ./workman.man Thu Jun 15 23:52:13 1995
--- ../workman.new/./workman.man Sun Nov 26 03:28:54 1995
***************
*** 151,157 ****
.TP
.I \-p file
Write the program's process ID to a different \fIfile\fP. By default, the
! PID is written to "/tmp/.wm_pid" to allow signals to be sent more easily
(see the SIGNALS section below.)
.TP
.I \-n
--- 151,157 ----
.TP
.I \-p file
Write the program's process ID to a different \fIfile\fP. By default, the
! PID is written to "/var/run/workman.pid" to allow signals to be sent more easily
(see the SIGNALS section below.)
.TP
.I \-n
***************
*** 510,515 ****
--- 510,516 ----
SVR4 port by Baruch Cochavy <bcochavy@iil.intel.com>.
.LP
FreeBSD port by Todd Pfaff <todd@flex.eng.mcmaster.ca>.
+ Modified to work under FreeBSD 2.x by Donald Burr <d_burr@ix.netcom.com>.
.LP
OSF/1 port by R.J. Edwards <rje@escact.ksc.nasa.gov>.
.LP
diff -c --recursive ./workman_stubs.c ../workman.new/./workman_stubs.c
*** ./workman_stubs.c Fri Jun 16 10:44:40 1995
--- ../workman.new/./workman_stubs.c Sun Nov 26 03:26:57 1995
***************
*** 56,62 ****
--- 56,67 ----
Panel_item quitbutton;
char *getenv(), *WMstrdup();
+ #if defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
+ /* FreeBSD has a special directory for pidfiles, I guess. */
+ char *pidfile = "/var/run/workman.pid";
+ #else
char *pidfile = "/tmp/.wm_pid";
+ #endif
char * empty = "";
extern char *cd_device;