--- Makefile.orig	Sat Nov 14 03:20:14 1998
+++ Makefile	Thu Nov 19 02:53:55 1998
@@ -16,9 +16,15 @@
 #
 #OSDEP = 
 ##OSDEP = -DUSE_OSS -I/usr/local/lib/oss/include
-#OSDEPLIB = -lxpg4
-#CDROM_S = cdrom.FreeBSD.o
-#DSP_S = dsp.o
+OSDEPLIB = -lxpg4
+CDROM_S = cdrom.FreeBSD.o
+DSP_S = dsp.o
+.if $(PORTOBJFORMAT) == "elf"
+LDFLAGS = -Wl,-rpath,${X11BASE}/lib
+.endif
+.ifndef(CDROM_NO_TRKIND)
+CDPLAY = -DCDROM_USE_TRKIND_ONLY
+.endif
 
 #---------------------------------------------------
 # for OpenBSD
@@ -34,10 +40,10 @@
 #
 ##  for glibc+wcsmbs(Debian2.x / RedHad5.x etc)
 ##OSDEP = -DUSE_OSS
-OSDEP = -DX_LOCALE -DUSE_OSS
-OSDEPLIB = 
-CDROM_S = cdrom.Linux.o
-DSP_S = dsp.o
+#OSDEP = -DX_LOCALE -DUSE_OSS
+#OSDEPLIB = 
+#CDROM_S = cdrom.Linux.o
+#DSP_S = dsp.o
 
 #---------------------------------------------------
 # DigitalUnix 4.0/OSF1
@@ -70,12 +76,12 @@
 #DSP_S = dsp.empty.o
 
 
-CUSTMOPTS=$(DSPPATH) $(CDROMPATH)
+CUSTMOPTS=$(DSPPATH) $(CDROMPATH) $(CDPLAY)
 
 #---------------------------------------------------
 # My debuging Option
 #CFLAGS    = -g -Wall $(OSDEP) $(CUSTMOPTS) `gtk-config --cflags`
-CFLAGS    = -Wall -O2 $(OSDEP) $(CUSTMOPTS) `gtk-config --cflags`
+CFLAGS   += -Wall $(OSDEP) $(CUSTMOPTS) `gtk11-config --cflags`
 
 PROGS     = xsystem35
 OBJ_SYS35CMD = cmdb.o cmdc.o cmdd.o cmde.o cmdf.o cmdg.o cmdh.o cmdi.o cmdj.o cmdl.o cmdm.o cmdn.o cmdo.o cmdp.o cmdq.o cmds.o cmdt.o cmdu.o cmdv.o cmdw.o cmdy.o cmdz.o
@@ -85,7 +91,7 @@
 OBJ_SCO   = cali.o scenario.o variable.o cmd_check.o hankana2sjis.o nact_perser.o selection.o message.o savedata.o hankaku.o
 OBJ_GRAPHICS = xcore.o gtk_setup.o graphics.o image.o
 OBJS      = xsystem35.o dri.o dataManager.o $(OBJ_SYS35CMD) $(OBJ_CG) $(OBJ_SCO) $(OBJ_MUS) $(OBJ_GRAPHICS) $(OBJ_MISC)
-LIBS = -L/usr/X11R6/lib -lX11 -lm `gtk-config --libs` $(OSDEPLIB)
+LIBS = -L/usr/X11R6/lib -lX11 -lm `gtk11-config --libs` $(OSDEPLIB)
 
 all: $(PROGS)
 
