Attachment #7851 for bug #16771

View | Details | Raw Unified | Return to bug 16771
Collapse All | Expand All

Lines 33-39 Link Here

(-)windowmaker-i18n/Makefile (-1 / +9 lines)
33	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" \	33	CPPFLAGS="-I${LOCALBASE}/include" LIBS="-L${LOCALBASE}/lib" \
34	LINGUAS="da de es fi fr hr it ja_JP.EUC ko nl no pl pt ru zh_TW.Big5 zh_CN"	34	LINGUAS="da de es fi fr hr it ja_JP.EUC ko nl no pl pt ru zh_TW.Big5 zh_CN"
35	CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \	35	CONFIGURE_ARGS= --with-pixmapdir=${PREFIX}/include/X11/pixmaps \
36	--with-nlsdir=${PREFIX}/share/locale --disable-debug	36	--with-nlsdir=${PREFIX}/share/locale \
		37	--with-libs-from="-L${LOCALBASE}/lib" \
		38	--with-incs-from="-I${LOCALBASE}/include" \
		39	--with-appspath="${PREFIX}/GNUstep/Apps" \
		40	--disable-debug
37		41
38	MAN1= geticonset.1x getstyle.1x seticons.1x setstyle.1x \	42	MAN1= geticonset.1x getstyle.1x seticons.1x setstyle.1x \
39	wdwrite.1x wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x wsetfont.1x	43	wdwrite.1x wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x wsetfont.1x
Lines 57-62 Link Here
57	pre-extract:	61	pre-extract:
58	${ECHO} "You can add hooks for Gnome and KDE by defining USE_GNOME and/or USE_KDE"	62	${ECHO} "You can add hooks for Gnome and KDE by defining USE_GNOME and/or USE_KDE"
59	.endif	63	.endif
		64
		65	post-extract:
		66	@cd ${WRKSRC} && \
		67	${TAR} xfz libwmfun-0.0.2.tar.gz
60		68
61	.include <bsd.port.pre.mk>	69	.include <bsd.port.pre.mk>
62		70




--- configure.orig	Tue Feb 15 16:00:11 2000
+++ configure	Tue Feb 15 16:02:20 2000
@@ -5398,7 +5398,8 @@
 	WindowMaker/Pixmaps/Makefile WindowMaker/Styles/Makefile \
 	WindowMaker/Themes/Makefile \
 	WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile \
-	WPrefs.app/po/Makefile  src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+	WPrefs.app/po/Makefile \
+	libwmfun-0.0.2/libwmfun/Makefile src/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -5531,7 +5532,8 @@
 	WindowMaker/Pixmaps/Makefile WindowMaker/Styles/Makefile \
 	WindowMaker/Themes/Makefile \
 	WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile \
-	WPrefs.app/po/Makefile "}
+	WPrefs.app/po/Makefile \
+	libwmfun-0.0.2/libwmfun/Makefile "}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then




--- Makefile.in.orig	Tue Feb 15 16:03:27 2000
+++ Makefile.in	Tue Feb 15 15:22:24 2000
@@ -92,7 +92,8 @@
 X_LIBRARY_PATH = @X_LIBRARY_PATH@
 wprefsdir = @wprefsdir@
 
-SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc 	contrib
+SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc 	contrib \
+		libwmfun-0.0.2/libwmfun
 
 
 EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.OPL 	Install acconfig.h INSTALL.pt 	mkpatch README.KDE README.GNOME WindowMaker.lsm.in 	docklib-0.2.tar.gz libwmfun-0.0.2.tar.gz 




--- libwmfun-0.0.2/libwmfun/Makefile.in.orig	Tue Feb 15 16:04:35 2000
+++ libwmfun-0.0.2/libwmfun/Makefile.in	Tue Feb 15 15:44:31 2000
@@ -38,7 +38,7 @@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 
-top_builddir = ..
+top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
 AUTOCONF = @AUTOCONF@
@@ -69,6 +69,8 @@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 
+INCLUDES =  	-I$(top_srcdir)/wrlib	-I$(top_srcdir)/src	-I$(top_srcdir)/WINGs	@HEADER_SEARCH_PATH@
+
 lib_LTLIBRARIES = libwmfun.la
 
 libwmfun_la_SOURCES = bilinear.c 		fade.c 		generic.c 		generic.h 		getopt.c 		getopt.h 		getopt1.c 		wave.c
@@ -104,12 +106,12 @@
 all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps libwmfun/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
+#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
+#	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps libwmfun/Makefile
+#
+#Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+#	cd $(top_builddir) \
+#	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 
 mostlyclean-libLTLIBRARIES:

Lines 160-165 Link Here

(-)windowmaker-i18n/pkg/PLIST (+3 lines)
160	lib/libWINGs.a	160	lib/libWINGs.a
161	lib/libWMaker.a	161	lib/libWMaker.a
162	lib/libWUtil.a	162	lib/libWUtil.a
		163	lib/libwmfun.a
		164	lib/libwmfun.so
		165	lib/libwmfun.so.0
163	lib/libwraster.a	166	lib/libwraster.a
164	lib/libwraster.so	167	lib/libwraster.so
165	lib/libwraster.so.3	168	lib/libwraster.so.3

Return to bug 16771

Line 0 Link Here

(-)windowmaker-i18n/patches/patch-cc (+22 lines)
	1	--- configure.orig Tue Feb 15 16:00:11 2000
	2	+++ configure Tue Feb 15 16:02:20 2000
	3	@@ -5398,7 +5398,8 @@
	4	WindowMaker/Pixmaps/Makefile WindowMaker/Styles/Makefile \
	5	WindowMaker/Themes/Makefile \
	6	WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile \
	7	- WPrefs.app/po/Makefile src/config.h" \| sed "s/:[^ ]//g"` conftest; exit 1' 1 2 15
	8	+ WPrefs.app/po/Makefile \
	9	+ libwmfun-0.0.2/libwmfun/Makefile src/config.h" \| sed "s/:[^ ]//g"` conftest; exit 1' 1 2 15
	10	EOF
	11	cat >> $CONFIG_STATUS <<EOF
	12
	13	@@ -5531,7 +5532,8 @@
	14	WindowMaker/Pixmaps/Makefile WindowMaker/Styles/Makefile \
	15	WindowMaker/Themes/Makefile \
	16	WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile \
	17	- WPrefs.app/po/Makefile "}
	18	+ WPrefs.app/po/Makefile \
	19	+ libwmfun-0.0.2/libwmfun/Makefile "}
	20	EOF
	21	cat >> $CONFIG_STATUS <<\EOF
	22	for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

Line 0 Link Here

(-)windowmaker-i18n/patches/patch-cd (+12 lines)
	1	--- Makefile.in.orig Tue Feb 15 16:03:27 2000
	2	+++ Makefile.in Tue Feb 15 15:22:24 2000
	3	@@ -92,7 +92,8 @@
	4	X_LIBRARY_PATH = @X_LIBRARY_PATH@
	5	wprefsdir = @wprefsdir@
	6
	7	-SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc contrib
	8	+SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc contrib \
	9	+ libwmfun-0.0.2/libwmfun
	10
	11
	12	EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N MIRRORS COPYING.OPL Install acconfig.h INSTALL.pt mkpatch README.KDE README.GNOME WindowMaker.lsm.in docklib-0.2.tar.gz libwmfun-0.0.2.tar.gz

Line 0 Link Here

(-)windowmaker-i18n/patches/patch-ce (+39 lines)
	1	--- libwmfun-0.0.2/libwmfun/Makefile.in.orig Tue Feb 15 16:04:35 2000
	2	+++ libwmfun-0.0.2/libwmfun/Makefile.in Tue Feb 15 15:44:31 2000
	3	@@ -38,7 +38,7 @@
	4	pkglibdir = $(libdir)/@PACKAGE@
	5	pkgincludedir = $(includedir)/@PACKAGE@
	6
	7	-top_builddir = ..
	8	+top_builddir = ../..
	9
	10	ACLOCAL = @ACLOCAL@
	11	AUTOCONF = @AUTOCONF@
	12	@@ -69,6 +69,8 @@
	13	RANLIB = @RANLIB@
	14	VERSION = @VERSION@
	15
	16	+INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/src -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@
	17	+
	18	lib_LTLIBRARIES = libwmfun.la
	19
	20	libwmfun_la_SOURCES = bilinear.c fade.c generic.c generic.h getopt.c getopt.h getopt1.c wave.c
	21	@@ -104,12 +106,12 @@
	22	all: all-redirect
	23	.SUFFIXES:
	24	.SUFFIXES: .S .c .lo .o .s
	25	-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
	26	- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps libwmfun/Makefile
	27	-
	28	-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
	29	- cd $(top_builddir) \
	30	- && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
	31	+#$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
	32	+# cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps libwmfun/Makefile
	33	+#
	34	+#Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
	35	+# cd $(top_builddir) \
	36	+# && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
	37
	38
	39	mostlyclean-libLTLIBRARIES: